From 9dfbe7ef85414eb8841a2673688121c3f0491d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 07:19:13 +0200 Subject: [PATCH 01/13] [nancyfx] Issue #5196: make package GUID nonrandom for nancyfx samples (#5209) * Add packageGuid parameter to NancyFxServerCodegen. * Use packageGuid parameter for nancyfx petstore samples. --- bin/nancyfx-petstore-server.sh | 2 +- .../codegen/languages/NancyFXServerCodegen.java | 13 ++++++++++++- .../options/NancyFXServerOptionsProvider.java | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bin/nancyfx-petstore-server.sh b/bin/nancyfx-petstore-server.sh index 2b9b2994cbf8..38db6514ded9 100755 --- a/bin/nancyfx-petstore-server.sh +++ b/bin/nancyfx-petstore-server.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate $@ -t modules/swagger-codegen/src/main/resources/nancyfx -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nancyfx -o samples/server/petstore/nancyfx" +ags="generate $@ -t modules/swagger-codegen/src/main/resources/nancyfx -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nancyfx -o samples/server/petstore/nancyfx --additional-properties packageGuid={768B8DC6-54EE-4D40-9B20-7857E1D742A4}" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java index ace3ccaa4e2e..6e63dbbedf60 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java @@ -6,6 +6,7 @@ import static io.swagger.codegen.CodegenType.SERVER; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static org.apache.commons.lang3.StringUtils.capitalize; + import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenOperation; import io.swagger.codegen.CodegenProperty; @@ -47,7 +48,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { private static final Map> propertyToSwaggerTypeMapping = createPropertyToSwaggerTypeMapping(); - private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; + private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; private final Map dependencies = new HashMap<>(); private final Set parentModels = new HashSet<>(); @@ -73,6 +74,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { addOption(PACKAGE_VERSION, "C# package version.", packageVersion); addOption(SOURCE_FOLDER, SOURCE_FOLDER_DESC, sourceFolder); addOption(INTERFACE_PREFIX, INTERFACE_PREFIX_DESC, interfacePrefix); + addOption(OPTIONAL_PROJECT_GUID,OPTIONAL_PROJECT_GUID_DESC, null); // CLI Switches addSwitch(SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_BY_REQUIRED_FLAG_DESC, sortParamsByRequiredFlag); @@ -118,6 +120,11 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { supportingFiles.add(new SupportingFile("Solution.mustache", "", packageName + ".sln")); supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder(), packageName + ".csproj")); } + + if (additionalProperties.containsKey(OPTIONAL_PROJECT_GUID)) { + setPackageGuid((String) additionalProperties.get(OPTIONAL_PROJECT_GUID)); + } + additionalProperties.put("packageGuid", packageGuid); setupModelTemplate(); @@ -186,6 +193,10 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { return sourceFolder() + File.separator + fileName; } + public void setPackageGuid(String packageGuid) { + this.packageGuid = packageGuid; + } + @Override public String apiFileFolder() { return outputFolder + File.separator + sourceFolder() + File.separator + API_NAMESPACE; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NancyFXServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NancyFXServerOptionsProvider.java index 950e92a5a918..f79de263a3c9 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NancyFXServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NancyFXServerOptionsProvider.java @@ -11,6 +11,7 @@ public class NancyFXServerOptionsProvider implements OptionsProvider { public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; public static final String SOURCE_FOLDER_VALUE = "src_nancyfx"; public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false"; + public static final String PROJECT_GUID_VALUE = "{6885796E-A4C1-48EA-9766-CCD1563C90DF}"; @Override @@ -25,6 +26,7 @@ public class NancyFXServerOptionsProvider implements OptionsProvider { .put(PACKAGE_VERSION, PACKAGE_VERSION_VALUE) .put(SOURCE_FOLDER, SOURCE_FOLDER_VALUE) .put(SORT_PARAMS_BY_REQUIRED_FLAG, "true") + .put(OPTIONAL_PROJECT_GUID, PROJECT_GUID_VALUE) .put(USE_DATETIME_OFFSET, "true") .put(USE_COLLECTION, "false") .put(RETURN_ICOLLECTION, "false") From 9875855f63926eb83c12a1defd92c2ed9d65858c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 07:20:24 +0200 Subject: [PATCH 02/13] [ASP.NET] Issue #5196: add packageGuid parameter to AspNetCoreServerCodegen. (#5199) * Issue #5196: add packageUid parameter to AspNetCoreServerCodeGen. * Change .bat file, too. --- bin/aspnetcore-petstore-server.sh | 2 +- bin/windows/aspnetcore-petstore-server.bat | 2 +- .../codegen/languages/AspNetCoreServerCodegen.java | 14 +++++++++++++- .../aspnetcore/AspNetCoreServerOptionsTest.java | 2 ++ .../options/AspNetCoreServerOptionsProvider.java | 2 ++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bin/aspnetcore-petstore-server.sh b/bin/aspnetcore-petstore-server.sh index 1bb0c4f4e80c..105af5674983 100755 --- a/bin/aspnetcore-petstore-server.sh +++ b/bin/aspnetcore-petstore-server.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore" +ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5}" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/aspnetcore-petstore-server.bat b/bin/windows/aspnetcore-petstore-server.bat index c2f5042cf6a3..dc38f7ebdec2 100755 --- a/bin/windows/aspnetcore-petstore-server.bat +++ b/bin/windows/aspnetcore-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnetcore -o samples\server\petstore\aspnetcore\ +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnetcore -o samples\server\petstore\aspnetcore\ --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java index bf63ccc253ec..692c0004cac2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java @@ -14,7 +14,7 @@ import static java.util.UUID.randomUUID; public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { - private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; + private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; @SuppressWarnings("hiding") protected Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class); @@ -44,6 +44,10 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { "C# package version.", this.packageVersion); + addOption(CodegenConstants.OPTIONAL_PROJECT_GUID, + CodegenConstants.OPTIONAL_PROJECT_GUID_DESC, + null); + addOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC, sourceFolder); @@ -85,7 +89,11 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { public void processOpts() { super.processOpts(); + if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_PROJECT_GUID)) { + setPackageGuid((String) additionalProperties.get(CodegenConstants.OPTIONAL_PROJECT_GUID)); + } additionalProperties.put("packageGuid", packageGuid); + additionalProperties.put("dockerTag", this.packageName.toLowerCase()); apiPackage = packageName + ".Controllers"; @@ -130,6 +138,10 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { } } + public void setPackageGuid(String packageGuid) { + this.packageGuid = packageGuid; + } + @Override public String apiFileFolder() { return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator + "Controllers"; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java index befeb4f18655..21c5c836f15c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java @@ -31,6 +31,8 @@ public class AspNetCoreServerOptionsTest extends AbstractOptionsTest { times = 1; serverCodegen.setSourceFolder(AspNetCoreServerOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; + serverCodegen.setPackageGuid(AspNetCoreServerOptionsProvider.PROJECT_GUID_VALUE); + times = 1; serverCodegen.useDateTimeOffset(true); times = 1; serverCodegen.setUseCollection(false); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java index f4c58fd7124c..2633702d1123 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java @@ -6,6 +6,7 @@ import io.swagger.codegen.CodegenConstants; import java.util.Map; public class AspNetCoreServerOptionsProvider implements OptionsProvider { + public static final String PROJECT_GUID_VALUE = "{0FBE6C2F-40D5-4F36-85B0-365EBF0D7EE3}"; public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnetcore"; public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; public static final String SOURCE_FOLDER_VALUE = "src_aspnetcore"; @@ -21,6 +22,7 @@ public class AspNetCoreServerOptionsProvider implements OptionsProvider { return builder.put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(CodegenConstants.OPTIONAL_PROJECT_GUID, PROJECT_GUID_VALUE) .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "true") .put(CodegenConstants.USE_DATETIME_OFFSET, "true") .put(CodegenConstants.USE_COLLECTION, "false") From 4ec23e6694f60987b6b2b05d6de6ed9acffc8021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 07:27:13 +0200 Subject: [PATCH 03/13] Update samples for Ruby-Client + Rails server. (#5214) --- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 6 ++++++ samples/server/petstore/rails5/README.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 932201de8310..5fd692df0992 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -273,6 +273,12 @@ module Petstore if opts[:'enum_query_string'] && !['_abc', '-efg', '(xyz)'].include?(opts[:'enum_query_string']) fail ArgumentError, 'invalid value for "enum_query_string", must be one of _abc, -efg, (xyz)' end + if opts[:'enum_query_integer'] && !['1', '-2'].include?(opts[:'enum_query_integer']) + fail ArgumentError, 'invalid value for "enum_query_integer", must be one of 1, -2' + end + if opts[:'enum_query_double'] && !['1.1', '-1.2'].include?(opts[:'enum_query_double']) + fail ArgumentError, 'invalid value for "enum_query_double", must be one of 1.1, -1.2' + end # resource path local_var_path = "/fake" diff --git a/samples/server/petstore/rails5/README.md b/samples/server/petstore/rails5/README.md index 841b82ad6569..91fe3051c490 100644 --- a/samples/server/petstore/rails5/README.md +++ b/samples/server/petstore/rails5/README.md @@ -1,6 +1,6 @@ # Swagger for Rails 5 -This is a project to provide Swagger support inside the [Sinatra](http://rubyonrails.org/) framework. +This is a project to provide Swagger support inside the [Ruby on Rails](http://rubyonrails.org/) framework. ## Prerequisites You need to install ruby >= 2.2.2 and run: From 6fef9c5ce6d831926a4b2433df3b73125a6a7ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:09:36 +0200 Subject: [PATCH 04/13] [java][msf4j] Update msf4j samples (and fix artifact name) (#5210) * Fix MSF4J pom indentation. * Set MSF4J sample artifactId in the generator script. * Update MSF4J samples. --- bin/java-msf4j-petstore-server.sh | 2 +- .../src/main/resources/MSF4J/pom.mustache | 13 +++++-------- samples/server/petstore/java-msf4j/pom.xml | 10 +++++----- .../src/gen/java/io/swagger/api/FakeApi.java | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/bin/java-msf4j-petstore-server.sh b/bin/java-msf4j-petstore-server.sh index 79bba1b368be..724cbea00f3b 100755 --- a/bin/java-msf4j-petstore-server.sh +++ b/bin/java-msf4j-petstore-server.sh @@ -26,7 +26,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/MSF4J -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true" +ags="$@ generate -t modules/swagger-codegen/src/main/resources/MSF4J -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=swagger-msf4j-server" echo "Removing files and folders under samples/server/petstore/java-msf4j/src/main" rm -rf samples/server/petstore/java-msf4j/src/main diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache index beab949c29d6..ab520727d3b3 100644 --- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache @@ -1,12 +1,9 @@ - - - - org.wso2.msf4j - msf4j-service -2.0.0 - - + + org.wso2.msf4j + msf4j-service + 2.0.0 + 4.0.0 {{groupId}} {{artifactId}} diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index d25dba1ac732..b7a2a53d478f 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -1,9 +1,9 @@ - - org.wso2.msf4j - msf4j-service - 2.0.0 - + + org.wso2.msf4j + msf4j-service + 2.0.0 + 4.0.0 io.swagger swagger-msf4j-server diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java index 8d7e3c477d9f..dab091c6a193 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java @@ -88,8 +88,8 @@ public class FakeApi { ,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString ,@ApiParam(value = "Query parameter enum test (string array)", allowableValues=">, $") @QueryParam("enum_query_string_array") List enumQueryStringArray ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString -,@ApiParam(value = "Query parameter enum test (double)") @QueryParam("enum_query_integer") Integer enumQueryInteger -,@ApiParam(value = "Query parameter enum test (double)") @FormParam("enum_query_double") Double enumQueryDouble +,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger +,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @FormParam("enum_query_double") Double enumQueryDouble ) throws NotFoundException { return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble); From b3fac54df666f83d0d7487230ffdb9623e5e104d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:10:15 +0200 Subject: [PATCH 05/13] Update samples for Java Inflector. (#5204) --- .../model/AdditionalPropertiesClass.java | 4 +-- .../src/gen/java/io/swagger/model/Animal.java | 4 +-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../io/swagger/model/ArrayOfNumberOnly.java | 2 +- .../gen/java/io/swagger/model/ArrayTest.java | 6 ++--- .../java/io/swagger/model/Capitalization.java | 12 ++++----- .../src/gen/java/io/swagger/model/Cat.java | 2 +- .../gen/java/io/swagger/model/Category.java | 4 +-- .../gen/java/io/swagger/model/ClassModel.java | 2 +- .../src/gen/java/io/swagger/model/Client.java | 2 +- .../src/gen/java/io/swagger/model/Dog.java | 2 +- .../gen/java/io/swagger/model/EnumArrays.java | 4 +-- .../gen/java/io/swagger/model/EnumTest.java | 8 +++--- .../gen/java/io/swagger/model/FormatTest.java | 26 +++++++++---------- .../io/swagger/model/HasOnlyReadOnly.java | 4 +-- .../gen/java/io/swagger/model/MapTest.java | 4 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 ++--- .../io/swagger/model/Model200Response.java | 4 +-- .../io/swagger/model/ModelApiResponse.java | 6 ++--- .../java/io/swagger/model/ModelReturn.java | 2 +- .../src/gen/java/io/swagger/model/Name.java | 8 +++--- .../gen/java/io/swagger/model/NumberOnly.java | 2 +- .../src/gen/java/io/swagger/model/Order.java | 12 ++++----- .../src/gen/java/io/swagger/model/Pet.java | 10 +++---- .../java/io/swagger/model/ReadOnlyFirst.java | 4 +-- .../io/swagger/model/SpecialModelName.java | 2 +- .../src/gen/java/io/swagger/model/Tag.java | 4 +-- .../src/gen/java/io/swagger/model/User.java | 16 ++++++------ .../src/main/swagger/swagger.yaml | 10 +++++-- 29 files changed, 90 insertions(+), 84 deletions(-) diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index 563d23ec3910..6c3a35fa9fd7 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -29,7 +29,7 @@ public class AdditionalPropertiesClass { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("map_property") public Map getMapProperty() { return mapProperty; @@ -46,7 +46,7 @@ public class AdditionalPropertiesClass { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("map_of_map_property") public Map> getMapOfMapProperty() { return mapOfMapProperty; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Animal.java index bc24162abc24..79ea41193679 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Animal.java @@ -28,7 +28,7 @@ public class Animal { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("className") public String getClassName() { return className; @@ -45,7 +45,7 @@ public class Animal { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("color") public String getColor() { return color; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 0e82df950720..2f4bb3905793 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index be57ae337322..470a4b7b74c1 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayTest.java index 87be883b64c3..b541649810d6 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ArrayTest.java @@ -32,7 +32,7 @@ public class ArrayTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; @@ -49,7 +49,7 @@ public class ArrayTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -66,7 +66,7 @@ public class ArrayTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Capitalization.java index 226ed62a8ac5..8aa6135053f2 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Capitalization.java @@ -38,7 +38,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; @@ -55,7 +55,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; @@ -72,7 +72,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; @@ -89,7 +89,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; @@ -106,7 +106,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; @@ -124,7 +124,7 @@ public class Capitalization { } - @ApiModelProperty(example = "null", value = "Name of the pet ") + @ApiModelProperty(value = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Cat.java index b206e39218b5..96c7697990da 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Cat.java @@ -24,7 +24,7 @@ public class Cat extends Animal { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Category.java index 0096db3a9118..08a80055ff5e 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Category.java @@ -26,7 +26,7 @@ public class Category { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -43,7 +43,7 @@ public class Category { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ClassModel.java index ee42479a76dc..d20b67fc179c 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ClassModel.java @@ -26,7 +26,7 @@ public class ClassModel { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("_class") public String getPropertyClass() { return propertyClass; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Client.java index 2568074f04d1..17e4f9b950f8 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Client.java @@ -23,7 +23,7 @@ public class Client { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("client") public String getClient() { return client; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Dog.java index 01561875eb0b..11d9c9ccf3b7 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Dog.java @@ -24,7 +24,7 @@ public class Dog extends Animal { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("breed") public String getBreed() { return breed; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumArrays.java index 97b831be5c6d..a8c7712db75a 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumArrays.java @@ -91,7 +91,7 @@ public class EnumArrays { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; @@ -108,7 +108,7 @@ public class EnumArrays { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumTest.java index 5066eab2a814..b810a573a9fe 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/EnumTest.java @@ -129,7 +129,7 @@ public class EnumTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; @@ -146,7 +146,7 @@ public class EnumTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; @@ -163,7 +163,7 @@ public class EnumTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; @@ -180,7 +180,7 @@ public class EnumTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/FormatTest.java index 3a5246fd98b9..920dd05e5c50 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/FormatTest.java @@ -64,7 +64,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { return integer; @@ -83,7 +83,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("int32") public Integer getInt32() { return int32; @@ -100,7 +100,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("int64") public Long getInt64() { return int64; @@ -119,7 +119,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("number") public BigDecimal getNumber() { return number; @@ -138,7 +138,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("float") public Float getFloat() { return _float; @@ -157,7 +157,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("double") public Double getDouble() { return _double; @@ -174,7 +174,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { return string; @@ -191,7 +191,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("byte") public byte[] getByte() { return _byte; @@ -208,7 +208,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("binary") public byte[] getBinary() { return binary; @@ -225,7 +225,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("date") public Date getDate() { return date; @@ -242,7 +242,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { return dateTime; @@ -259,7 +259,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { return uuid; @@ -276,7 +276,7 @@ public class FormatTest { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("password") public String getPassword() { return password; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index 700768ba4622..0e3740f02dc7 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -26,7 +26,7 @@ public class HasOnlyReadOnly { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("bar") public String getBar() { return bar; @@ -43,7 +43,7 @@ public class HasOnlyReadOnly { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("foo") public String getFoo() { return foo; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MapTest.java index 1019fbccce89..3072665e463b 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MapTest.java @@ -61,7 +61,7 @@ public class MapTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; @@ -78,7 +78,7 @@ public class MapTest { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index 44b8d9cecaff..06343b0b0a1e 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -35,7 +35,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { return uuid; @@ -52,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { return dateTime; @@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { return map; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Model200Response.java index acb51f518ded..4fd3d092af64 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Model200Response.java @@ -29,7 +29,7 @@ public class Model200Response { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public Integer getName() { return name; @@ -46,7 +46,7 @@ public class Model200Response { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("class") public String getPropertyClass() { return propertyClass; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelApiResponse.java index fbf0fc13b5f2..5ac1e316581b 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -29,7 +29,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -46,7 +46,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -63,7 +63,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelReturn.java index d0eae7393236..afb7202fe71b 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ModelReturn.java @@ -26,7 +26,7 @@ public class ModelReturn { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("return") public Integer getReturn() { return _return; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Name.java index 414b97f7ed24..85ef0f0c2676 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Name.java @@ -35,7 +35,7 @@ public class Name { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("name") public Integer getName() { return name; @@ -52,7 +52,7 @@ public class Name { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; @@ -69,7 +69,7 @@ public class Name { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("property") public String getProperty() { return property; @@ -86,7 +86,7 @@ public class Name { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("123Number") public Integer get123Number() { return _123Number; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/NumberOnly.java index 3a4fca7f30e8..7a83d6472803 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/NumberOnly.java @@ -24,7 +24,7 @@ public class NumberOnly { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Order.java index 5b12392af947..324a686eb8bc 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Order.java @@ -73,7 +73,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -90,7 +90,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -107,7 +107,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -124,7 +124,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { return shipDate; @@ -142,7 +142,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -159,7 +159,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Pet.java index fec9b3039c9c..59740a6add7b 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Pet.java @@ -76,7 +76,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -93,7 +93,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -127,7 +127,7 @@ public class Pet { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; @@ -144,7 +144,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -162,7 +162,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { return status; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 7d23f2cbba56..736b7b7acc56 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -26,7 +26,7 @@ public class ReadOnlyFirst { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("bar") public String getBar() { return bar; @@ -43,7 +43,7 @@ public class ReadOnlyFirst { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("baz") public String getBaz() { return baz; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/SpecialModelName.java index 4a12244c657c..ce1dfecab014 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/SpecialModelName.java @@ -23,7 +23,7 @@ public class SpecialModelName { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("$special[property.name]") public Long getSpecialPropertyName() { return specialPropertyName; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Tag.java index aac98021f9b1..3e0ca3567639 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Tag.java @@ -26,7 +26,7 @@ public class Tag { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -43,7 +43,7 @@ public class Tag { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/User.java index bda8d4267c71..4addb9c02385 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/User.java @@ -44,7 +44,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -61,7 +61,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -78,7 +78,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -95,7 +95,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -112,7 +112,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -129,7 +129,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -146,7 +146,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -164,7 +164,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml index 3e9dc434b672..c020ebdd65db 100644 --- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml +++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml @@ -685,12 +685,18 @@ paths: required: false type: "integer" format: "int32" + enum: + - 1 + - -2 - name: "enum_query_double" in: "formData" description: "Query parameter enum test (double)" required: false type: "number" format: "double" + enum: + - 1.1 + - -1.2 responses: 400: description: "Invalid request" @@ -846,12 +852,12 @@ securityDefinitions: scopes: write:pets: "modify pets in your account" read:pets: "read your pets" - http_basic_test: - type: "basic" api_key: type: "apiKey" name: "api_key" in: "header" + http_basic_test: + type: "basic" definitions: Order: type: "object" From ee1ef2c1f6936fb74c6839593b4c4f0d9ca2096c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:22:56 +0200 Subject: [PATCH 06/13] Update samples for okhttp-gson-parcelableModel. (#5208) --- .../docs/Capitalization.md | 15 ++ .../docs/ClassModel.md | 10 + .../docs/OuterEnum.md | 14 + .../client/GzipRequestInterceptor.java | 81 ++++++ .../swagger/client/model/Capitalization.java | 246 ++++++++++++++++++ .../io/swagger/client/model/ClassModel.java | 117 +++++++++ .../io/swagger/client/model/OuterEnum.java | 47 ++++ 7 files changed, 530 insertions(+) create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterEnum.md create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/GzipRequestInterceptor.java create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md new file mode 100644 index 000000000000..0f3064c1996f --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md @@ -0,0 +1,15 @@ + +# Capitalization + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**smallCamel** | **String** | | [optional] +**capitalCamel** | **String** | | [optional] +**smallSnake** | **String** | | [optional] +**capitalSnake** | **String** | | [optional] +**scAETHFlowPoints** | **String** | | [optional] +**ATT_NAME** | **String** | Name of the pet | [optional] + + + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md new file mode 100644 index 000000000000..64f880c87869 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md @@ -0,0 +1,10 @@ + +# ClassModel + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**propertyClass** | **String** | | [optional] + + + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterEnum.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterEnum.md new file mode 100644 index 000000000000..ed2cb206789b --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterEnum.md @@ -0,0 +1,14 @@ + +# OuterEnum + +## Enum + + +* `PLACED` (value: `"placed"`) + +* `APPROVED` (value: `"approved"`) + +* `DELIVERED` (value: `"delivered"`) + + + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/GzipRequestInterceptor.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/GzipRequestInterceptor.java new file mode 100644 index 000000000000..cc4e4f951c1b --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/GzipRequestInterceptor.java @@ -0,0 +1,81 @@ +/* + * Swagger Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * Contact: apiteam@swagger.io + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +package io.swagger.client; + +import com.squareup.okhttp.*; +import okio.Buffer; +import okio.BufferedSink; +import okio.GzipSink; +import okio.Okio; + +import java.io.IOException; + +/** + * Encodes request bodies using gzip. + * + * Taken from https://github.com/square/okhttp/issues/350 + */ +class GzipRequestInterceptor implements Interceptor { + @Override public Response intercept(Chain chain) throws IOException { + Request originalRequest = chain.request(); + if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) { + return chain.proceed(originalRequest); + } + + Request compressedRequest = originalRequest.newBuilder() + .header("Content-Encoding", "gzip") + .method(originalRequest.method(), forceContentLength(gzip(originalRequest.body()))) + .build(); + return chain.proceed(compressedRequest); + } + + private RequestBody forceContentLength(final RequestBody requestBody) throws IOException { + final Buffer buffer = new Buffer(); + requestBody.writeTo(buffer); + return new RequestBody() { + @Override + public MediaType contentType() { + return requestBody.contentType(); + } + + @Override + public long contentLength() { + return buffer.size(); + } + + @Override + public void writeTo(BufferedSink sink) throws IOException { + sink.write(buffer.snapshot()); + } + }; + } + + private RequestBody gzip(final RequestBody body) { + return new RequestBody() { + @Override public MediaType contentType() { + return body.contentType(); + } + + @Override public long contentLength() { + return -1; // We don't know the compressed length in advance! + } + + @Override public void writeTo(BufferedSink sink) throws IOException { + BufferedSink gzipSink = Okio.buffer(new GzipSink(sink)); + body.writeTo(gzipSink); + gzipSink.close(); + } + }; + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java new file mode 100644 index 000000000000..83b2d090c416 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Capitalization.java @@ -0,0 +1,246 @@ +/* + * Swagger Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * Contact: apiteam@swagger.io + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +package io.swagger.client.model; + +import java.util.Objects; +import com.google.gson.annotations.SerializedName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import android.os.Parcelable; +import android.os.Parcel; + +/** + * Capitalization + */ + +public class Capitalization implements Parcelable { + @SerializedName("smallCamel") + private String smallCamel = null; + + @SerializedName("CapitalCamel") + private String capitalCamel = null; + + @SerializedName("small_Snake") + private String smallSnake = null; + + @SerializedName("Capital_Snake") + private String capitalSnake = null; + + @SerializedName("SCA_ETH_Flow_Points") + private String scAETHFlowPoints = null; + + @SerializedName("ATT_NAME") + private String ATT_NAME = null; + + public Capitalization smallCamel(String smallCamel) { + this.smallCamel = smallCamel; + return this; + } + + /** + * Get smallCamel + * @return smallCamel + **/ + @ApiModelProperty(value = "") + public String getSmallCamel() { + return smallCamel; + } + + public void setSmallCamel(String smallCamel) { + this.smallCamel = smallCamel; + } + + public Capitalization capitalCamel(String capitalCamel) { + this.capitalCamel = capitalCamel; + return this; + } + + /** + * Get capitalCamel + * @return capitalCamel + **/ + @ApiModelProperty(value = "") + public String getCapitalCamel() { + return capitalCamel; + } + + public void setCapitalCamel(String capitalCamel) { + this.capitalCamel = capitalCamel; + } + + public Capitalization smallSnake(String smallSnake) { + this.smallSnake = smallSnake; + return this; + } + + /** + * Get smallSnake + * @return smallSnake + **/ + @ApiModelProperty(value = "") + public String getSmallSnake() { + return smallSnake; + } + + public void setSmallSnake(String smallSnake) { + this.smallSnake = smallSnake; + } + + public Capitalization capitalSnake(String capitalSnake) { + this.capitalSnake = capitalSnake; + return this; + } + + /** + * Get capitalSnake + * @return capitalSnake + **/ + @ApiModelProperty(value = "") + public String getCapitalSnake() { + return capitalSnake; + } + + public void setCapitalSnake(String capitalSnake) { + this.capitalSnake = capitalSnake; + } + + public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { + this.scAETHFlowPoints = scAETHFlowPoints; + return this; + } + + /** + * Get scAETHFlowPoints + * @return scAETHFlowPoints + **/ + @ApiModelProperty(value = "") + public String getScAETHFlowPoints() { + return scAETHFlowPoints; + } + + public void setScAETHFlowPoints(String scAETHFlowPoints) { + this.scAETHFlowPoints = scAETHFlowPoints; + } + + public Capitalization ATT_NAME(String ATT_NAME) { + this.ATT_NAME = ATT_NAME; + return this; + } + + /** + * Name of the pet + * @return ATT_NAME + **/ + @ApiModelProperty(value = "Name of the pet ") + public String getATTNAME() { + return ATT_NAME; + } + + public void setATTNAME(String ATT_NAME) { + this.ATT_NAME = ATT_NAME; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Capitalization capitalization = (Capitalization) o; + return Objects.equals(this.smallCamel, capitalization.smallCamel) && + Objects.equals(this.capitalCamel, capitalization.capitalCamel) && + Objects.equals(this.smallSnake, capitalization.smallSnake) && + Objects.equals(this.capitalSnake, capitalization.capitalSnake) && + Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && + Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); + } + + @Override + public int hashCode() { + return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Capitalization {\n"); + + sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); + sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); + sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); + sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); + sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); + sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + public void writeToParcel(Parcel out, int flags) { + + out.writeValue(smallCamel); + + out.writeValue(capitalCamel); + + out.writeValue(smallSnake); + + out.writeValue(capitalSnake); + + out.writeValue(scAETHFlowPoints); + + out.writeValue(ATT_NAME); + } + + public Capitalization() { + super(); + } + + Capitalization(Parcel in) { + + smallCamel = (String)in.readValue(null); + capitalCamel = (String)in.readValue(null); + smallSnake = (String)in.readValue(null); + capitalSnake = (String)in.readValue(null); + scAETHFlowPoints = (String)in.readValue(null); + ATT_NAME = (String)in.readValue(null); + } + + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public Capitalization createFromParcel(Parcel in) { + return new Capitalization(in); + } + public Capitalization[] newArray(int size) { + return new Capitalization[size]; + } + }; +} + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java new file mode 100644 index 000000000000..94379760337d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/ClassModel.java @@ -0,0 +1,117 @@ +/* + * Swagger Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * Contact: apiteam@swagger.io + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +package io.swagger.client.model; + +import java.util.Objects; +import com.google.gson.annotations.SerializedName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import android.os.Parcelable; +import android.os.Parcel; + +/** + * Model for testing model with \"_class\" property + */ +@ApiModel(description = "Model for testing model with \"_class\" property") + +public class ClassModel implements Parcelable { + @SerializedName("_class") + private String propertyClass = null; + + public ClassModel propertyClass(String propertyClass) { + this.propertyClass = propertyClass; + return this; + } + + /** + * Get propertyClass + * @return propertyClass + **/ + @ApiModelProperty(value = "") + public String getPropertyClass() { + return propertyClass; + } + + public void setPropertyClass(String propertyClass) { + this.propertyClass = propertyClass; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ClassModel classModel = (ClassModel) o; + return Objects.equals(this.propertyClass, classModel.propertyClass); + } + + @Override + public int hashCode() { + return Objects.hash(propertyClass); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ClassModel {\n"); + + sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + public void writeToParcel(Parcel out, int flags) { + + out.writeValue(propertyClass); + } + + public ClassModel() { + super(); + } + + ClassModel(Parcel in) { + + propertyClass = (String)in.readValue(null); + } + + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public ClassModel createFromParcel(Parcel in) { + return new ClassModel(in); + } + public ClassModel[] newArray(int size) { + return new ClassModel[size]; + } + }; +} + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java new file mode 100644 index 000000000000..b4ec56eec800 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java @@ -0,0 +1,47 @@ +/* + * Swagger Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * Contact: apiteam@swagger.io + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +package io.swagger.client.model; + +import java.util.Objects; +import com.google.gson.annotations.SerializedName; +import android.os.Parcelable; +import android.os.Parcel; + + +/** + * Gets or Sets OuterEnum + */ +public enum OuterEnum { + + @SerializedName("placed") + PLACED("placed"), + + @SerializedName("approved") + APPROVED("approved"), + + @SerializedName("delivered") + DELIVERED("delivered"); + + private String value; + + OuterEnum(String value) { + this.value = value; + } + + @Override + public String toString() { + return String.valueOf(value); + } +} + From c73c7ff3b911e555fd5260a4977a3052704c3c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:27:38 +0200 Subject: [PATCH 07/13] Update samples for Undertow. (#5207) --- .../main/java/io/swagger/model/Category.java | 10 ++++----- .../io/swagger/model/ModelApiResponse.java | 12 +++++----- .../src/main/java/io/swagger/model/Order.java | 18 +++++++-------- .../src/main/java/io/swagger/model/Pet.java | 16 +++++++------- .../src/main/java/io/swagger/model/Tag.java | 10 ++++----- .../src/main/java/io/swagger/model/User.java | 22 +++++++++---------- .../src/main/resources/config/swagger.json | 21 +++++++++--------- 7 files changed, 54 insertions(+), 55 deletions(-) diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java index 37752be92175..341e23cb309e 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; **/ @ApiModel(description = "A category for a pet") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Category { private Long id = null; @@ -27,7 +27,7 @@ public class Category { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -44,7 +44,7 @@ public class Category { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; @@ -55,7 +55,7 @@ public class Category { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -87,7 +87,7 @@ public class Category { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java index 11bbcebb0d9b..3f6d6c8ecec3 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; **/ @ApiModel(description = "Describes the result of uploading an image resource") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class ModelApiResponse { private Integer code = null; @@ -28,7 +28,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -45,7 +45,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -62,7 +62,7 @@ public class ModelApiResponse { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; @@ -73,7 +73,7 @@ public class ModelApiResponse { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -107,7 +107,7 @@ public class ModelApiResponse { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java index 7297000023f0..a2b2be8428e1 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java @@ -15,7 +15,7 @@ import java.util.Date; **/ @ApiModel(description = "An order for a pets from the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Order { private Long id = null; @@ -53,7 +53,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -70,7 +70,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -87,7 +87,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -104,7 +104,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { return shipDate; @@ -122,7 +122,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -139,7 +139,7 @@ public class Order { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; @@ -150,7 +150,7 @@ public class Order { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -190,7 +190,7 @@ public class Order { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java index 6b2e4693ea9c..9c435b2f98f4 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java @@ -18,7 +18,7 @@ import java.util.List; **/ @ApiModel(description = "A pet for sale in the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Pet { private Long id = null; @@ -56,7 +56,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -73,7 +73,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -107,7 +107,7 @@ public class Pet { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; @@ -124,7 +124,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -142,7 +142,7 @@ public class Pet { } - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -153,7 +153,7 @@ public class Pet { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -193,7 +193,7 @@ public class Pet { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java index b713c9d3f9d2..d4af38b6aa4d 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; **/ @ApiModel(description = "A tag for a pet") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Tag { private Long id = null; @@ -27,7 +27,7 @@ public class Tag { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -44,7 +44,7 @@ public class Tag { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; @@ -55,7 +55,7 @@ public class Tag { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -87,7 +87,7 @@ public class Tag { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java index a543df663cfb..f83a7ff0265d 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; **/ @ApiModel(description = "A User who is purchasing from the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class User { private Long id = null; @@ -33,7 +33,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -50,7 +50,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -67,7 +67,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -84,7 +84,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -101,7 +101,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -118,7 +118,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -135,7 +135,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -153,7 +153,7 @@ public class User { } - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; @@ -164,7 +164,7 @@ public class User { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -208,7 +208,7 @@ public class User { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/resources/config/swagger.json b/samples/server/petstore/undertow/src/main/resources/config/swagger.json index a7b2b1871e67..3446ff8eac8a 100644 --- a/samples/server/petstore/undertow/src/main/resources/config/swagger.json +++ b/samples/server/petstore/undertow/src/main/resources/config/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -395,8 +395,8 @@ "description" : "ID of pet that needs to be fetched", "required" : true, "type" : "integer", - "maximum" : 5.0, - "minimum" : 1.0, + "maximum" : 5, + "minimum" : 1, "format" : "int64" } ], "responses" : { @@ -427,8 +427,7 @@ "in" : "path", "description" : "ID of the order that needs to be deleted", "required" : true, - "type" : "string", - "minimum" : 1.0 + "type" : "string" } ], "responses" : { "400" : { @@ -677,11 +676,6 @@ } }, "securityDefinitions" : { - "api_key" : { - "type" : "apiKey", - "name" : "api_key", - "in" : "header" - }, "petstore_auth" : { "type" : "oauth2", "authorizationUrl" : "http://petstore.swagger.io/api/oauth/dialog", @@ -690,6 +684,11 @@ "write:pets" : "modify pets in your account", "read:pets" : "read your pets" } + }, + "api_key" : { + "type" : "apiKey", + "name" : "api_key", + "in" : "header" } }, "definitions" : { From a505822b86bbac5665d8608866d8d9b8a365c6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:28:06 +0200 Subject: [PATCH 08/13] Update samples for JaxRS/RestEasy/Joda. (#5205) --- .../gen/java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 22 ++-- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../gen/java/io/swagger/model/Category.java | 4 +- .../io/swagger/model/ModelApiResponse.java | 6 +- .../src/gen/java/io/swagger/model/Order.java | 12 +- .../src/gen/java/io/swagger/model/Pet.java | 10 +- .../src/gen/java/io/swagger/model/Tag.java | 4 +- .../src/gen/java/io/swagger/model/User.java | 16 +-- 10 files changed, 101 insertions(+), 101 deletions(-) diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiException.java index 7fa61c50d242..97e535d3c219 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiOriginFilter.java index 2dc07362c92a..f914bb6e8928 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiOriginFilter.java @@ -7,16 +7,16 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - public void destroy() {} + public void destroy() {} - public void init(FilterConfig filterConfig) throws ServletException {} -} \ No newline at end of file + public void init(FilterConfig filterConfig) throws ServletException {} +} diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiResponseMessage.java index 33f95878e549..96a46422a557 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; + + public ApiResponseMessage(){} + + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - @XmlTransient - public int getCode() { - return code; - } + @XmlTransient + public int getCode() { + return code; + } - public void setCode(int code) { - this.code = code; - } + public void setCode(int code) { + this.code = code; + } - public String getType() { - return type; - } + public String getType() { + return type; + } - public void setType(String type) { - this.type = type; - } + public void setType(String type) { + this.type = type; + } - public String getMessage() { - return message; - } + public String getMessage() { + return message; + } - public void setMessage(String message) { - this.message = message; - } + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/NotFoundException.java index 295109d7fc4a..b28b67ea4b2d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Category.java index 6794ae0da5a6..85fdecdc662b 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Category.java @@ -18,7 +18,7 @@ public class Category { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -30,7 +30,7 @@ public class Category { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/ModelApiResponse.java index 2de59f1191e9..9a9ff0db8cd2 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -19,7 +19,7 @@ public class ModelApiResponse { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -31,7 +31,7 @@ public class ModelApiResponse { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -43,7 +43,7 @@ public class ModelApiResponse { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Order.java index 5d4300d15f4f..84237e713f97 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Order.java @@ -47,7 +47,7 @@ public class Order { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -59,7 +59,7 @@ public class Order { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -71,7 +71,7 @@ public class Order { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -83,7 +83,7 @@ public class Order { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public DateTime getShipDate() { return shipDate; @@ -96,7 +96,7 @@ public class Order { * Order Status **/ - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -108,7 +108,7 @@ public class Order { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Pet.java index 81ea1ca0b242..4e48fb253b13 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Pet.java @@ -49,7 +49,7 @@ public class Pet { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -61,7 +61,7 @@ public class Pet { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -86,7 +86,7 @@ public class Pet { /** **/ - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { @@ -99,7 +99,7 @@ public class Pet { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -112,7 +112,7 @@ public class Pet { * pet status in the store **/ - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { return status; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Tag.java index f6894199956f..750e1a82b1e0 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/Tag.java @@ -18,7 +18,7 @@ public class Tag { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -30,7 +30,7 @@ public class Tag { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java index 0c2be1063059..a52524db22a6 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java @@ -24,7 +24,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -36,7 +36,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -48,7 +48,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -60,7 +60,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -72,7 +72,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -84,7 +84,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -96,7 +96,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -109,7 +109,7 @@ public class User { * User Status **/ - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; From c0e42d2ae05b874933e19a3dc876a4cda49ee25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:31:46 +0200 Subject: [PATCH 09/13] Updating samples for JaxRS servers: Spec + CXF-CDI. (#5213) --- .../server/petstore/jaxrs-cxf-cdi/swagger.json | 4 ++-- samples/server/petstore/jaxrs-spec/swagger.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json index 18ccb05b4bad..df8ae51dbf4c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json +++ b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json @@ -108,8 +108,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/jaxrs-spec/swagger.json b/samples/server/petstore/jaxrs-spec/swagger.json index d08fa189b2fd..240c4367ccf8 100644 --- a/samples/server/petstore/jaxrs-spec/swagger.json +++ b/samples/server/petstore/jaxrs-spec/swagger.json @@ -108,8 +108,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -650,8 +650,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_form_string", @@ -669,8 +669,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_header_string", @@ -688,8 +688,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_query_string", From 1a1f5afddc6da34833633cbe5ef83e2c5a242651 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 27 Mar 2017 14:37:42 +0800 Subject: [PATCH 10/13] add ci test for msf4j server (#5220) --- .../src/main/resources/MSF4J/pom.mustache | 25 +++++----- .../java-msf4j/.swagger-codegen-ignore | 1 + .../petstore/java-msf4j/mvn_test_jdk8_only.sh | 11 +++++ samples/server/petstore/java-msf4j/pom.xml | 46 ++++++++++++------- 4 files changed, 53 insertions(+), 30 deletions(-) create mode 100755 samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache index ab520727d3b3..743aca536a87 100644 --- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache @@ -13,7 +13,6 @@ src/main/java - org.apache.maven.plugins maven-jar-plugin @@ -25,7 +24,6 @@ - org.codehaus.mojo build-helper-maven-plugin @@ -47,24 +45,23 @@ - + javax.servlet servlet-api ${servlet-api-version} - org.wso2.msf4j - msf4j-all - 2.0.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.1 - - - + org.wso2.msf4j + msf4j-all + 2.0.0 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.4.1 + + sonatype-snapshots diff --git a/samples/server/petstore/java-msf4j/.swagger-codegen-ignore b/samples/server/petstore/java-msf4j/.swagger-codegen-ignore index c5fa491b4c55..3adb38ed6e2c 100644 --- a/samples/server/petstore/java-msf4j/.swagger-codegen-ignore +++ b/samples/server/petstore/java-msf4j/.swagger-codegen-ignore @@ -21,3 +21,4 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md +pom.xml diff --git a/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh b/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh new file mode 100755 index 000000000000..48e5cea3cfdc --- /dev/null +++ b/samples/server/petstore/java-msf4j/mvn_test_jdk8_only.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +java -version 2>&1 | grep "java version \"1.8" + +if [ $? -eq 0 ] +then + echo "Running JDK8" + mvn test +else + echo "Not running JDK8" +fi diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index b7a2a53d478f..5fe8c46c238d 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -6,14 +6,13 @@ 4.0.0 io.swagger - swagger-msf4j-server + swagger-jaxrs-server jar - swagger-msf4j-server + swagger-jaxrs-server 1.0.0 src/main/java - org.apache.maven.plugins maven-jar-plugin @@ -25,7 +24,6 @@ - org.codehaus.mojo build-helper-maven-plugin @@ -45,26 +43,42 @@ + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + Play Test + integration-test + + exec + + + ./mvn_test_jdk8_only.sh + + + + - + javax.servlet servlet-api ${servlet-api-version} - org.wso2.msf4j - msf4j-all - 2.0.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.1 - - - + org.wso2.msf4j + msf4j-all + 2.0.0 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.4.1 + + sonatype-snapshots From ec6248cbcfa165a986377b0a2449f04214450b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 08:50:17 +0200 Subject: [PATCH 11/13] [Erlang] pretty print swagger json (#5215) * Pretty-print swagger.json. (This was done via `jq`. In a later commit we'll generate it pretty-printed.) * Erlang Server: pretty-print generated swagger.json. * Update samples for Erlang-server. --- .../languages/ErlangServerCodegen.java | 2 +- .../petstore/erlang-server/priv/swagger.json | 831 +++++++++++++++++- .../erlang-server/src/swagger_api.erl | 5 +- 3 files changed, 833 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangServerCodegen.java index 5a78713b4140..ebb8260d6f13 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangServerCodegen.java @@ -236,7 +236,7 @@ public class ErlangServerCodegen extends DefaultCodegen implements CodegenConfig Swagger swagger = (Swagger)objs.get("swagger"); if(swagger != null) { try { - objs.put("swagger-json", Json.mapper().writeValueAsString(swagger)); + objs.put("swagger-json", Json.pretty().writeValueAsString(swagger).replace("\r\n", "\n")); } catch (JsonProcessingException e) { LOGGER.error(e.getMessage(), e); } diff --git a/samples/server/petstore/erlang-server/priv/swagger.json b/samples/server/petstore/erlang-server/priv/swagger.json index de3bdd27a50e..3eef6c58413b 100644 --- a/samples/server/petstore/erlang-server/priv/swagger.json +++ b/samples/server/petstore/erlang-server/priv/swagger.json @@ -1 +1,830 @@ -{"swagger":"2.0","info":{"description":"This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.","version":"1.0.0","title":"Swagger Petstore","termsOfService":"http://swagger.io/terms/","contact":{"email":"apiteam@swagger.io"},"license":{"name":"Apache 2.0","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"petstore.swagger.io","basePath":"/v2","tags":[{"name":"pet","description":"Everything about your Pets","externalDocs":{"description":"Find out more","url":"http://swagger.io"}},{"name":"store","description":"Access to Petstore orders"},{"name":"user","description":"Operations about user","externalDocs":{"description":"Find out more about our store","url":"http://swagger.io"}}],"schemes":["http"],"paths":{"/pet":{"post":{"tags":["pet"],"summary":"Add a new pet to the store","description":"","operationId":"addPet","consumes":["application/json","application/xml"],"produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Pet object that needs to be added to the store","required":true,"schema":{"$ref":"#/definitions/Pet"}}],"responses":{"405":{"description":"Invalid input"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]},"put":{"tags":["pet"],"summary":"Update an existing pet","description":"","operationId":"updatePet","consumes":["application/json","application/xml"],"produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Pet object that needs to be added to the store","required":true,"schema":{"$ref":"#/definitions/Pet"}}],"responses":{"400":{"description":"Invalid ID supplied"},"404":{"description":"Pet not found"},"405":{"description":"Validation exception"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/findByStatus":{"get":{"tags":["pet"],"summary":"Finds Pets by status","description":"Multiple status values can be provided with comma separated strings","operationId":"findPetsByStatus","produces":["application/xml","application/json"],"parameters":[{"name":"status","in":"query","description":"Status values that need to be considered for filter","required":true,"type":"array","items":{"type":"string","default":"available","enum":["available","pending","sold"]},"collectionFormat":"csv"}],"responses":{"200":{"description":"successful operation","schema":{"type":"array","items":{"$ref":"#/definitions/Pet"}}},"400":{"description":"Invalid status value"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/findByTags":{"get":{"tags":["pet"],"summary":"Finds Pets by tags","description":"Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.","operationId":"findPetsByTags","produces":["application/xml","application/json"],"parameters":[{"name":"tags","in":"query","description":"Tags to filter by","required":true,"type":"array","items":{"type":"string"},"collectionFormat":"csv"}],"responses":{"200":{"description":"successful operation","schema":{"type":"array","items":{"$ref":"#/definitions/Pet"}}},"400":{"description":"Invalid tag value"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/{petId}":{"get":{"tags":["pet"],"summary":"Find pet by ID","description":"Returns a single pet","operationId":"getPetById","produces":["application/xml","application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet to return","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Pet"}},"400":{"description":"Invalid ID supplied"},"404":{"description":"Pet not found"}},"security":[{"api_key":[]}]},"post":{"tags":["pet"],"summary":"Updates a pet in the store with form data","description":"","operationId":"updatePetWithForm","consumes":["application/x-www-form-urlencoded"],"produces":["application/xml","application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet that needs to be updated","required":true,"type":"integer","format":"int64"},{"name":"name","in":"formData","description":"Updated name of the pet","required":false,"type":"string"},{"name":"status","in":"formData","description":"Updated status of the pet","required":false,"type":"string"}],"responses":{"405":{"description":"Invalid input"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]},"delete":{"tags":["pet"],"summary":"Deletes a pet","description":"","operationId":"deletePet","produces":["application/xml","application/json"],"parameters":[{"name":"api_key","in":"header","required":false,"type":"string"},{"name":"petId","in":"path","description":"Pet id to delete","required":true,"type":"integer","format":"int64"}],"responses":{"400":{"description":"Invalid pet value"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/{petId}/uploadImage":{"post":{"tags":["pet"],"summary":"uploads an image","description":"","operationId":"uploadFile","consumes":["multipart/form-data"],"produces":["application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet to update","required":true,"type":"integer","format":"int64"},{"name":"additionalMetadata","in":"formData","description":"Additional data to pass to server","required":false,"type":"string"},{"name":"file","in":"formData","description":"file to upload","required":false,"type":"file"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/ApiResponse"}}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/store/inventory":{"get":{"tags":["store"],"summary":"Returns pet inventories by status","description":"Returns a map of status codes to quantities","operationId":"getInventory","produces":["application/json"],"parameters":[],"responses":{"200":{"description":"successful operation","schema":{"type":"object","additionalProperties":{"type":"integer","format":"int32"}}}},"security":[{"api_key":[]}]}},"/store/order":{"post":{"tags":["store"],"summary":"Place an order for a pet","description":"","operationId":"placeOrder","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"order placed for purchasing the pet","required":true,"schema":{"$ref":"#/definitions/Order"}}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Order"}},"400":{"description":"Invalid Order"}}}},"/store/order/{orderId}":{"get":{"tags":["store"],"summary":"Find purchase order by ID","description":"For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions","operationId":"getOrderById","produces":["application/xml","application/json"],"parameters":[{"name":"orderId","in":"path","description":"ID of pet that needs to be fetched","required":true,"type":"integer","maximum":5.0,"minimum":1.0,"format":"int64"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Order"}},"400":{"description":"Invalid ID supplied"},"404":{"description":"Order not found"}}},"delete":{"tags":["store"],"summary":"Delete purchase order by ID","description":"For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors","operationId":"deleteOrder","produces":["application/xml","application/json"],"parameters":[{"name":"orderId","in":"path","description":"ID of the order that needs to be deleted","required":true,"type":"string","minimum":1.0}],"responses":{"400":{"description":"Invalid ID supplied"},"404":{"description":"Order not found"}}}},"/user":{"post":{"tags":["user"],"summary":"Create user","description":"This can only be done by the logged in user.","operationId":"createUser","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Created user object","required":true,"schema":{"$ref":"#/definitions/User"}}],"responses":{"default":{"description":"successful operation"}}}},"/user/createWithArray":{"post":{"tags":["user"],"summary":"Creates list of users with given input array","description":"","operationId":"createUsersWithArrayInput","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"List of user object","required":true,"schema":{"type":"array","items":{"$ref":"#/definitions/User"}}}],"responses":{"default":{"description":"successful operation"}}}},"/user/createWithList":{"post":{"tags":["user"],"summary":"Creates list of users with given input array","description":"","operationId":"createUsersWithListInput","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"List of user object","required":true,"schema":{"type":"array","items":{"$ref":"#/definitions/User"}}}],"responses":{"default":{"description":"successful operation"}}}},"/user/login":{"get":{"tags":["user"],"summary":"Logs user into the system","description":"","operationId":"loginUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"query","description":"The user name for login","required":true,"type":"string"},{"name":"password","in":"query","description":"The password for login in clear text","required":true,"type":"string"}],"responses":{"200":{"description":"successful operation","schema":{"type":"string"},"headers":{"X-Rate-Limit":{"type":"integer","format":"int32","description":"calls per hour allowed by the user"},"X-Expires-After":{"type":"string","format":"date-time","description":"date in UTC when toekn expires"}}},"400":{"description":"Invalid username/password supplied"}}}},"/user/logout":{"get":{"tags":["user"],"summary":"Logs out current logged in user session","description":"","operationId":"logoutUser","produces":["application/xml","application/json"],"parameters":[],"responses":{"default":{"description":"successful operation"}}}},"/user/{username}":{"get":{"tags":["user"],"summary":"Get user by user name","description":"","operationId":"getUserByName","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"The name that needs to be fetched. Use user1 for testing. ","required":true,"type":"string"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/User"}},"400":{"description":"Invalid username supplied"},"404":{"description":"User not found"}}},"put":{"tags":["user"],"summary":"Updated user","description":"This can only be done by the logged in user.","operationId":"updateUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"name that need to be deleted","required":true,"type":"string"},{"in":"body","name":"body","description":"Updated user object","required":true,"schema":{"$ref":"#/definitions/User"}}],"responses":{"400":{"description":"Invalid user supplied"},"404":{"description":"User not found"}}},"delete":{"tags":["user"],"summary":"Delete user","description":"This can only be done by the logged in user.","operationId":"deleteUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"The name that needs to be deleted","required":true,"type":"string"}],"responses":{"400":{"description":"Invalid username supplied"},"404":{"description":"User not found"}}}}},"securityDefinitions":{"api_key":{"type":"apiKey","name":"api_key","in":"header"},"petstore_auth":{"type":"oauth2","authorizationUrl":"http://petstore.swagger.io/api/oauth/dialog","flow":"implicit","scopes":{"write:pets":"modify pets in your account","read:pets":"read your pets"}}},"definitions":{"Order":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"petId":{"type":"integer","format":"int64"},"quantity":{"type":"integer","format":"int32"},"shipDate":{"type":"string","format":"date-time"},"status":{"type":"string","description":"Order Status","enum":["placed","approved","delivered"]},"complete":{"type":"boolean","default":false}},"xml":{"name":"Order"}},"Category":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"}},"xml":{"name":"Category"}},"User":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"username":{"type":"string"},"firstName":{"type":"string"},"lastName":{"type":"string"},"email":{"type":"string"},"password":{"type":"string"},"phone":{"type":"string"},"userStatus":{"type":"integer","format":"int32","description":"User Status"}},"xml":{"name":"User"}},"Tag":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"}},"xml":{"name":"Tag"}},"Pet":{"type":"object","required":["name","photoUrls"],"properties":{"id":{"type":"integer","format":"int64"},"category":{"$ref":"#/definitions/Category"},"name":{"type":"string","example":"doggie"},"photoUrls":{"type":"array","xml":{"name":"photoUrl","wrapped":true},"items":{"type":"string"}},"tags":{"type":"array","xml":{"name":"tag","wrapped":true},"items":{"$ref":"#/definitions/Tag"}},"status":{"type":"string","description":"pet status in the store","enum":["available","pending","sold"]}},"xml":{"name":"Pet"}},"ApiResponse":{"type":"object","properties":{"code":{"type":"integer","format":"int32"},"type":{"type":"string"},"message":{"type":"string"}}}},"externalDocs":{"description":"Find out more about Swagger","url":"http://swagger.io"}} +{ + "swagger" : "2.0", + "info" : { + "description" : "This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.", + "version" : "1.0.0", + "title" : "Swagger Petstore", + "termsOfService" : "http://swagger.io/terms/", + "contact" : { + "email" : "apiteam@swagger.io" + }, + "license" : { + "name" : "Apache 2.0", + "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" + } + }, + "host" : "petstore.swagger.io", + "basePath" : "/v2", + "tags" : [ { + "name" : "pet", + "description" : "Everything about your Pets", + "externalDocs" : { + "description" : "Find out more", + "url" : "http://swagger.io" + } + }, { + "name" : "store", + "description" : "Access to Petstore orders" + }, { + "name" : "user", + "description" : "Operations about user", + "externalDocs" : { + "description" : "Find out more about our store", + "url" : "http://swagger.io" + } + } ], + "schemes" : [ "http" ], + "paths" : { + "/pet" : { + "post" : { + "tags" : [ "pet" ], + "summary" : "Add a new pet to the store", + "description" : "", + "operationId" : "addPet", + "consumes" : [ "application/json", "application/xml" ], + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Pet object that needs to be added to the store", + "required" : true, + "schema" : { + "$ref" : "#/definitions/Pet" + } + } ], + "responses" : { + "405" : { + "description" : "Invalid input" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + }, + "put" : { + "tags" : [ "pet" ], + "summary" : "Update an existing pet", + "description" : "", + "operationId" : "updatePet", + "consumes" : [ "application/json", "application/xml" ], + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Pet object that needs to be added to the store", + "required" : true, + "schema" : { + "$ref" : "#/definitions/Pet" + } + } ], + "responses" : { + "400" : { + "description" : "Invalid ID supplied" + }, + "404" : { + "description" : "Pet not found" + }, + "405" : { + "description" : "Validation exception" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + } + }, + "/pet/findByStatus" : { + "get" : { + "tags" : [ "pet" ], + "summary" : "Finds Pets by status", + "description" : "Multiple status values can be provided with comma separated strings", + "operationId" : "findPetsByStatus", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "status", + "in" : "query", + "description" : "Status values that need to be considered for filter", + "required" : true, + "type" : "array", + "items" : { + "type" : "string", + "enum" : [ "available", "pending", "sold" ], + "default" : "available" + }, + "collectionFormat" : "csv" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Pet" + } + } + }, + "400" : { + "description" : "Invalid status value" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + } + }, + "/pet/findByTags" : { + "get" : { + "tags" : [ "pet" ], + "summary" : "Finds Pets by tags", + "description" : "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", + "operationId" : "findPetsByTags", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "tags", + "in" : "query", + "description" : "Tags to filter by", + "required" : true, + "type" : "array", + "items" : { + "type" : "string" + }, + "collectionFormat" : "csv" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Pet" + } + } + }, + "400" : { + "description" : "Invalid tag value" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + } + }, + "/pet/{petId}" : { + "get" : { + "tags" : [ "pet" ], + "summary" : "Find pet by ID", + "description" : "Returns a single pet", + "operationId" : "getPetById", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "petId", + "in" : "path", + "description" : "ID of pet to return", + "required" : true, + "type" : "integer", + "format" : "int64" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/Pet" + } + }, + "400" : { + "description" : "Invalid ID supplied" + }, + "404" : { + "description" : "Pet not found" + } + }, + "security" : [ { + "api_key" : [ ] + } ] + }, + "post" : { + "tags" : [ "pet" ], + "summary" : "Updates a pet in the store with form data", + "description" : "", + "operationId" : "updatePetWithForm", + "consumes" : [ "application/x-www-form-urlencoded" ], + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "petId", + "in" : "path", + "description" : "ID of pet that needs to be updated", + "required" : true, + "type" : "integer", + "format" : "int64" + }, { + "name" : "name", + "in" : "formData", + "description" : "Updated name of the pet", + "required" : false, + "type" : "string" + }, { + "name" : "status", + "in" : "formData", + "description" : "Updated status of the pet", + "required" : false, + "type" : "string" + } ], + "responses" : { + "405" : { + "description" : "Invalid input" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + }, + "delete" : { + "tags" : [ "pet" ], + "summary" : "Deletes a pet", + "description" : "", + "operationId" : "deletePet", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "api_key", + "in" : "header", + "required" : false, + "type" : "string" + }, { + "name" : "petId", + "in" : "path", + "description" : "Pet id to delete", + "required" : true, + "type" : "integer", + "format" : "int64" + } ], + "responses" : { + "400" : { + "description" : "Invalid pet value" + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + } + }, + "/pet/{petId}/uploadImage" : { + "post" : { + "tags" : [ "pet" ], + "summary" : "uploads an image", + "description" : "", + "operationId" : "uploadFile", + "consumes" : [ "multipart/form-data" ], + "produces" : [ "application/json" ], + "parameters" : [ { + "name" : "petId", + "in" : "path", + "description" : "ID of pet to update", + "required" : true, + "type" : "integer", + "format" : "int64" + }, { + "name" : "additionalMetadata", + "in" : "formData", + "description" : "Additional data to pass to server", + "required" : false, + "type" : "string" + }, { + "name" : "file", + "in" : "formData", + "description" : "file to upload", + "required" : false, + "type" : "file" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/ApiResponse" + } + } + }, + "security" : [ { + "petstore_auth" : [ "write:pets", "read:pets" ] + } ] + } + }, + "/store/inventory" : { + "get" : { + "tags" : [ "store" ], + "summary" : "Returns pet inventories by status", + "description" : "Returns a map of status codes to quantities", + "operationId" : "getInventory", + "produces" : [ "application/json" ], + "parameters" : [ ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "object", + "additionalProperties" : { + "type" : "integer", + "format" : "int32" + } + } + } + }, + "security" : [ { + "api_key" : [ ] + } ] + } + }, + "/store/order" : { + "post" : { + "tags" : [ "store" ], + "summary" : "Place an order for a pet", + "description" : "", + "operationId" : "placeOrder", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "order placed for purchasing the pet", + "required" : true, + "schema" : { + "$ref" : "#/definitions/Order" + } + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/Order" + } + }, + "400" : { + "description" : "Invalid Order" + } + } + } + }, + "/store/order/{orderId}" : { + "get" : { + "tags" : [ "store" ], + "summary" : "Find purchase order by ID", + "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", + "operationId" : "getOrderById", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "orderId", + "in" : "path", + "description" : "ID of pet that needs to be fetched", + "required" : true, + "type" : "integer", + "maximum" : 5, + "minimum" : 1, + "format" : "int64" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/Order" + } + }, + "400" : { + "description" : "Invalid ID supplied" + }, + "404" : { + "description" : "Order not found" + } + } + }, + "delete" : { + "tags" : [ "store" ], + "summary" : "Delete purchase order by ID", + "description" : "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", + "operationId" : "deleteOrder", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "orderId", + "in" : "path", + "description" : "ID of the order that needs to be deleted", + "required" : true, + "type" : "string" + } ], + "responses" : { + "400" : { + "description" : "Invalid ID supplied" + }, + "404" : { + "description" : "Order not found" + } + } + } + }, + "/user" : { + "post" : { + "tags" : [ "user" ], + "summary" : "Create user", + "description" : "This can only be done by the logged in user.", + "operationId" : "createUser", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "Created user object", + "required" : true, + "schema" : { + "$ref" : "#/definitions/User" + } + } ], + "responses" : { + "default" : { + "description" : "successful operation" + } + } + } + }, + "/user/createWithArray" : { + "post" : { + "tags" : [ "user" ], + "summary" : "Creates list of users with given input array", + "description" : "", + "operationId" : "createUsersWithArrayInput", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "List of user object", + "required" : true, + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/User" + } + } + } ], + "responses" : { + "default" : { + "description" : "successful operation" + } + } + } + }, + "/user/createWithList" : { + "post" : { + "tags" : [ "user" ], + "summary" : "Creates list of users with given input array", + "description" : "", + "operationId" : "createUsersWithListInput", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "in" : "body", + "name" : "body", + "description" : "List of user object", + "required" : true, + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/User" + } + } + } ], + "responses" : { + "default" : { + "description" : "successful operation" + } + } + } + }, + "/user/login" : { + "get" : { + "tags" : [ "user" ], + "summary" : "Logs user into the system", + "description" : "", + "operationId" : "loginUser", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "username", + "in" : "query", + "description" : "The user name for login", + "required" : true, + "type" : "string" + }, { + "name" : "password", + "in" : "query", + "description" : "The password for login in clear text", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "type" : "string" + }, + "headers" : { + "X-Rate-Limit" : { + "type" : "integer", + "format" : "int32", + "description" : "calls per hour allowed by the user" + }, + "X-Expires-After" : { + "type" : "string", + "format" : "date-time", + "description" : "date in UTC when toekn expires" + } + } + }, + "400" : { + "description" : "Invalid username/password supplied" + } + } + } + }, + "/user/logout" : { + "get" : { + "tags" : [ "user" ], + "summary" : "Logs out current logged in user session", + "description" : "", + "operationId" : "logoutUser", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ ], + "responses" : { + "default" : { + "description" : "successful operation" + } + } + } + }, + "/user/{username}" : { + "get" : { + "tags" : [ "user" ], + "summary" : "Get user by user name", + "description" : "", + "operationId" : "getUserByName", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "username", + "in" : "path", + "description" : "The name that needs to be fetched. Use user1 for testing. ", + "required" : true, + "type" : "string" + } ], + "responses" : { + "200" : { + "description" : "successful operation", + "schema" : { + "$ref" : "#/definitions/User" + } + }, + "400" : { + "description" : "Invalid username supplied" + }, + "404" : { + "description" : "User not found" + } + } + }, + "put" : { + "tags" : [ "user" ], + "summary" : "Updated user", + "description" : "This can only be done by the logged in user.", + "operationId" : "updateUser", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "username", + "in" : "path", + "description" : "name that need to be deleted", + "required" : true, + "type" : "string" + }, { + "in" : "body", + "name" : "body", + "description" : "Updated user object", + "required" : true, + "schema" : { + "$ref" : "#/definitions/User" + } + } ], + "responses" : { + "400" : { + "description" : "Invalid user supplied" + }, + "404" : { + "description" : "User not found" + } + } + }, + "delete" : { + "tags" : [ "user" ], + "summary" : "Delete user", + "description" : "This can only be done by the logged in user.", + "operationId" : "deleteUser", + "produces" : [ "application/xml", "application/json" ], + "parameters" : [ { + "name" : "username", + "in" : "path", + "description" : "The name that needs to be deleted", + "required" : true, + "type" : "string" + } ], + "responses" : { + "400" : { + "description" : "Invalid username supplied" + }, + "404" : { + "description" : "User not found" + } + } + } + } + }, + "securityDefinitions" : { + "petstore_auth" : { + "type" : "oauth2", + "authorizationUrl" : "http://petstore.swagger.io/api/oauth/dialog", + "flow" : "implicit", + "scopes" : { + "write:pets" : "modify pets in your account", + "read:pets" : "read your pets" + } + }, + "api_key" : { + "type" : "apiKey", + "name" : "api_key", + "in" : "header" + } + }, + "definitions" : { + "Order" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64" + }, + "petId" : { + "type" : "integer", + "format" : "int64" + }, + "quantity" : { + "type" : "integer", + "format" : "int32" + }, + "shipDate" : { + "type" : "string", + "format" : "date-time" + }, + "status" : { + "type" : "string", + "description" : "Order Status", + "enum" : [ "placed", "approved", "delivered" ] + }, + "complete" : { + "type" : "boolean", + "default" : false + } + }, + "title" : "Pet Order", + "description" : "An order for a pets from the pet store", + "xml" : { + "name" : "Order" + } + }, + "Category" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64" + }, + "name" : { + "type" : "string" + } + }, + "title" : "Pet catehgry", + "description" : "A category for a pet", + "xml" : { + "name" : "Category" + } + }, + "User" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64" + }, + "username" : { + "type" : "string" + }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "email" : { + "type" : "string" + }, + "password" : { + "type" : "string" + }, + "phone" : { + "type" : "string" + }, + "userStatus" : { + "type" : "integer", + "format" : "int32", + "description" : "User Status" + } + }, + "title" : "a User", + "description" : "A User who is purchasing from the pet store", + "xml" : { + "name" : "User" + } + }, + "Tag" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64" + }, + "name" : { + "type" : "string" + } + }, + "title" : "Pet Tag", + "description" : "A tag for a pet", + "xml" : { + "name" : "Tag" + } + }, + "Pet" : { + "type" : "object", + "required" : [ "name", "photoUrls" ], + "properties" : { + "id" : { + "type" : "integer", + "format" : "int64" + }, + "category" : { + "$ref" : "#/definitions/Category" + }, + "name" : { + "type" : "string", + "example" : "doggie" + }, + "photoUrls" : { + "type" : "array", + "xml" : { + "name" : "photoUrl", + "wrapped" : true + }, + "items" : { + "type" : "string" + } + }, + "tags" : { + "type" : "array", + "xml" : { + "name" : "tag", + "wrapped" : true + }, + "items" : { + "$ref" : "#/definitions/Tag" + } + }, + "status" : { + "type" : "string", + "description" : "pet status in the store", + "enum" : [ "available", "pending", "sold" ] + } + }, + "title" : "a Pet", + "description" : "A pet for sale in the pet store", + "xml" : { + "name" : "Pet" + } + }, + "ApiResponse" : { + "type" : "object", + "properties" : { + "code" : { + "type" : "integer", + "format" : "int32" + }, + "type" : { + "type" : "string" + }, + "message" : { + "type" : "string" + } + }, + "title" : "An uploaded response", + "description" : "Describes the result of uploading an image resource" + } + }, + "externalDocs" : { + "description" : "Find out more about Swagger", + "url" : "http://swagger.io" + } +} diff --git a/samples/server/petstore/erlang-server/src/swagger_api.erl b/samples/server/petstore/erlang-server/src/swagger_api.erl index b3020fbbf69b..2fbc055ad08f 100644 --- a/samples/server/petstore/erlang-server/src/swagger_api.erl +++ b/samples/server/petstore/erlang-server/src/swagger_api.erl @@ -271,7 +271,6 @@ request_param_info('DeleteOrder', 'orderId') -> source => binding , rules => [ {type, 'binary'}, - {min, 1.0 }, required ] }; @@ -281,8 +280,8 @@ request_param_info('GetOrderById', 'orderId') -> source => binding , rules => [ {type, 'integer'}, - {max, 5.0 }, - {min, 1.0 }, + {max, 5 }, + {min, 1 }, required ] }; From 3849d64c2466872ecc09de963b82f0d094ba72a5 Mon Sep 17 00:00:00 2001 From: Todd Date: Mon, 27 Mar 2017 02:15:36 -0500 Subject: [PATCH 12/13] export top level enumeration types in typescript-fetch mode (#4820) This change enables top level enumeratons to be written out as: export type SortDirection = "Ascending" | "Descending"; vs. export class SortDirection { } --- .../src/main/resources/TypeScript-Fetch/api.mustache | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache index c3a257107829..88db5deda9d5 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache @@ -34,7 +34,12 @@ export class BaseAPI { * {{{description}}} */ {{/description}} +{{^isEnum}} export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ +{{/isEnum}} +{{#isEnum}} +export type {{{classname}}} = {{#allowableValues}}{{#values}}"{{{.}}}"{{^-last}} | {{/-last}}{{/values}}{{/allowableValues}}; +{{/isEnum}} {{#vars}} {{#description}} /** @@ -43,7 +48,9 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ {{/description}} "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}; {{/vars}} +{{^isEnum}} } +{{/isEnum}} {{#hasEnums}} {{#vars}} From b275b8f9dab0b9e153cdf24e2ae9a16935bf8211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 27 Mar 2017 09:24:18 +0200 Subject: [PATCH 13/13] Updating samples for spring-stubs, springboot-delegate, springboot-delegate-j8. (#5211) --- samples/client/petstore/spring-stubs/pom.xml | 4 ++-- samples/server/petstore/springboot-delegate-j8/pom.xml | 4 ++-- samples/server/petstore/springboot-delegate/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/client/petstore/spring-stubs/pom.xml b/samples/client/petstore/spring-stubs/pom.xml index c9b23f86de91..a66490dbb6bc 100644 --- a/samples/client/petstore/spring-stubs/pom.xml +++ b/samples/client/petstore/spring-stubs/pom.xml @@ -9,12 +9,12 @@ 1.7 ${java.version} ${java.version} - 2.5.0 + 2.6.1 org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.5.RELEASE src/main/java diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index 959f41870566..ed0ffabba6c9 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -9,12 +9,12 @@ 1.8 ${java.version} ${java.version} - 2.5.0 + 2.6.1 org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.5.RELEASE src/main/java diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml index d777f7d31f14..79ebd1099b74 100644 --- a/samples/server/petstore/springboot-delegate/pom.xml +++ b/samples/server/petstore/springboot-delegate/pom.xml @@ -9,12 +9,12 @@ 1.7 ${java.version} ${java.version} - 2.5.0 + 2.6.1 org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.5.RELEASE src/main/java