diff --git a/RELEASENOTES.adoc b/RELEASENOTES.adoc index b680bbf5..49ee8841 100644 --- a/RELEASENOTES.adoc +++ b/RELEASENOTES.adoc @@ -63,4 +63,8 @@ == Version 0.8.0 * Enhancement #26 and #27: Added a pre-process hook to modify a Swagger Model before it is converted. -* Bugfix #29: Tags are rendered twice \ No newline at end of file +* Bugfix #29: Tags are rendered twice + +=== Version 0.9.0 +* Updated swagger-parser from v1.0.8 to v1.0.13 +* Support for global responses and parameters \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6cf13eda..41fcb5f5 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } } description = 'swagger2markup Build' -version = '0.8.0' +version = '0.9.0' group = 'io.github.robwin' apply plugin: 'java' @@ -54,7 +54,7 @@ dependencies { dependencyManagement { dependencies { dependency "io.github.robwin:markup-document-builder:0.1.4" - dependency "io.swagger:swagger-compat-spec-parser:1.0.8" + dependency "io.swagger:swagger-compat-spec-parser:1.0.13" dependency "commons-collections:commons-collections:3.2.1" dependency "commons-io:commons-io:2.4" dependency "junit:junit:4.11" diff --git a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java index 15e0bbd7..274b8ae8 100644 --- a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java @@ -21,9 +21,7 @@ package io.github.robwin.swagger2markup; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import io.github.robwin.markup.builder.MarkupLanguage; -import io.github.robwin.swagger2markup.builder.document.DefinitionsDocument; -import io.github.robwin.swagger2markup.builder.document.OverviewDocument; -import io.github.robwin.swagger2markup.builder.document.PathsDocument; +import io.github.robwin.swagger2markup.builder.document.*; import io.github.robwin.swagger2markup.utils.Consumer; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; @@ -156,8 +154,8 @@ public class Swagger2MarkupConverter { * @return a the document as a String */ private String buildDocuments() throws IOException { - return new OverviewDocument(swagger, markupLanguage).build().toString().concat( - new PathsDocument(swagger, markupLanguage, examplesFolderPath, schemasFolderPath).build().toString() + return new OverviewDocument(swagger, markupLanguage).build().toString() + .concat(new PathsDocument(swagger, markupLanguage, examplesFolderPath, schemasFolderPath).build().toString() .concat(new DefinitionsDocument(swagger, markupLanguage, schemasFolderPath, schemasFolderPath, false, null).build().toString())); } diff --git a/src/test/resources/json/swagger.json b/src/test/resources/json/swagger.json index 49a29d86..3bd6f8fc 100644 --- a/src/test/resources/json/swagger.json +++ b/src/test/resources/json/swagger.json @@ -134,13 +134,7 @@ ], "responses": { "200": { - "description": "successful operation", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } + "$ref": "#/responses/FoundPets" }, "400": { "description": "Invalid status value" @@ -183,13 +177,7 @@ ], "responses": { "200": { - "description": "successful operation", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } + "$ref": "#/responses/FoundPets" }, "400": { "description": "Invalid tag value" @@ -219,12 +207,7 @@ ], "parameters": [ { - "in": "path", - "name": "petId", - "description": "ID of pet that needs to be fetched", - "required": true, - "type": "integer", - "format": "int64" + "$ref": "#/parameters/petId" } ], "responses": { @@ -729,6 +712,27 @@ } } }, + "responses":{ + "FoundPets": { + "description": "successful operation", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/Pet" + } + } + } + }, + "parameters":{ + "petId": { + "in": "path", + "name": "petId", + "description": "ID of the pet", + "required": true, + "type": "integer", + "format": "int64" + } + }, "definitions": { "Identified": { "properties": { @@ -767,6 +771,13 @@ "type": "integer", "format": "int32", "description": "User Status" + }, + "pictures": { + "type": "array", + "items": { + "type": "string", + "format": "byte" + } } } }