From 7b59a069ef87bf27b31c3ecfcd7f086532745df6 Mon Sep 17 00:00:00 2001 From: Hugo de Paix de Coeur Date: Tue, 5 Apr 2016 15:54:22 +0200 Subject: [PATCH 1/4] escape consume/produce in overview too (#28). WorkAround AsciiDoctor HTML conversion bug with + on the last paragraph line. Use italic for overview informations keys. fixed termsOfService layout. --- .../builder/OverviewDocumentBuilder.java | 61 +++++++++++++------ .../expected/asciidoc/default/overview.adoc | 24 +++++--- .../expected/asciidoc/enums/overview.adoc | 8 ++- .../expected/asciidoc/examples/overview.adoc | 24 +++++--- .../asciidoc/generated_examples/overview.adoc | 24 +++++--- .../asciidoc/group_by_tags/overview.adoc | 24 +++++--- .../asciidoc/inline_schema/overview.adoc | 14 +++-- .../expected/asciidoc/maps/overview.adoc | 14 +++-- .../asciidoc/polymorphism/overview.adoc | 8 ++- .../expected/asciidoc/toFile/outputFile.adoc | 24 +++++--- .../expected/markdown/default/overview.md | 20 +++--- 11 files changed, 167 insertions(+), 78 deletions(-) diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java index ad423e3f..df1daadb 100644 --- a/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java +++ b/src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java @@ -18,6 +18,7 @@ package io.github.swagger2markup.internal.document.builder; import io.github.swagger2markup.Swagger2MarkupConverter; import io.github.swagger2markup.Swagger2MarkupExtensionRegistry; import io.github.swagger2markup.internal.document.MarkupDocument; +import io.github.swagger2markup.markup.builder.MarkupDocBuilder; import io.github.swagger2markup.spi.OverviewDocumentExtension; import io.swagger.models.*; @@ -106,53 +107,67 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder { private void buildVersionInfoSection(String version) { if(isNotBlank(version)){ this.markupDocBuilder.sectionTitleLevel2(CURRENT_VERSION); - this.markupDocBuilder.textLine(VERSION + COLON + version, true); + + MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false); + paragraph.italicText(VERSION).textLine(COLON + version); + this.markupDocBuilder.paragraph(paragraph.toString(), true); } } private void buildContactInfoSection(Contact contact) { if(contact != null){ this.markupDocBuilder.sectionTitleLevel2(CONTACT_INFORMATION); + MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false); if(isNotBlank(contact.getName())){ - this.markupDocBuilder.textLine(CONTACT_NAME + COLON + contact.getName(), true); + paragraph.italicText(CONTACT_NAME).textLine(COLON + contact.getName()); } if(isNotBlank(contact.getEmail())){ - this.markupDocBuilder.textLine(CONTACT_EMAIL + COLON + contact.getEmail(), true); + paragraph.italicText(CONTACT_EMAIL).textLine(COLON + contact.getEmail()); } + this.markupDocBuilder.paragraph(paragraph.toString(), true); } } private void buildLicenseInfoSection(License license, String termOfService) { - if(license != null && (isNotBlank(license.getName()) || isNotBlank(license.getUrl()))) { + if ( + (license != null && (isNotBlank(license.getName()) || isNotBlank(license.getUrl()))) || + (isNotBlank(termOfService)) + ) { this.markupDocBuilder.sectionTitleLevel2(LICENSE_INFORMATION); + MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false); if (isNotBlank(license.getName())) { - this.markupDocBuilder.textLine(LICENSE + COLON + license.getName(), true); + paragraph.italicText(LICENSE).textLine(COLON + license.getName()); } if (isNotBlank(license.getUrl())) { - this.markupDocBuilder.textLine(LICENSE_URL + COLON + license.getUrl(), true); + paragraph.italicText(LICENSE_URL).textLine(COLON + license.getUrl()); } - } - if(isNotBlank(termOfService)){ - this.markupDocBuilder.textLine(TERMS_OF_SERVICE + COLON + termOfService, true); + if(isNotBlank(termOfService)){ + paragraph.italicText(TERMS_OF_SERVICE).textLine(COLON + termOfService); + } + + this.markupDocBuilder.paragraph(paragraph.toString(), true); } } private void buildUriSchemeSection(Swagger swagger) { if(isNotBlank(swagger.getHost()) || isNotBlank(swagger.getBasePath()) || isNotEmpty(swagger.getSchemes())) { this.markupDocBuilder.sectionTitleLevel2(URI_SCHEME); + MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false); if (isNotBlank(swagger.getHost())) { - this.markupDocBuilder.textLine(HOST + COLON + swagger.getHost(), true); + paragraph.italicText(HOST).textLine(COLON + swagger.getHost()); } if (isNotBlank(swagger.getBasePath())) { - this.markupDocBuilder.textLine(BASE_PATH + COLON + swagger.getBasePath(), true); + paragraph.italicText(BASE_PATH).textLine(COLON + swagger.getBasePath()); } if (isNotEmpty(swagger.getSchemes())) { List schemes = new ArrayList<>(); for (Scheme scheme : swagger.getSchemes()) { schemes.add(scheme.toString()); } - this.markupDocBuilder.textLine(SCHEMES + COLON + join(schemes, ", "), true); + paragraph.italicText(SCHEMES).textLine(COLON + join(schemes, ", ")); } + this.markupDocBuilder.paragraph(paragraph.toString(), true); + } } @@ -164,7 +179,7 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder { String name = tag.getName(); String description = tag.getDescription(); if(isNoneBlank(description)){ - tagsList.add(name + COLON + description); + tagsList.add(name + COLON + description); }else{ tagsList.add(name); } @@ -176,14 +191,26 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder { private void buildConsumesSection(List consumes) { if (isNotEmpty(consumes)) { this.markupDocBuilder.sectionTitleLevel2(CONSUMES); - this.markupDocBuilder.unorderedList(consumes); + this.markupDocBuilder.newLine(); + for (String consume : consumes) { + MarkupDocBuilder contentType = this.markupDocBuilder.copy(false); + contentType.literalText(consume); + this.markupDocBuilder.unorderedListItem(contentType.toString()); + } + this.markupDocBuilder.newLine(); } } - private void buildProducesSection(List consumes) { - if (isNotEmpty(consumes)) { + private void buildProducesSection(List produces) { + if (isNotEmpty(produces)) { this.markupDocBuilder.sectionTitleLevel2(PRODUCES); - this.markupDocBuilder.unorderedList(consumes); + this.markupDocBuilder.newLine(); + for (String consume : produces) { + MarkupDocBuilder contentType = this.markupDocBuilder.copy(false); + contentType.literalText(consume); + this.markupDocBuilder.unorderedListItem(contentType.toString()); + } + this.markupDocBuilder.newLine(); } } diff --git a/src/test/resources/expected/asciidoc/default/overview.adoc b/src/test/resources/expected/asciidoc/default/overview.adoc index 8ca09e35..6a895452 100644 --- a/src/test/resources/expected/asciidoc/default/overview.adoc +++ b/src/test/resources/expected/asciidoc/default/overview.adoc @@ -11,20 +11,28 @@ For this sample, you can use the api key `special-key` to test the authorization === Version information -Version : 1.0.0 + +[%hardbreaks] +_Version_ : 1.0.0 + === Contact information -Contact : apiteam@swagger.io + +[%hardbreaks] +_Contact_ : apiteam@swagger.io + === License information -License : Apache 2.0 + -License URL : http://www.apache.org/licenses/LICENSE-2.0.html + -Terms of service : http://helloreverb.com/terms/ + +[%hardbreaks] +_License_ : Apache 2.0 +_License URL_ : http://www.apache.org/licenses/LICENSE-2.0.html +_Terms of service_ : http://helloreverb.com/terms/ + === URI scheme -Host : petstore.swagger.io + -BasePath : /v2 + -Schemes : HTTP + +[%hardbreaks] +_Host_ : petstore.swagger.io +_BasePath_ : /v2 +_Schemes_ : HTTP + === Tags diff --git a/src/test/resources/expected/asciidoc/enums/overview.adoc b/src/test/resources/expected/asciidoc/enums/overview.adoc index 9cc66523..e3b1f5de 100644 --- a/src/test/resources/expected/asciidoc/enums/overview.adoc +++ b/src/test/resources/expected/asciidoc/enums/overview.adoc @@ -7,9 +7,13 @@ Description === Version information -Version : Developer build + +[%hardbreaks] +_Version_ : Developer build + === URI scheme -Host : localhost:8080 + +[%hardbreaks] +_Host_ : localhost:8080 + diff --git a/src/test/resources/expected/asciidoc/examples/overview.adoc b/src/test/resources/expected/asciidoc/examples/overview.adoc index b6e33fee..ae4a6118 100644 --- a/src/test/resources/expected/asciidoc/examples/overview.adoc +++ b/src/test/resources/expected/asciidoc/examples/overview.adoc @@ -11,20 +11,28 @@ For this sample, you can use the api key `special-key` to test the authorization === Version information -Version : 1.0.0 + +[%hardbreaks] +_Version_ : 1.0.0 + === Contact information -Contact : apiteam@wordnik.com + +[%hardbreaks] +_Contact_ : apiteam@wordnik.com + === License information -License : Apache 2.0 + -License URL : http://www.apache.org/licenses/LICENSE-2.0.html + -Terms of service : http://helloreverb.com/terms/ + +[%hardbreaks] +_License_ : Apache 2.0 +_License URL_ : http://www.apache.org/licenses/LICENSE-2.0.html +_Terms of service_ : http://helloreverb.com/terms/ + === URI scheme -Host : petstore.swagger.wordnik.com + -BasePath : /v2 + -Schemes : HTTP + +[%hardbreaks] +_Host_ : petstore.swagger.wordnik.com +_BasePath_ : /v2 +_Schemes_ : HTTP + === Tags diff --git a/src/test/resources/expected/asciidoc/generated_examples/overview.adoc b/src/test/resources/expected/asciidoc/generated_examples/overview.adoc index b6e33fee..ae4a6118 100644 --- a/src/test/resources/expected/asciidoc/generated_examples/overview.adoc +++ b/src/test/resources/expected/asciidoc/generated_examples/overview.adoc @@ -11,20 +11,28 @@ For this sample, you can use the api key `special-key` to test the authorization === Version information -Version : 1.0.0 + +[%hardbreaks] +_Version_ : 1.0.0 + === Contact information -Contact : apiteam@wordnik.com + +[%hardbreaks] +_Contact_ : apiteam@wordnik.com + === License information -License : Apache 2.0 + -License URL : http://www.apache.org/licenses/LICENSE-2.0.html + -Terms of service : http://helloreverb.com/terms/ + +[%hardbreaks] +_License_ : Apache 2.0 +_License URL_ : http://www.apache.org/licenses/LICENSE-2.0.html +_Terms of service_ : http://helloreverb.com/terms/ + === URI scheme -Host : petstore.swagger.wordnik.com + -BasePath : /v2 + -Schemes : HTTP + +[%hardbreaks] +_Host_ : petstore.swagger.wordnik.com +_BasePath_ : /v2 +_Schemes_ : HTTP + === Tags diff --git a/src/test/resources/expected/asciidoc/group_by_tags/overview.adoc b/src/test/resources/expected/asciidoc/group_by_tags/overview.adoc index 8ca09e35..6a895452 100644 --- a/src/test/resources/expected/asciidoc/group_by_tags/overview.adoc +++ b/src/test/resources/expected/asciidoc/group_by_tags/overview.adoc @@ -11,20 +11,28 @@ For this sample, you can use the api key `special-key` to test the authorization === Version information -Version : 1.0.0 + +[%hardbreaks] +_Version_ : 1.0.0 + === Contact information -Contact : apiteam@swagger.io + +[%hardbreaks] +_Contact_ : apiteam@swagger.io + === License information -License : Apache 2.0 + -License URL : http://www.apache.org/licenses/LICENSE-2.0.html + -Terms of service : http://helloreverb.com/terms/ + +[%hardbreaks] +_License_ : Apache 2.0 +_License URL_ : http://www.apache.org/licenses/LICENSE-2.0.html +_Terms of service_ : http://helloreverb.com/terms/ + === URI scheme -Host : petstore.swagger.io + -BasePath : /v2 + -Schemes : HTTP + +[%hardbreaks] +_Host_ : petstore.swagger.io +_BasePath_ : /v2 +_Schemes_ : HTTP + === Tags diff --git a/src/test/resources/expected/asciidoc/inline_schema/overview.adoc b/src/test/resources/expected/asciidoc/inline_schema/overview.adoc index e2287252..4fb9d576 100644 --- a/src/test/resources/expected/asciidoc/inline_schema/overview.adoc +++ b/src/test/resources/expected/asciidoc/inline_schema/overview.adoc @@ -7,20 +7,24 @@ Service API === Version information -Version : 2.18 + +[%hardbreaks] +_Version_ : 2.18 + === URI scheme -Host : service.host.com + -Schemes : HTTPS + +[%hardbreaks] +_Host_ : service.host.com +_Schemes_ : HTTPS + === Consumes -* application/json +* `application/json` === Produces -* application/json +* `application/json` diff --git a/src/test/resources/expected/asciidoc/maps/overview.adoc b/src/test/resources/expected/asciidoc/maps/overview.adoc index 99238a9e..7c15d635 100644 --- a/src/test/resources/expected/asciidoc/maps/overview.adoc +++ b/src/test/resources/expected/asciidoc/maps/overview.adoc @@ -7,14 +7,20 @@ Description === Version information -Version : Developer build + +[%hardbreaks] +_Version_ : Developer build + === Contact information -Contact : (Contact name) + +[%hardbreaks] +_Contact_ : (Contact name) + === URI scheme -Host : localhost:8080 + -BasePath : /engine + +[%hardbreaks] +_Host_ : localhost:8080 +_BasePath_ : /engine + === Tags diff --git a/src/test/resources/expected/asciidoc/polymorphism/overview.adoc b/src/test/resources/expected/asciidoc/polymorphism/overview.adoc index 9cc66523..e3b1f5de 100644 --- a/src/test/resources/expected/asciidoc/polymorphism/overview.adoc +++ b/src/test/resources/expected/asciidoc/polymorphism/overview.adoc @@ -7,9 +7,13 @@ Description === Version information -Version : Developer build + +[%hardbreaks] +_Version_ : Developer build + === URI scheme -Host : localhost:8080 + +[%hardbreaks] +_Host_ : localhost:8080 + diff --git a/src/test/resources/expected/asciidoc/toFile/outputFile.adoc b/src/test/resources/expected/asciidoc/toFile/outputFile.adoc index 44fffd36..44895d53 100644 --- a/src/test/resources/expected/asciidoc/toFile/outputFile.adoc +++ b/src/test/resources/expected/asciidoc/toFile/outputFile.adoc @@ -11,20 +11,28 @@ For this sample, you can use the api key `special-key` to test the authorization === Version information -Version : 1.0.0 + +[%hardbreaks] +_Version_ : 1.0.0 + === Contact information -Contact : apiteam@swagger.io + +[%hardbreaks] +_Contact_ : apiteam@swagger.io + === License information -License : Apache 2.0 + -License URL : http://www.apache.org/licenses/LICENSE-2.0.html + -Terms of service : http://helloreverb.com/terms/ + +[%hardbreaks] +_License_ : Apache 2.0 +_License URL_ : http://www.apache.org/licenses/LICENSE-2.0.html +_Terms of service_ : http://helloreverb.com/terms/ + === URI scheme -Host : petstore.swagger.io + -BasePath : /v2 + -Schemes : HTTP + +[%hardbreaks] +_Host_ : petstore.swagger.io +_BasePath_ : /v2 +_Schemes_ : HTTP + === Tags diff --git a/src/test/resources/expected/markdown/default/overview.md b/src/test/resources/expected/markdown/default/overview.md index 3817c54e..2b8361c4 100644 --- a/src/test/resources/expected/markdown/default/overview.md +++ b/src/test/resources/expected/markdown/default/overview.md @@ -11,20 +11,24 @@ For this sample, you can use the api key `special-key` to test the authorization ### Version information -Version : 1.0.0 +*Version* : 1.0.0 + ### Contact information -Contact : apiteam@swagger.io +*Contact* : apiteam@swagger.io + ### License information -License : Apache 2.0 -License URL : http://www.apache.org/licenses/LICENSE-2.0.html -Terms of service : http://helloreverb.com/terms/ +*License* : Apache 2.0 +*License URL* : http://www.apache.org/licenses/LICENSE-2.0.html +*Terms of service* : http://helloreverb.com/terms/ + ### URI scheme -Host : petstore.swagger.io -BasePath : /v2 -Schemes : HTTP +*Host* : petstore.swagger.io +*BasePath* : /v2 +*Schemes* : HTTP + ### Tags From d9adcc2016b029798e72586889cd035863ea6258 Mon Sep 17 00:00:00 2001 From: Hugo de Paix de Coeur Date: Tue, 5 Apr 2016 16:03:35 +0200 Subject: [PATCH 2/4] log normalized operation id to the console for external content, etc ... --- .../document/builder/DefinitionsDocumentBuilder.java | 6 +++--- .../internal/document/builder/PathsDocumentBuilder.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java index cdff51d4..c2d52b26 100644 --- a/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java +++ b/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java @@ -109,11 +109,11 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { if (checkThatDefinitionIsNotInIgnoreList(definitionName)) { buildDefinition(definitionName, model); if (logger.isInfoEnabled()) { - logger.info("Definition processed: {}", definitionName); + logger.info("Definition processed : {}", definitionName); } } else { if (logger.isDebugEnabled()) { - logger.debug("Definition was ignored: {}", definitionName); + logger.debug("Definition was ignored : {}", definitionName); } } } @@ -162,7 +162,7 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { Path definitionFile = outputPath.resolve(resolveDefinitionDocument(definitionName)); defDocBuilder.writeToFileWithoutExtension(definitionFile, StandardCharsets.UTF_8); if (logger.isInfoEnabled()) { - logger.info("Separate definition file produced: {}", definitionFile); + logger.info("Separate definition file produced : {}", definitionFile); } definitionRef(definitionName, this.markupDocBuilder); diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java index b41f87dd..ba5e9477 100644 --- a/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java +++ b/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java @@ -245,7 +245,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { java.nio.file.Path operationFile = outputPath.resolve(resolveOperationDocument(operation)); pathDocBuilder.writeToFileWithoutExtension(operationFile, StandardCharsets.UTF_8); if (logger.isInfoEnabled()) { - logger.info("Separate operation file produced: {}", operationFile); + logger.info("Separate operation file produced : {}", operationFile); } buildOperationRef(operation, this.markupDocBuilder); @@ -255,7 +255,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { } if (logger.isInfoEnabled()) { - logger.info("Operation processed: {}", operation); + logger.info("Operation processed : {} (normalized id = '{}')", operation, normalizeName(operation.getId())); } } From bad8cde1862ef4d76d47fa59abe8c9759488b32e Mon Sep 17 00:00:00 2001 From: Hugo de Paix de Coeur Date: Tue, 5 Apr 2016 16:07:29 +0200 Subject: [PATCH 3/4] missing placeholder quoting --- .../document/builder/DefinitionsDocumentBuilder.java | 6 +++--- .../internal/document/builder/PathsDocumentBuilder.java | 4 ++-- .../java/io/github/swagger2markup/assertions/DiffUtils.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java index c2d52b26..a564c781 100644 --- a/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java +++ b/src/main/java/io/github/swagger2markup/internal/document/builder/DefinitionsDocumentBuilder.java @@ -109,11 +109,11 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { if (checkThatDefinitionIsNotInIgnoreList(definitionName)) { buildDefinition(definitionName, model); if (logger.isInfoEnabled()) { - logger.info("Definition processed : {}", definitionName); + logger.info("Definition processed : '{}'", definitionName); } } else { if (logger.isDebugEnabled()) { - logger.debug("Definition was ignored : {}", definitionName); + logger.debug("Definition was ignored : '{}'", definitionName); } } } @@ -162,7 +162,7 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { Path definitionFile = outputPath.resolve(resolveDefinitionDocument(definitionName)); defDocBuilder.writeToFileWithoutExtension(definitionFile, StandardCharsets.UTF_8); if (logger.isInfoEnabled()) { - logger.info("Separate definition file produced : {}", definitionFile); + logger.info("Separate definition file produced : '{}'", definitionFile); } definitionRef(definitionName, this.markupDocBuilder); diff --git a/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java b/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java index ba5e9477..c70da182 100644 --- a/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java +++ b/src/main/java/io/github/swagger2markup/internal/document/builder/PathsDocumentBuilder.java @@ -245,7 +245,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { java.nio.file.Path operationFile = outputPath.resolve(resolveOperationDocument(operation)); pathDocBuilder.writeToFileWithoutExtension(operationFile, StandardCharsets.UTF_8); if (logger.isInfoEnabled()) { - logger.info("Separate operation file produced : {}", operationFile); + logger.info("Separate operation file produced : '{}'", operationFile); } buildOperationRef(operation, this.markupDocBuilder); @@ -255,7 +255,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { } if (logger.isInfoEnabled()) { - logger.info("Operation processed : {} (normalized id = '{}')", operation, normalizeName(operation.getId())); + logger.info("Operation processed : '{}' (normalized id = '{}')", operation, normalizeName(operation.getId())); } } diff --git a/src/test/java/io/github/swagger2markup/assertions/DiffUtils.java b/src/test/java/io/github/swagger2markup/assertions/DiffUtils.java index 8d41b10b..02453465 100644 --- a/src/test/java/io/github/swagger2markup/assertions/DiffUtils.java +++ b/src/test/java/io/github/swagger2markup/assertions/DiffUtils.java @@ -38,7 +38,7 @@ public class DiffUtils { try (DirectoryStream directoryStream = Files.newDirectoryStream(expectedDirectory)) { for (Path expectedFile : directoryStream) { Path actualFile = actualDirectory.resolve(expectedFile.getFileName()); - LOGGER.info("Diffing file {} with {}", actualFile, expectedFile); + LOGGER.info("Diffing file '{}' with '{}'", actualFile, expectedFile); DiffAssertions.assertThat(actualFile).isEqualTo(expectedFile, reportPath); } } @@ -49,7 +49,7 @@ public class DiffUtils { public static void assertThatFileIsEqual(Path expectedFile, Path actualFile, String reportName) { Path reportPath = Paths.get("build/diff-report/", reportName); - LOGGER.info("Diffing file {} with {}", actualFile, expectedFile); + LOGGER.info("Diffing file '{}' with '{}'", actualFile, expectedFile); DiffAssertions.assertThat(actualFile).isEqualTo(expectedFile, reportPath); } } From 2a3ac1e6d04f3e9e689ef62573d0415aa4570c63 Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Tue, 5 Apr 2016 19:08:36 +0200 Subject: [PATCH 4/4] Updated readme --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index 0b924e3d..8c414041 100644 --- a/README.adoc +++ b/README.adoc @@ -28,6 +28,7 @@ image::src/docs/asciidoc/images/Swagger2Markup_definitions.PNG[] == Reference documentation - http://swagger2markup.readme.io/[Reference Documentation] +- http://swagger2markup.github.io/swagger2markup/1.0.0-SNAPSHOT/[1.0.0-SNAPSHOT Documentation] - https://github.com/Swagger2Markup/swagger2markup/blob/master/RELEASENOTES.adoc[Release notes] - https://github.com/Swagger2Markup/spring-swagger2markup-demo[Demo using Swagger2Markup, Spring Boot, Springfox and spring-restdocs]