diff --git a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java index f53fd2c1..c4f84fa5 100644 --- a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java @@ -145,7 +145,7 @@ public class Swagger2MarkupConverter { private OrderBy definitionsOrderedBy = OrderBy.NATURAL; private MarkupLanguage markupLanguage = MarkupLanguage.ASCIIDOC; private Language outputLanguage = Language.EN; - private Integer inlineSchemaDepthLevel = 0; + private int inlineSchemaDepthLevel = 0; /** * Creates a Builder using a given Swagger source. @@ -277,7 +277,7 @@ public class Swagger2MarkupConverter { * @param inlineSchemaDepthLevel * @return the Swagger2MarkupConverter.Builder */ - public Builder withInlineSchemaDepthLevel(Integer inlineSchemaDepthLevel) { + public Builder withInlineSchemaDepthLevel(int inlineSchemaDepthLevel) { this.inlineSchemaDepthLevel = inlineSchemaDepthLevel; return this; } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java b/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java index 53ba2a0e..8ac42a17 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java @@ -66,7 +66,7 @@ public class DefinitionsDocument extends MarkupDocument { private boolean separatedDefinitionsEnabled; private String outputDirectory; private final OrderBy definitionsOrderedBy; - private final Integer inlineSchemaDepthLevel; + private final int inlineSchemaDepthLevel; public DefinitionsDocument(Swagger2MarkupConfig swagger2MarkupConfig, String outputDirectory){ super(swagger2MarkupConfig); diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java b/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java index b3b1a34c..6784676a 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java @@ -75,7 +75,7 @@ public class PathsDocument extends MarkupDocument { private boolean handWrittenDescriptionsEnabled; private String descriptionsFolderPath; private final GroupBy pathsGroupedBy; - private final Integer inlineSchemaDepthLevel; + private final int inlineSchemaDepthLevel; public PathsDocument(Swagger2MarkupConfig swagger2MarkupConfig){ super(swagger2MarkupConfig); diff --git a/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java b/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java index 14aee779..a212c23d 100644 --- a/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java +++ b/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java @@ -35,7 +35,7 @@ public class Swagger2MarkupConfig { private final GroupBy pathsGroupedBy; private final OrderBy definitionsOrderedBy; private final Language outputLanguage; - private final Integer inlineSchemaDepthLevel; + private final int inlineSchemaDepthLevel; /** * @param swagger the Swagger source @@ -52,7 +52,7 @@ public class Swagger2MarkupConfig { public Swagger2MarkupConfig(Swagger swagger, MarkupLanguage markupLanguage, String examplesFolderPath, String schemasFolderPath, String descriptionsFolderPath, boolean separatedDefinitions, GroupBy pathsGroupedBy, OrderBy definitionsOrderedBy, Language outputLanguage, - Integer inlineSchemaDepthLevel) { + int inlineSchemaDepthLevel) { this.swagger = swagger; this.markupLanguage = markupLanguage; this.examplesFolderPath = examplesFolderPath; @@ -101,7 +101,7 @@ public class Swagger2MarkupConfig { return outputLanguage; } - public Integer getInlineSchemaDepthLevel() { + public int getInlineSchemaDepthLevel() { return inlineSchemaDepthLevel; } } diff --git a/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConverterTest.java index 37a11237..ed2144e5 100644 --- a/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConverterTest.java @@ -77,6 +77,23 @@ public class Swagger2MarkupConverterTest { assertThat(directories).hasSize(3).containsAll(asList("definitions.adoc", "overview.adoc", "paths.adoc")); } + @Test + public void testSwagger2AsciiDocWithInlineSchema() throws IOException { + //Given + File file = new File(Swagger2MarkupConverterTest.class.getResource("/yaml/swagger_inlineSchema.yaml").getFile()); + File outputDirectory = new File("build/docs/asciidoc/generated"); + FileUtils.deleteQuietly(outputDirectory); + + //When + Swagger2MarkupConverter.from(file.getAbsolutePath()) + .withInlineSchemaDepthLevel(1).build() + .intoFolder(outputDirectory.getAbsolutePath()); + + //Then + String[] directories = outputDirectory.list(); + assertThat(directories).hasSize(3).containsAll(asList("definitions.adoc", "overview.adoc", "paths.adoc")); + } + @Test public void testSwagger2AsciiDocGroupedByTags() throws IOException { //Given diff --git a/src/test/resources/yaml/swagger_inlineSchema.yaml b/src/test/resources/yaml/swagger_inlineSchema.yaml index e09ceae1..3b3ed13a 100644 --- a/src/test/resources/yaml/swagger_inlineSchema.yaml +++ b/src/test/resources/yaml/swagger_inlineSchema.yaml @@ -14,7 +14,7 @@ paths: /LaunchCommand: post: summary: LaunchCommand - description: + description: Dummy description tags: - All parameters: @@ -41,7 +41,7 @@ paths: schema: $ref: '#/definitions/Simple' - name: LaunchCommandRequest - description: + description: Launch something in: body schema: description: Inline schema @@ -52,19 +52,19 @@ paths: - MaxCount properties: DryRun: - description: + description: Dummy description type: boolean SecurityGroup.N: - description: + description: Dummy description type: array items: type: string type: string Location: - description: + description: Dummy description $ref: '#/definitions/Location' KernelId: - description: + description: Dummy description type: string responses: 200: