From 471598359a86b85ea2a877a367085f1993c889f9 Mon Sep 17 00:00:00 2001 From: Antoine Kurukchi Date: Wed, 22 Feb 2017 09:53:43 +0000 Subject: [PATCH 01/12] Added include to qt5cpp to fix library compile While creating a static library from the generated files, compilation issues arose due to QDateTime only being forward declared. Adding the include resolves the issue. --- .../src/main/resources/qt5cpp/helpers-body.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache index fb7b29b01074..8e1e975811ec 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-body.mustache @@ -5,6 +5,7 @@ #include #include #include +#include namespace Swagger { From 165076a4273c30520a44b571085279eefde39a03 Mon Sep 17 00:00:00 2001 From: Johannes Fiala Date: Sun, 5 Mar 2017 17:30:17 +0100 Subject: [PATCH 02/12] add jackson dependencies to pom #4924 --- .../JavaJaxRS/cxf/server/pom.mustache | 13 +++++++++++ samples/server/petstore/jaxrs-cxf/pom.xml | 23 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 386f337867a8..6aca3eab56df 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -160,6 +160,18 @@ ${cxf-version} compile + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-jaxrs-version} + compile + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-jaxrs-version} + compile + {{#generateSpringApplication}} @@ -233,6 +245,7 @@ 1.3.3.RELEASE {{/generateSpringBootApplication}} 3.1.8 + 2.4.5 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index cdf3a68ed8f7..3b4ff93c27ec 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -112,6 +112,13 @@ ${junit-version} test + + + javax.validation + validation-api + ${beanvalidation-version} + provided + org.apache.cxf @@ -151,6 +158,18 @@ ${cxf-version} compile + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-jaxrs-version} + compile + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-jaxrs-version} + compile + @@ -165,13 +184,15 @@ 1.7 ${java.version} ${java.version} - 1.5.10 + 1.5.12 9.2.9.v20150224 2.22.2 4.12 1.1.7 2.5 + 1.1.0.Final 3.1.8 + 2.4.5 UTF-8 From 7b559b44221a8b84e4ab03710badababb36ba261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Sun, 5 Mar 2017 18:12:29 +0100 Subject: [PATCH 03/12] Update samples for MSF4J after 2.2.2. (#4915) --- samples/server/petstore/java-msf4j/pom.xml | 2 +- .../src/gen/java/io/swagger/api/FakeApi.java | 12 +- .../java/io/swagger/api/FakeApiService.java | 4 +- .../src/gen/java/io/swagger/api/PetApi.java | 2 +- .../java/io/swagger/api/PetApiService.java | 2 +- .../src/gen/java/io/swagger/api/UserApi.java | 2 +- .../java/io/swagger/api/UserApiService.java | 2 +- .../src/gen/java/io/swagger/model/Animal.java | 2 + .../java/io/swagger/model/Capitalization.java | 189 ++++++++++++++++++ .../gen/java/io/swagger/model/ClassModel.java | 75 +++++++ .../gen/java/io/swagger/model/EnumTest.java | 28 ++- .../gen/java/io/swagger/model/FormatTest.java | 17 +- ...ropertiesAndAdditionalPropertiesClass.java | 9 +- .../gen/java/io/swagger/model/OuterEnum.java | 41 ++++ .../swagger/api/impl/FakeApiServiceImpl.java | 4 +- .../swagger/api/impl/PetApiServiceImpl.java | 2 +- .../swagger/api/impl/UserApiServiceImpl.java | 2 +- 17 files changed, 364 insertions(+), 31 deletions(-) create mode 100644 samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Capitalization.java create mode 100644 samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/ClassModel.java create mode 100644 samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/OuterEnum.java diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index b7c61004bac4..84aac08e9d32 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -81,7 +81,7 @@ 1.7 ${java.version} ${java.version} - 1.5.9 + 1.5.12 9.2.9.v20150224 2.22.2 4.12 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 1ff18daec256..8d7e3c477d9f 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 @@ -7,9 +7,9 @@ import io.swagger.api.factories.FakeApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.math.BigDecimal; import io.swagger.model.Client; import java.util.Date; -import java.math.BigDecimal; import java.util.List; import io.swagger.api.NotFoundException; @@ -36,7 +36,7 @@ public class FakeApi { @Consumes({ "application/json" }) @Produces({ "application/json" }) - @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "", response = Client.class, tags={ "fake", }) + @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClientModel(@ApiParam(value = "client model" ,required=true) Client body @@ -75,9 +75,9 @@ public class FakeApi { } @GET - @Consumes({ "application/json" }) - @Produces({ "application/json" }) - @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "", response = void.class, tags={ "fake", }) + @Consumes({ "*/*" }) + @Produces({ "*/*" }) + @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", response = void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = void.class), @@ -88,7 +88,7 @@ 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") BigDecimal enumQueryInteger +,@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 ) throws NotFoundException { diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java index 33a0ff02d3c2..1b1e4b8603a2 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java @@ -6,9 +6,9 @@ import io.swagger.model.*; import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; +import java.math.BigDecimal; import io.swagger.model.Client; import java.util.Date; -import java.math.BigDecimal; import java.util.List; import io.swagger.api.NotFoundException; @@ -43,7 +43,7 @@ public abstract class FakeApiService { ,String enumHeaderString ,List enumQueryStringArray ,String enumQueryString - ,BigDecimal enumQueryInteger + ,Integer enumQueryInteger ,Double enumQueryDouble ) throws NotFoundException; } diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java index a6b77ddc778b..09c5be96450a 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java @@ -7,9 +7,9 @@ import io.swagger.api.factories.PetApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import io.swagger.model.Pet; import java.io.File; import io.swagger.model.ModelApiResponse; +import io.swagger.model.Pet; import java.util.List; import io.swagger.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java index f96a1305859f..1aab66fe31bd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java @@ -6,9 +6,9 @@ import io.swagger.model.*; import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import io.swagger.model.Pet; import java.io.File; import io.swagger.model.ModelApiResponse; +import io.swagger.model.Pet; import java.util.List; import io.swagger.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java index fe7159324b98..b09b2a521877 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java @@ -7,8 +7,8 @@ import io.swagger.api.factories.UserApiServiceFactory; import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import io.swagger.model.User; import java.util.List; +import io.swagger.model.User; import java.util.List; import io.swagger.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java index 5042a5513420..a92e18276c6b 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java @@ -6,8 +6,8 @@ import io.swagger.model.*; import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import io.swagger.model.User; import java.util.List; +import io.swagger.model.User; import java.util.List; import io.swagger.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Animal.java index de739ed501c5..60aaf82231f2 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Animal.java @@ -3,6 +3,8 @@ package io.swagger.model; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Capitalization.java new file mode 100644 index 000000000000..94cb9977104c --- /dev/null +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/Capitalization.java @@ -0,0 +1,189 @@ +package io.swagger.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * Capitalization + */ + +public class Capitalization { + @JsonProperty("smallCamel") + private String smallCamel = null; + + @JsonProperty("CapitalCamel") + private String capitalCamel = null; + + @JsonProperty("small_Snake") + private String smallSnake = null; + + @JsonProperty("Capital_Snake") + private String capitalSnake = null; + + @JsonProperty("SCA_ETH_Flow_Points") + private String scAETHFlowPoints = null; + + @JsonProperty("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 "); + } +} + diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/ClassModel.java new file mode 100644 index 000000000000..16c743e4f324 --- /dev/null +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/ClassModel.java @@ -0,0 +1,75 @@ +package io.swagger.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * Model for testing model with \"_class\" property + */ +@ApiModel(description = "Model for testing model with \"_class\" property") + +public class ClassModel { + @JsonProperty("_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 "); + } +} + diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/EnumTest.java index dc00d569c7ec..d081e7268557 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/EnumTest.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.model.OuterEnum; /** * EnumTest @@ -116,6 +117,9 @@ public class EnumTest { @JsonProperty("enum_number") private EnumNumberEnum enumNumber = null; + @JsonProperty("outerEnum") + private OuterEnum outerEnum = null; + public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; @@ -170,6 +174,24 @@ public class EnumTest { this.enumNumber = enumNumber; } + public EnumTest outerEnum(OuterEnum outerEnum) { + this.outerEnum = outerEnum; + return this; + } + + /** + * Get outerEnum + * @return outerEnum + **/ + @ApiModelProperty(value = "") + public OuterEnum getOuterEnum() { + return outerEnum; + } + + public void setOuterEnum(OuterEnum outerEnum) { + this.outerEnum = outerEnum; + } + @Override public boolean equals(java.lang.Object o) { @@ -182,12 +204,13 @@ public class EnumTest { EnumTest enumTest = (EnumTest) o; return Objects.equals(this.enumString, enumTest.enumString) && Objects.equals(this.enumInteger, enumTest.enumInteger) && - Objects.equals(this.enumNumber, enumTest.enumNumber); + Objects.equals(this.enumNumber, enumTest.enumNumber) && + Objects.equals(this.outerEnum, enumTest.outerEnum); } @Override public int hashCode() { - return Objects.hash(enumString, enumInteger, enumNumber); + return Objects.hash(enumString, enumInteger, enumNumber, outerEnum); } @Override @@ -198,6 +221,7 @@ public class EnumTest { sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); + sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/FormatTest.java index 7c882eb3fee4..4c4968d4aee3 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/FormatTest.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; +import java.util.UUID; /** * FormatTest @@ -47,7 +48,7 @@ public class FormatTest { private Date dateTime = null; @JsonProperty("uuid") - private String uuid = null; + private UUID uuid = null; @JsonProperty("password") private String password = null; @@ -59,8 +60,8 @@ public class FormatTest { /** * Get integer - * minimum: 10.0 - * maximum: 100.0 + * minimum: 10 + * maximum: 100 * @return integer **/ @ApiModelProperty(value = "") @@ -79,8 +80,8 @@ public class FormatTest { /** * Get int32 - * minimum: 20.0 - * maximum: 200.0 + * minimum: 20 + * maximum: 200 * @return int32 **/ @ApiModelProperty(value = "") @@ -260,7 +261,7 @@ public class FormatTest { this.dateTime = dateTime; } - public FormatTest uuid(String uuid) { + public FormatTest uuid(UUID uuid) { this.uuid = uuid; return this; } @@ -270,11 +271,11 @@ public class FormatTest { * @return uuid **/ @ApiModelProperty(value = "") - public String getUuid() { + public UUID getUuid() { return uuid; } - public void setUuid(String uuid) { + public void setUuid(UUID uuid) { this.uuid = uuid; } diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index 5a55ab81d68b..0a1edad338e7 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; /** * MixedPropertiesAndAdditionalPropertiesClass @@ -17,7 +18,7 @@ import java.util.Map; public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("uuid") - private String uuid = null; + private UUID uuid = null; @JsonProperty("dateTime") private Date dateTime = null; @@ -25,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") private Map map = new HashMap(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { + public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; return this; } @@ -35,11 +36,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return uuid **/ @ApiModelProperty(value = "") - public String getUuid() { + public UUID getUuid() { return uuid; } - public void setUuid(String uuid) { + public void setUuid(UUID uuid) { this.uuid = uuid; } diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/OuterEnum.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/OuterEnum.java new file mode 100644 index 000000000000..0abc3d063b5b --- /dev/null +++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/model/OuterEnum.java @@ -0,0 +1,41 @@ +package io.swagger.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.JsonCreator; + +/** + * Gets or Sets OuterEnum + */ +public enum OuterEnum { + + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + + private String value; + + OuterEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OuterEnum fromValue(String text) { + for (OuterEnum b : OuterEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + return null; + } +} + diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java index 43e07c14462b..36f2787cd1ff 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java @@ -3,9 +3,9 @@ package io.swagger.api.impl; import io.swagger.api.*; import io.swagger.model.*; +import java.math.BigDecimal; import io.swagger.model.Client; import java.util.Date; -import java.math.BigDecimal; import java.util.List; import io.swagger.api.NotFoundException; @@ -52,7 +52,7 @@ public class FakeApiServiceImpl extends FakeApiService { , String enumHeaderString , List enumQueryStringArray , String enumQueryString -, BigDecimal enumQueryInteger +, Integer enumQueryInteger , Double enumQueryDouble ) throws NotFoundException { // do some magic! diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java index ea6b7553a526..d298d1e45d22 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java @@ -3,9 +3,9 @@ package io.swagger.api.impl; import io.swagger.api.*; import io.swagger.model.*; -import io.swagger.model.Pet; import java.io.File; import io.swagger.model.ModelApiResponse; +import io.swagger.model.Pet; import java.util.List; import io.swagger.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java index babd595dca8b..044080093b8b 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java @@ -3,8 +3,8 @@ package io.swagger.api.impl; import io.swagger.api.*; import io.swagger.model.*; -import io.swagger.model.User; import java.util.List; +import io.swagger.model.User; import java.util.List; import io.swagger.api.NotFoundException; From 7800641db21dcb48051f0f9bb4a9cb415d01d994 Mon Sep 17 00:00:00 2001 From: jsone-studios Date: Sun, 5 Mar 2017 18:15:56 +0100 Subject: [PATCH 04/12] Fixes #4913 (#4914) --- .../languages/StaticHtml2Generator.java | 18 +- .../test/resources/2_0/responseCodeTest.yaml | 17 + samples/html2/index.html | 4200 +---------------- 3 files changed, 65 insertions(+), 4170 deletions(-) create mode 100644 modules/swagger-codegen/src/test/resources/2_0/responseCodeTest.yaml diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java index 3fbfd90e5e04..dba87bf44cbe 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java @@ -1,15 +1,24 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.*; +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenParameter; +import io.swagger.codegen.CodegenResponse; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.codegen.SupportingFile; +import io.swagger.models.Info; import io.swagger.models.Model; import io.swagger.models.Operation; import io.swagger.models.Swagger; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; -import io.swagger.models.Info; import org.apache.commons.lang3.StringUtils; + import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -113,6 +122,11 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi List operationList = (List) operations.get("operation"); for (CodegenOperation op : operationList) { op.httpMethod = op.httpMethod.toLowerCase(); + for (CodegenResponse response : op.responses){ + if ("0".equals(response.code)){ + response.code = "default"; + } + } } return objs; } diff --git a/modules/swagger-codegen/src/test/resources/2_0/responseCodeTest.yaml b/modules/swagger-codegen/src/test/resources/2_0/responseCodeTest.yaml new file mode 100644 index 000000000000..73e20403b5b3 --- /dev/null +++ b/modules/swagger-codegen/src/test/resources/2_0/responseCodeTest.yaml @@ -0,0 +1,17 @@ +swagger: '2.0' +info: + description: 'Test for response code default' + version: 1.0.0 + title: Response code test +basePath: / +paths: + /test: + get: + summary: Test + produces: + - application/json + responses: + 200: + description: successful operation + default: + description: Internal server error \ No newline at end of file diff --git a/samples/html2/index.html b/samples/html2/index.html index 9d0ad3a20f4c..51bc43a4f01b 100644 --- a/samples/html2/index.html +++ b/samples/html2/index.html @@ -988,227 +988,12 @@ margin-bottom: 20px;
-

-

- 


/pet
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/pet"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        Pet body = ; // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.addPet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#addPet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Pet body = ; // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.addPet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#addPet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-Pet *body = ; // Pet object that needs to be added to the store
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Add a new pet to the store
-[apiInstance addPetWith:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var body = ; // {Pet} Pet object that needs to be added to the store
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.addPet(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class addPetExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var body = new Pet(); // Pet | Pet object that needs to be added to the store
-
-            try
-            {
-                // Add a new pet to the store
-                apiInstance.addPet(body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.addPet: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$body = ; // Pet | Pet object that needs to be added to the store
-
-try {
-    $api_instance->addPet($body);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->addPet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
-
-eval { 
-    $api_instance->addPet(body => $body);
-};
-if ($@) {
-    warn "Exception when calling PetApi->addPet: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-body =  # Pet | Pet object that needs to be added to the store
-
-try: 
-    # Add a new pet to the store
-    api_instance.addPet(body)
-except ApiException as e:
-    print("Exception when calling PetApi->addPet: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -1283,236 +1068,10 @@ except ApiException as e:
-

-

- 


/pet/{petId}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X delete "http://petstore.swagger.io/v2/pet/{petId}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | Pet id to delete
-        String apiKey = apiKey_example; // String | 
-        try {
-            apiInstance.deletePet(petId, apiKey);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#deletePet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | Pet id to delete
-        String apiKey = apiKey_example; // String | 
-        try {
-            apiInstance.deletePet(petId, apiKey);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#deletePet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-Long *petId = 789; // Pet id to delete
-String *apiKey = apiKey_example; //  (optional)
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Deletes a pet
-[apiInstance deletePetWith:petId
-    apiKey:apiKey
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var petId = 789; // {Long} Pet id to delete
-
-var opts = { 
-  'apiKey': apiKey_example // {String} 
-};
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.deletePet(petId, opts, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class deletePetExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var petId = 789;  // Long | Pet id to delete
-            var apiKey = apiKey_example;  // String |  (optional) 
-
-            try
-            {
-                // Deletes a pet
-                apiInstance.deletePet(petId, apiKey);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.deletePet: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$petId = 789; // Long | Pet id to delete
-$apiKey = apiKey_example; // String | 
-
-try {
-    $api_instance->deletePet($petId, $apiKey);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->deletePet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $petId = 789; # Long | Pet id to delete
-my $apiKey = apiKey_example; # String | 
-
-eval { 
-    $api_instance->deletePet(petId => $petId, apiKey => $apiKey);
-};
-if ($@) {
-    warn "Exception when calling PetApi->deletePet: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-petId = 789 # Long | Pet id to delete
-apiKey = apiKey_example # String |  (optional)
-
-try: 
-    # Deletes a pet
-    api_instance.deletePet(petId, apiKey=apiKey)
-except ApiException as e:
-    print("Exception when calling PetApi->deletePet: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -1618,238 +1177,17 @@ except ApiException as e:
-

-

Multiple status values can be provided with comma separated strings

-

+

+

Multiple status values can be provided with comma separated strings

+ 


/pet/findByStatus
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/pet/findByStatus?status="
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        array[String] status = ; // array[String] | Status values that need to be considered for filter
-        try {
-            array[Pet] result = apiInstance.findPetsByStatus(status);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByStatus");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        array[String] status = ; // array[String] | Status values that need to be considered for filter
-        try {
-            array[Pet] result = apiInstance.findPetsByStatus(status);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByStatus");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-array[String] *status = ; // Status values that need to be considered for filter
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Finds Pets by status
-[apiInstance findPetsByStatusWith:status
-              completionHandler: ^(array[Pet] output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var status = ; // {array[String]} Status values that need to be considered for filter
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.findPetsByStatus(status, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class findPetsByStatusExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var status = new array[String](); // array[String] | Status values that need to be considered for filter
-
-            try
-            {
-                // Finds Pets by status
-                array[Pet] result = apiInstance.findPetsByStatus(status);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.findPetsByStatus: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$status = ; // array[String] | Status values that need to be considered for filter
-
-try {
-    $result = $api_instance->findPetsByStatus($status);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->findPetsByStatus: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $status = []; # array[String] | Status values that need to be considered for filter
-
-eval { 
-    my $result = $api_instance->findPetsByStatus(status => $status);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->findPetsByStatus: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-status =  # array[String] | Status values that need to be considered for filter
-
-try: 
-    # Finds Pets by status
-    api_response = api_instance.findPetsByStatus(status)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling PetApi->findPetsByStatus: %s\n" % e)
-
-

Parameters

-
Query parameters
@@ -1962,238 +1300,17 @@ except ApiException as e:
-

-

Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.

-

+

+

Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.

+ 


/pet/findByTags
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/pet/findByTags?tags="
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        array[String] tags = ; // array[String] | Tags to filter by
-        try {
-            array[Pet] result = apiInstance.findPetsByTags(tags);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByTags");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        array[String] tags = ; // array[String] | Tags to filter by
-        try {
-            array[Pet] result = apiInstance.findPetsByTags(tags);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#findPetsByTags");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-array[String] *tags = ; // Tags to filter by
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Finds Pets by tags
-[apiInstance findPetsByTagsWith:tags
-              completionHandler: ^(array[Pet] output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var tags = ; // {array[String]} Tags to filter by
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.findPetsByTags(tags, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class findPetsByTagsExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var tags = new array[String](); // array[String] | Tags to filter by
-
-            try
-            {
-                // Finds Pets by tags
-                array[Pet] result = apiInstance.findPetsByTags(tags);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.findPetsByTags: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$tags = ; // array[String] | Tags to filter by
-
-try {
-    $result = $api_instance->findPetsByTags($tags);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->findPetsByTags: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $tags = []; # array[String] | Tags to filter by
-
-eval { 
-    my $result = $api_instance->findPetsByTags(tags => $tags);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->findPetsByTags: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-tags =  # array[String] | Tags to filter by
-
-try: 
-    # Finds Pets by tags
-    api_response = api_instance.findPetsByTags(tags)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling PetApi->findPetsByTags: %s\n" % e)
-
-

Parameters

-
Query parameters
@@ -2304,248 +1421,13 @@ except ApiException as e:
-

-

Returns a single pet

-

+

+

Returns a single pet

+ 


/pet/{petId}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/pet/{petId}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet to return
-        try {
-            Pet result = apiInstance.getPetById(petId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#getPetById");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet to return
-        try {
-            Pet result = apiInstance.getPetById(petId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#getPetById");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure API key authorization: (authentication scheme: api_key)
-[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
-
-Long *petId = 789; // ID of pet to return
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Find pet by ID
-[apiInstance getPetByIdWith:petId
-              completionHandler: ^(Pet output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
-api_key.apiKey = "YOUR API KEY"
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//api_key.apiKeyPrefix['api_key'] = "Token"
-
-var api = new SwaggerPetstore.PetApi()
-
-var petId = 789; // {Long} ID of pet to return
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.getPetById(petId, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class getPetByIdExample
-    {
-        public void main()
-        {
-            
-            // Configure API key authorization: api_key
-            Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY");
-            // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer");
-
-            var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet to return
-
-            try
-            {
-                // Find pet by ID
-                Pet result = apiInstance.getPetById(petId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.getPetById: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure API key authorization: api_key
-Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'Bearer');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$petId = 789; // Long | ID of pet to return
-
-try {
-    $result = $api_instance->getPetById($petId);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->getPetById: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure API key authorization: api_key
-$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $petId = 789; # Long | ID of pet to return
-
-eval { 
-    my $result = $api_instance->getPetById(petId => $petId);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->getPetById: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# swagger_client.configuration.api_key_prefix['api_key'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-petId = 789 # Long | ID of pet to return
-
-try: 
-    # Find pet by ID
-    api_response = api_instance.getPetById(petId)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling PetApi->getPetById: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -2662,227 +1544,12 @@ except ApiException as e:
-

-

- 


/pet
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X put "http://petstore.swagger.io/v2/pet"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        Pet body = ; // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.updatePet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Pet body = ; // Pet | Pet object that needs to be added to the store
-        try {
-            apiInstance.updatePet(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePet");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-Pet *body = ; // Pet object that needs to be added to the store
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Update an existing pet
-[apiInstance updatePetWith:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var body = ; // {Pet} Pet object that needs to be added to the store
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.updatePet(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class updatePetExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var body = new Pet(); // Pet | Pet object that needs to be added to the store
-
-            try
-            {
-                // Update an existing pet
-                apiInstance.updatePet(body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.updatePet: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$body = ; // Pet | Pet object that needs to be added to the store
-
-try {
-    $api_instance->updatePet($body);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->updatePet: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
-
-eval { 
-    $api_instance->updatePet(body => $body);
-};
-if ($@) {
-    warn "Exception when calling PetApi->updatePet: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-body =  # Pet | Pet object that needs to be added to the store
-
-try: 
-    # Update an existing pet
-    api_instance.updatePet(body)
-except ApiException as e:
-    print("Exception when calling PetApi->updatePet: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -2973,245 +1640,10 @@ except ApiException as e:
-

-

- 


/pet/{petId}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/pet/{petId}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet that needs to be updated
-        String name = name_example; // String | Updated name of the pet
-        String status = status_example; // String | Updated status of the pet
-        try {
-            apiInstance.updatePetWithForm(petId, name, status);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePetWithForm");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet that needs to be updated
-        String name = name_example; // String | Updated name of the pet
-        String status = status_example; // String | Updated status of the pet
-        try {
-            apiInstance.updatePetWithForm(petId, name, status);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#updatePetWithForm");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-Long *petId = 789; // ID of pet that needs to be updated
-String *name = name_example; // Updated name of the pet (optional)
-String *status = status_example; // Updated status of the pet (optional)
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// Updates a pet in the store with form data
-[apiInstance updatePetWithFormWith:petId
-    name:name
-    status:status
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var petId = 789; // {Long} ID of pet that needs to be updated
-
-var opts = { 
-  'name': name_example, // {String} Updated name of the pet
-  'status': status_example // {String} Updated status of the pet
-};
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.updatePetWithForm(petId, opts, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class updatePetWithFormExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet that needs to be updated
-            var name = name_example;  // String | Updated name of the pet (optional) 
-            var status = status_example;  // String | Updated status of the pet (optional) 
-
-            try
-            {
-                // Updates a pet in the store with form data
-                apiInstance.updatePetWithForm(petId, name, status);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.updatePetWithForm: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$petId = 789; // Long | ID of pet that needs to be updated
-$name = name_example; // String | Updated name of the pet
-$status = status_example; // String | Updated status of the pet
-
-try {
-    $api_instance->updatePetWithForm($petId, $name, $status);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->updatePetWithForm: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $petId = 789; # Long | ID of pet that needs to be updated
-my $name = name_example; # String | Updated name of the pet
-my $status = status_example; # String | Updated status of the pet
-
-eval { 
-    $api_instance->updatePetWithForm(petId => $petId, name => $name, status => $status);
-};
-if ($@) {
-    warn "Exception when calling PetApi->updatePetWithForm: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-petId = 789 # Long | ID of pet that needs to be updated
-name = name_example # String | Updated name of the pet (optional)
-status = status_example # String | Updated status of the pet (optional)
-
-try: 
-    # Updates a pet in the store with form data
-    api_instance.updatePetWithForm(petId, name=name, status=status)
-except ApiException as e:
-    print("Exception when calling PetApi->updatePetWithForm: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -3351,254 +1783,10 @@ except ApiException as e:
-

-

- 


/pet/{petId}/uploadImage
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/pet/{petId}/uploadImage"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet to update
-        String additionalMetadata = additionalMetadata_example; // String | Additional data to pass to server
-        File file = /path/to/file.txt; // File | file to upload
-        try {
-            ApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFile");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.PetApi;
-
-public class PetApiExample {
-
-    public static void main(String[] args) {
-        PetApi apiInstance = new PetApi();
-        Long petId = 789; // Long | ID of pet to update
-        String additionalMetadata = additionalMetadata_example; // String | Additional data to pass to server
-        File file = /path/to/file.txt; // File | file to upload
-        try {
-            ApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#uploadFile");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
-Long *petId = 789; // ID of pet to update
-String *additionalMetadata = additionalMetadata_example; // Additional data to pass to server (optional)
-File *file = /path/to/file.txt; // file to upload (optional)
-
-PetApi *apiInstance = [[PetApi alloc] init];
-
-// uploads an image
-[apiInstance uploadFileWith:petId
-    additionalMetadata:additionalMetadata
-    file:file
-              completionHandler: ^(ApiResponse output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
-petstore_auth.accessToken = "YOUR ACCESS TOKEN"
-
-var api = new SwaggerPetstore.PetApi()
-
-var petId = 789; // {Long} ID of pet to update
-
-var opts = { 
-  'additionalMetadata': additionalMetadata_example, // {String} Additional data to pass to server
-  'file': /path/to/file.txt // {File} file to upload
-};
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.uploadFile(petId, opts, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class uploadFileExample
-    {
-        public void main()
-        {
-            
-            // Configure OAuth2 access token for authorization: petstore_auth
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PetApi();
-            var petId = 789;  // Long | ID of pet to update
-            var additionalMetadata = additionalMetadata_example;  // String | Additional data to pass to server (optional) 
-            var file = new File(); // File | file to upload (optional) 
-
-            try
-            {
-                // uploads an image
-                ApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PetApi.uploadFile: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure OAuth2 access token for authorization: petstore_auth
-Swagger\Client\Configuration::getDefaultConfiguration()->setAccessToken('YOUR_ACCESS_TOKEN');
-
-$api_instance = new Swagger\Client\Api\PetApi();
-$petId = 789; // Long | ID of pet to update
-$additionalMetadata = additionalMetadata_example; // String | Additional data to pass to server
-$file = /path/to/file.txt; // File | file to upload
-
-try {
-    $result = $api_instance->uploadFile($petId, $additionalMetadata, $file);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling PetApi->uploadFile: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::PetApi;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $petId = 789; # Long | ID of pet to update
-my $additionalMetadata = additionalMetadata_example; # String | Additional data to pass to server
-my $file = /path/to/file.txt; # File | file to upload
-
-eval { 
-    my $result = $api_instance->uploadFile(petId => $petId, additionalMetadata => $additionalMetadata, file => $file);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->uploadFile: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
-
-# create an instance of the API class
-api_instance = swagger_client.PetApi()
-petId = 789 # Long | ID of pet to update
-additionalMetadata = additionalMetadata_example # String | Additional data to pass to server (optional)
-file = /path/to/file.txt # File | file to upload (optional)
-
-try: 
-    # uploads an image
-    api_response = api_instance.uploadFile(petId, additionalMetadata=additionalMetadata, file=file)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling PetApi->uploadFile: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -3775,198 +1963,13 @@ except ApiException as e:
-

-

For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors

-

+

+

For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors

+ 


/store/order/{orderId}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X delete "http://petstore.swagger.io/v2/store/order/{orderId}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.StoreApi;
-
-import java.io.File;
-import java.util.*;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        
-        StoreApi apiInstance = new StoreApi();
-        String orderId = orderId_example; // String | ID of the order that needs to be deleted
-        try {
-            apiInstance.deleteOrder(orderId);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#deleteOrder");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.StoreApi;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        StoreApi apiInstance = new StoreApi();
-        String orderId = orderId_example; // String | ID of the order that needs to be deleted
-        try {
-            apiInstance.deleteOrder(orderId);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#deleteOrder");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
String *orderId = orderId_example; // ID of the order that needs to be deleted
-
-StoreApi *apiInstance = [[StoreApi alloc] init];
-
-// Delete purchase order by ID
-[apiInstance deleteOrderWith:orderId
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.StoreApi()
-
-var orderId = orderId_example; // {String} ID of the order that needs to be deleted
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.deleteOrder(orderId, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class deleteOrderExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new StoreApi();
-            var orderId = orderId_example;  // String | ID of the order that needs to be deleted
-
-            try
-            {
-                // Delete purchase order by ID
-                apiInstance.deleteOrder(orderId);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling StoreApi.deleteOrder: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\StoreApi();
-$orderId = orderId_example; // String | ID of the order that needs to be deleted
-
-try {
-    $api_instance->deleteOrder($orderId);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->deleteOrder: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::StoreApi;
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-my $orderId = orderId_example; # String | ID of the order that needs to be deleted
-
-eval { 
-    $api_instance->deleteOrder(orderId => $orderId);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->deleteOrder: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.StoreApi()
-orderId = orderId_example # String | ID of the order that needs to be deleted
-
-try: 
-    # Delete purchase order by ID
-    api_instance.deleteOrder(orderId)
-except ApiException as e:
-    print("Exception when calling StoreApi->deleteOrder: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -4040,235 +2043,11 @@ except ApiException as e:
-

-

Returns a map of status codes to quantities

-

+

+

Returns a map of status codes to quantities

+ 


/store/inventory
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/store/inventory"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.StoreApi;
-
-import java.io.File;
-import java.util.*;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure API key authorization: api_key
-        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
-        api_key.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //api_key.setApiKeyPrefix("Token");
-
-        StoreApi apiInstance = new StoreApi();
-        try {
-            map['String', 'Integer'] result = apiInstance.getInventory();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getInventory");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.StoreApi;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        StoreApi apiInstance = new StoreApi();
-        try {
-            map['String', 'Integer'] result = apiInstance.getInventory();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getInventory");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Configuration *apiConfig = [Configuration sharedConfig];
-
-// Configure API key authorization: (authentication scheme: api_key)
-[apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
-
-
-StoreApi *apiInstance = [[StoreApi alloc] init];
-
-// Returns pet inventories by status
-[apiInstance getInventoryWithCompletionHandler: 
-              ^(map['String', 'Integer'] output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
-
-// Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
-api_key.apiKey = "YOUR API KEY"
-// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-//api_key.apiKeyPrefix['api_key'] = "Token"
-
-var api = new SwaggerPetstore.StoreApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.getInventory(callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class getInventoryExample
-    {
-        public void main()
-        {
-            
-            // Configure API key authorization: api_key
-            Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY");
-            // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer");
-
-            var apiInstance = new StoreApi();
-
-            try
-            {
-                // Returns pet inventories by status
-                map['String', 'Integer'] result = apiInstance.getInventory();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling StoreApi.getInventory: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-// Configure API key authorization: api_key
-Swagger\Client\Configuration::getDefaultConfiguration()->setApiKey('api_key', 'YOUR_API_KEY');
-// Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-// Swagger\Client\Configuration::getDefaultConfiguration()->setApiKeyPrefix('api_key', 'Bearer');
-
-$api_instance = new Swagger\Client\Api\StoreApi();
-
-try {
-    $result = $api_instance->getInventory();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->getInventory: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::StoreApi;
-
-# Configure API key authorization: api_key
-$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-
-eval { 
-    my $result = $api_instance->getInventory();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->getInventory: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# swagger_client.configuration.api_key_prefix['api_key'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = swagger_client.StoreApi()
-
-try: 
-    # Returns pet inventories by status
-    api_response = api_instance.getInventory()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling StoreApi->getInventory: %s\n" % e)
-
-

Parameters

@@ -4276,7 +2055,6 @@ except ApiException as e: -

Responses

Status: 200 - successful operation

@@ -4335,207 +2113,13 @@ except ApiException as e:
-

-

For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

-

+

+

For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

+ 


/store/order/{orderId}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/store/order/{orderId}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.StoreApi;
-
-import java.io.File;
-import java.util.*;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        
-        StoreApi apiInstance = new StoreApi();
-        Long orderId = 789; // Long | ID of pet that needs to be fetched
-        try {
-            Order result = apiInstance.getOrderById(orderId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getOrderById");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.StoreApi;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        StoreApi apiInstance = new StoreApi();
-        Long orderId = 789; // Long | ID of pet that needs to be fetched
-        try {
-            Order result = apiInstance.getOrderById(orderId);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#getOrderById");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Long *orderId = 789; // ID of pet that needs to be fetched
-
-StoreApi *apiInstance = [[StoreApi alloc] init];
-
-// Find purchase order by ID
-[apiInstance getOrderByIdWith:orderId
-              completionHandler: ^(Order output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.StoreApi()
-
-var orderId = 789; // {Long} ID of pet that needs to be fetched
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.getOrderById(orderId, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class getOrderByIdExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new StoreApi();
-            var orderId = 789;  // Long | ID of pet that needs to be fetched
-
-            try
-            {
-                // Find purchase order by ID
-                Order result = apiInstance.getOrderById(orderId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling StoreApi.getOrderById: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\StoreApi();
-$orderId = 789; // Long | ID of pet that needs to be fetched
-
-try {
-    $result = $api_instance->getOrderById($orderId);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->getOrderById: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::StoreApi;
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-my $orderId = 789; # Long | ID of pet that needs to be fetched
-
-eval { 
-    my $result = $api_instance->getOrderById(orderId => $orderId);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->getOrderById: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.StoreApi()
-orderId = 789 # Long | ID of pet that needs to be fetched
-
-try: 
-    # Find purchase order by ID
-    api_response = api_instance.getOrderById(orderId)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling StoreApi->getOrderById: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -4654,209 +2238,12 @@ except ApiException as e:
-

-

- 


/store/order
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/store/order"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.StoreApi;
-
-import java.io.File;
-import java.util.*;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        
-        StoreApi apiInstance = new StoreApi();
-        Order body = ; // Order | order placed for purchasing the pet
-        try {
-            Order result = apiInstance.placeOrder(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#placeOrder");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.StoreApi;
-
-public class StoreApiExample {
-
-    public static void main(String[] args) {
-        StoreApi apiInstance = new StoreApi();
-        Order body = ; // Order | order placed for purchasing the pet
-        try {
-            Order result = apiInstance.placeOrder(body);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling StoreApi#placeOrder");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
Order *body = ; // order placed for purchasing the pet
-
-StoreApi *apiInstance = [[StoreApi alloc] init];
-
-// Place an order for a pet
-[apiInstance placeOrderWith:body
-              completionHandler: ^(Order output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.StoreApi()
-
-var body = ; // {Order} order placed for purchasing the pet
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.placeOrder(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class placeOrderExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new StoreApi();
-            var body = new Order(); // Order | order placed for purchasing the pet
-
-            try
-            {
-                // Place an order for a pet
-                Order result = apiInstance.placeOrder(body);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling StoreApi.placeOrder: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\StoreApi();
-$body = ; // Order | order placed for purchasing the pet
-
-try {
-    $result = $api_instance->placeOrder($body);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling StoreApi->placeOrder: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::StoreApi;
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-my $body = WWW::SwaggerClient::Object::Order->new(); # Order | order placed for purchasing the pet
-
-eval { 
-    my $result = $api_instance->placeOrder(body => $body);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->placeOrder: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.StoreApi()
-body =  # Order | order placed for purchasing the pet
-
-try: 
-    # Place an order for a pet
-    api_response = api_instance.placeOrder(body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling StoreApi->placeOrder: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -4976,200 +2363,15 @@ except ApiException as e:
-

-

This can only be done by the logged in user.

-

+

+

This can only be done by the logged in user.

+ 


/user
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/user"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        User body = ; // User | Created user object
-        try {
-            apiInstance.createUser(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        User body = ; // User | Created user object
-        try {
-            apiInstance.createUser(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
User *body = ; // Created user object
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Create user
-[apiInstance createUserWith:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var body = ; // {User} Created user object
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.createUser(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class createUserExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var body = new User(); // User | Created user object
-
-            try
-            {
-                // Create user
-                apiInstance.createUser(body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.createUser: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$body = ; // User | Created user object
-
-try {
-    $api_instance->createUser($body);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $body = WWW::SwaggerClient::Object::User->new(); # User | Created user object
-
-eval { 
-    $api_instance->createUser(body => $body);
-};
-if ($@) {
-    warn "Exception when calling UserApi->createUser: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-body =  # User | Created user object
-
-try: 
-    # Create user
-    api_instance.createUser(body)
-except ApiException as e:
-    print("Exception when calling UserApi->createUser: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -5225,7 +2427,7 @@ except ApiException as e:

Responses

-

Status: 0 - successful operation

+

Status: default - successful operation

@@ -5244,200 +2446,12 @@ except ApiException as e:
-

-

- 


/user/createWithArray
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/user/createWithArray"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        array[User] body = ; // array[User] | List of user object
-        try {
-            apiInstance.createUsersWithArrayInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        array[User] body = ; // array[User] | List of user object
-        try {
-            apiInstance.createUsersWithArrayInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
array[User] *body = ; // List of user object
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Creates list of users with given input array
-[apiInstance createUsersWithArrayInputWith:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var body = ; // {array[User]} List of user object
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.createUsersWithArrayInput(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class createUsersWithArrayInputExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var body = new array[User](); // array[User] | List of user object
-
-            try
-            {
-                // Creates list of users with given input array
-                apiInstance.createUsersWithArrayInput(body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.createUsersWithArrayInput: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$body = ; // array[User] | List of user object
-
-try {
-    $api_instance->createUsersWithArrayInput($body);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUsersWithArrayInput: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $body = [WWW::SwaggerClient::Object::array[User]->new()]; # array[User] | List of user object
-
-eval { 
-    $api_instance->createUsersWithArrayInput(body => $body);
-};
-if ($@) {
-    warn "Exception when calling UserApi->createUsersWithArrayInput: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-body =  # array[User] | List of user object
-
-try: 
-    # Creates list of users with given input array
-    api_instance.createUsersWithArrayInput(body)
-except ApiException as e:
-    print("Exception when calling UserApi->createUsersWithArrayInput: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -5496,7 +2510,7 @@ except ApiException as e:

Responses

-

Status: 0 - successful operation

+

Status: default - successful operation

@@ -5515,200 +2529,12 @@ except ApiException as e:
-

-

- 


/user/createWithList
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X post "http://petstore.swagger.io/v2/user/createWithList"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        array[User] body = ; // array[User] | List of user object
-        try {
-            apiInstance.createUsersWithListInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithListInput");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        array[User] body = ; // array[User] | List of user object
-        try {
-            apiInstance.createUsersWithListInput(body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#createUsersWithListInput");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
array[User] *body = ; // List of user object
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Creates list of users with given input array
-[apiInstance createUsersWithListInputWith:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var body = ; // {array[User]} List of user object
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.createUsersWithListInput(body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class createUsersWithListInputExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var body = new array[User](); // array[User] | List of user object
-
-            try
-            {
-                // Creates list of users with given input array
-                apiInstance.createUsersWithListInput(body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.createUsersWithListInput: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$body = ; // array[User] | List of user object
-
-try {
-    $api_instance->createUsersWithListInput($body);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->createUsersWithListInput: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $body = [WWW::SwaggerClient::Object::array[User]->new()]; # array[User] | List of user object
-
-eval { 
-    $api_instance->createUsersWithListInput(body => $body);
-};
-if ($@) {
-    warn "Exception when calling UserApi->createUsersWithListInput: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-body =  # array[User] | List of user object
-
-try: 
-    # Creates list of users with given input array
-    api_instance.createUsersWithListInput(body)
-except ApiException as e:
-    print("Exception when calling UserApi->createUsersWithListInput: %s\n" % e)
-
-

Parameters

-
Body parameters
@@ -5767,7 +2593,7 @@ except ApiException as e:

Responses

-

Status: 0 - successful operation

+

Status: default - successful operation

@@ -5786,198 +2612,13 @@ except ApiException as e:
-

-

This can only be done by the logged in user.

-

+

+

This can only be done by the logged in user.

+ 


/user/{username}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X delete "http://petstore.swagger.io/v2/user/{username}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The name that needs to be deleted
-        try {
-            apiInstance.deleteUser(username);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#deleteUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The name that needs to be deleted
-        try {
-            apiInstance.deleteUser(username);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#deleteUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
String *username = username_example; // The name that needs to be deleted
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Delete user
-[apiInstance deleteUserWith:username
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var username = username_example; // {String} The name that needs to be deleted
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.deleteUser(username, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class deleteUserExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var username = username_example;  // String | The name that needs to be deleted
-
-            try
-            {
-                // Delete user
-                apiInstance.deleteUser(username);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.deleteUser: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$username = username_example; // String | The name that needs to be deleted
-
-try {
-    $api_instance->deleteUser($username);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->deleteUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $username = username_example; # String | The name that needs to be deleted
-
-eval { 
-    $api_instance->deleteUser(username => $username);
-};
-if ($@) {
-    warn "Exception when calling UserApi->deleteUser: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-username = username_example # String | The name that needs to be deleted
-
-try: 
-    # Delete user
-    api_instance.deleteUser(username)
-except ApiException as e:
-    print("Exception when calling UserApi->deleteUser: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -6051,207 +2692,10 @@ except ApiException as e:
-

-

- 


/user/{username}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/user/{username}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The name that needs to be fetched. Use user1 for testing. 
-        try {
-            User result = apiInstance.getUserByName(username);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#getUserByName");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The name that needs to be fetched. Use user1 for testing. 
-        try {
-            User result = apiInstance.getUserByName(username);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#getUserByName");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
String *username = username_example; // The name that needs to be fetched. Use user1 for testing. 
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Get user by user name
-[apiInstance getUserByNameWith:username
-              completionHandler: ^(User output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var username = username_example; // {String} The name that needs to be fetched. Use user1 for testing. 
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.getUserByName(username, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class getUserByNameExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var username = username_example;  // String | The name that needs to be fetched. Use user1 for testing. 
-
-            try
-            {
-                // Get user by user name
-                User result = apiInstance.getUserByName(username);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.getUserByName: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$username = username_example; // String | The name that needs to be fetched. Use user1 for testing. 
-
-try {
-    $result = $api_instance->getUserByName($username);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->getUserByName: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $username = username_example; # String | The name that needs to be fetched. Use user1 for testing. 
-
-eval { 
-    my $result = $api_instance->getUserByName(username => $username);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling UserApi->getUserByName: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-username = username_example # String | The name that needs to be fetched. Use user1 for testing. 
-
-try: 
-    # Get user by user name
-    api_response = api_instance.getUserByName(username)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserApi->getUserByName: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -6367,221 +2811,14 @@ except ApiException as e:
-

-

- 


/user/login
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/user/login?username=&password="
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The user name for login
-        String password = password_example; // String | The password for login in clear text
-        try {
-            'String' result = apiInstance.loginUser(username, password);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#loginUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | The user name for login
-        String password = password_example; // String | The password for login in clear text
-        try {
-            'String' result = apiInstance.loginUser(username, password);
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#loginUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
String *username = username_example; // The user name for login
-String *password = password_example; // The password for login in clear text
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Logs user into the system
-[apiInstance loginUserWith:username
-    password:password
-              completionHandler: ^('String' output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var username = username_example; // {String} The user name for login
-
-var password = password_example; // {String} The password for login in clear text
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.loginUser(username, password, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class loginUserExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var username = username_example;  // String | The user name for login
-            var password = password_example;  // String | The password for login in clear text
-
-            try
-            {
-                // Logs user into the system
-                'String' result = apiInstance.loginUser(username, password);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.loginUser: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$username = username_example; // String | The user name for login
-$password = password_example; // String | The password for login in clear text
-
-try {
-    $result = $api_instance->loginUser($username, $password);
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->loginUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $username = username_example; # String | The user name for login
-my $password = password_example; # String | The password for login in clear text
-
-eval { 
-    my $result = $api_instance->loginUser(username => $username, password => $password);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling UserApi->loginUser: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-username = username_example # String | The user name for login
-password = password_example # String | The password for login in clear text
-
-try: 
-    # Logs user into the system
-    api_response = api_instance.loginUser(username, password)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserApi->loginUser: %s\n" % e)
-
-

Parameters

-
Query parameters
@@ -6755,185 +2992,8 @@ except ApiException as e:
-

-

- 


/user/logout
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X get "http://petstore.swagger.io/v2/user/logout"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        try {
-            apiInstance.logoutUser();
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#logoutUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        try {
-            apiInstance.logoutUser();
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#logoutUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 

-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Logs out current logged in user session
-[apiInstance logoutUserWithCompletionHandler: 
-              ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.logoutUser(callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class logoutUserExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-
-            try
-            {
-                // Logs out current logged in user session
-                apiInstance.logoutUser();
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.logoutUser: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-
-try {
-    $api_instance->logoutUser();
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->logoutUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-
-eval { 
-    $api_instance->logoutUser();
-};
-if ($@) {
-    warn "Exception when calling UserApi->logoutUser: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-
-try: 
-    # Logs out current logged in user session
-    api_instance.logoutUser()
-except ApiException as e:
-    print("Exception when calling UserApi->logoutUser: %s\n" % e)
-
-

Parameters

@@ -6941,9 +3001,8 @@ except ApiException as e: -

Responses

-

Status: 0 - successful operation

+

Status: default - successful operation

@@ -6962,208 +3021,13 @@ except ApiException as e:
-

-

This can only be done by the logged in user.

-

+

+

This can only be done by the logged in user.

+ 


/user/{username}
-

-

Usage and SDK Samples

-

- - -
-
- 
curl -X put "http://petstore.swagger.io/v2/user/{username}"
-
-
- 
import io.swagger.client.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-import io.swagger.client.api.UserApi;
-
-import java.io.File;
-import java.util.*;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | name that need to be deleted
-        User body = ; // User | Updated user object
-        try {
-            apiInstance.updateUser(username, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#updateUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
import io.swagger.client.api.UserApi;
-
-public class UserApiExample {
-
-    public static void main(String[] args) {
-        UserApi apiInstance = new UserApi();
-        String username = username_example; // String | name that need to be deleted
-        User body = ; // User | Updated user object
-        try {
-            apiInstance.updateUser(username, body);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling UserApi#updateUser");
-            e.printStackTrace();
-        }
-    }
-}
-
- -
- 
String *username = username_example; // name that need to be deleted
-User *body = ; // Updated user object
-
-UserApi *apiInstance = [[UserApi alloc] init];
-
-// Updated user
-[apiInstance updateUserWith:username
-    body:body
-              completionHandler: ^(NSError* error) {
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
-
- -
- 
var SwaggerPetstore = require('swagger_petstore');
-
-var api = new SwaggerPetstore.UserApi()
-
-var username = username_example; // {String} name that need to be deleted
-
-var body = ; // {User} Updated user object
-
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully.');
-  }
-};
-api.updateUser(username, body, callback);
-
-
- - -
- 
using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class updateUserExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new UserApi();
-            var username = username_example;  // String | name that need to be deleted
-            var body = new User(); // User | Updated user object
-
-            try
-            {
-                // Updated user
-                apiInstance.updateUser(username, body);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling UserApi.updateUser: " + e.Message );
-            }
-        }
-    }
-}
-
- -
- 
<?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\UserApi();
-$username = username_example; // String | name that need to be deleted
-$body = ; // User | Updated user object
-
-try {
-    $api_instance->updateUser($username, $body);
-} catch (Exception $e) {
-    echo 'Exception when calling UserApi->updateUser: ', $e->getMessage(), PHP_EOL;
-}
-?>
-
- -
- 
use Data::Dumper;
-use WWW::SwaggerClient::Configuration;
-use WWW::SwaggerClient::UserApi;
-
-my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $username = username_example; # String | name that need to be deleted
-my $body = WWW::SwaggerClient::Object::User->new(); # User | Updated user object
-
-eval { 
-    $api_instance->updateUser(username => $username, body => $body);
-};
-if ($@) {
-    warn "Exception when calling UserApi->updateUser: $@\n";
-}
-
- -
- 
from __future__ import print_statement
-import time
-import swagger_client
-from swagger_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_client.UserApi()
-username = username_example # String | name that need to be deleted
-body =  # User | Updated user object
-
-try: 
-    # Updated user
-    api_instance.updateUser(username, body)
-except ApiException as e:
-    print("Exception when calling UserApi->updateUser: %s\n" % e)
-
-

Parameters

-
Path parameters
@@ -7293,7 +3157,7 @@ except ApiException as e:
- Generated 2017-03-02T21:09:32.930+01:00 + Generated 2017-03-04T14:14:43.027Z
From f72340fb17f52665cf03b9906dc42a85ba64eb13 Mon Sep 17 00:00:00 2001 From: Johannes Fiala Date: Sun, 5 Mar 2017 19:17:27 +0100 Subject: [PATCH 05/12] change jackson jaxrs version to 2.8.4 #4924 --- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 2 +- samples/server/petstore/jaxrs-cxf/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 6aca3eab56df..ec2559bd6db4 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -245,7 +245,7 @@ 1.3.3.RELEASE {{/generateSpringBootApplication}} 3.1.8 - 2.4.5 + 2.8.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 3b4ff93c27ec..59b8b3545d8b 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -192,7 +192,7 @@ 2.5 1.1.0.Final 3.1.8 - 2.4.5 + 2.8.4 UTF-8 From 6c9b0ce257e31a0dde54846cbf0a6ae2241b150b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 6 Mar 2017 07:23:02 +0100 Subject: [PATCH 06/12] Update samples for Scalatra after 2.2.2. (#4910) * Update samples for Scalatra after 2.2.2. * [scalatra] Revert changes to build.sbt Changes were made in conjunction with the new finch generator. This reverts those changes to Scalatra's previous build.sbt. * Update scalatra samples again after revert of part of #3905. --- .../src/main/resources/scalatra/build.sbt | 26 ++++++++++++------- .../scala/com/wordnik/client/api/PetApi.scala | 8 +++--- .../com/wordnik/client/api/StoreApi.scala | 4 +-- .../com/wordnik/client/api/UserApi.scala | 3 +++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/scalatra/build.sbt b/modules/swagger-codegen/src/main/resources/scalatra/build.sbt index 9dc3cff3596d..00575312d853 100644 --- a/modules/swagger-codegen/src/main/resources/scalatra/build.sbt +++ b/modules/swagger-codegen/src/main/resources/scalatra/build.sbt @@ -23,12 +23,23 @@ scalaVersion := "2.11.2" scalacOptions += "-language:postfixOps" libraryDependencies ++= Seq( - "com.github.finagle" %% "finch-core" % "0.9.2-SNAPSHOT" changing(), - "com.github.finagle" %% "finch-argonaut" % "0.9.2-SNAPSHOT" changing(), - "io.argonaut" %% "argonaut" % "6.1", - "com.github.finagle" %% "finch-test" % "0.9.2-SNAPSHOT" % "test,it" changing(), - "org.scalacheck" %% "scalacheck" % "1.12.5" % "test,it", - "org.scalatest" %% "scalatest" % "2.2.5" % "test,it" + "org.scalatest" %% "scalatest" % "2.2.1" % "test", + "org.scalatra" %% "scalatra" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-scalate" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-json" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-swagger" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-swagger-ext" % "2.3.0.RC3", + "org.scalatra" %% "scalatra-slf4j" % "2.3.0.RC3", + "org.json4s" %% "json4s-jackson" % "3.2.10", + "org.json4s" %% "json4s-ext" % "3.2.10", + "commons-codec" % "commons-codec" % "1.7", + "net.databinder.dispatch" %% "dispatch-core" % "0.11.2", + //"net.databinder.dispatch" %% "json4s-jackson" % "0.11.2", + "net.databinder.dispatch" %% "dispatch-json4s-jackson" % "0.11.2", + "com.typesafe.akka" %% "akka-actor" % "2.3.6", + "org.eclipse.jetty" % "jetty-server" % "9.2.3.v20140905" % "container;compile;test", + "org.eclipse.jetty" % "jetty-webapp" % "9.2.3.v20140905" % "container;compile;test", + "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;compile;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")) ) resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository" @@ -37,9 +48,6 @@ resolvers += "Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/reposi resolvers += "Sonatype OSS Releases" at "http://oss.sonatype.org/content/repositories/releases/" -resolvers += "TM" at "http://maven.twttr.com" - - ivyXML := diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala index 2353b35ff76e..7c6d352ae5dc 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala @@ -63,7 +63,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[Long]("petId").description(""), headerParam[String]("apiKey").description("").optional) ) - delete("/pet/{petId}",operation(deletePetOperation)) { + delete("/pet/:petId",operation(deletePetOperation)) { val petId = params.getOrElse("petId", halt(400)) @@ -131,7 +131,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[Long]("petId").description("")) ) - get("/pet/{petId}",operation(getPetByIdOperation)) { + get("/pet/:petId",operation(getPetByIdOperation)) { val petId = params.getOrElse("petId", halt(400)) @@ -161,7 +161,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[Long]("petId").description(""), formParam[String]("name").description("").optional, formParam[String]("status").description("").optional) ) - post("/pet/{petId}",operation(updatePetWithFormOperation)) { + post("/pet/:petId",operation(updatePetWithFormOperation)) { val petId = params.getOrElse("petId", halt(400)) @@ -186,7 +186,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[Long]("petId").description(""), formParam[String]("additionalMetadata").description("").optional, formParam[File]("file").description("").optional) ) - post("/pet/{petId}/uploadImage",operation(uploadFileOperation)) { + post("/pet/:petId/uploadImage",operation(uploadFileOperation)) { val petId = params.getOrElse("petId", halt(400)) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala index 44e41f4d1e84..58af1ba24f51 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala @@ -46,7 +46,7 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[String]("orderId").description("")) ) - delete("/store/order/{orderId}",operation(deleteOrderOperation)) { + delete("/store/order/:orderId",operation(deleteOrderOperation)) { val orderId = params.getOrElse("orderId", halt(400)) @@ -71,7 +71,7 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet parameters(pathParam[Long]("orderId").description("")) ) - get("/store/order/{orderId}",operation(getOrderByIdOperation)) { + get("/store/order/:orderId",operation(getOrderByIdOperation)) { val orderId = params.getOrElse("orderId", halt(400)) diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala index 8b8630675b18..8dfcc672c265 100644 --- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala +++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala @@ -93,6 +93,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet delete("/user/:username",operation(deleteUserOperation)) { + val username = params.getOrElse("username", halt(400)) println("username: " + username) @@ -107,6 +108,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet get("/user/:username",operation(getUserByNameOperation)) { + val username = params.getOrElse("username", halt(400)) println("username: " + username) @@ -151,6 +153,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet put("/user/:username",operation(updateUserOperation)) { + val username = params.getOrElse("username", halt(400)) println("username: " + username) From 899ef8f1efbc0c0c0f630e14f0c51bbf82e7331e Mon Sep 17 00:00:00 2001 From: Matan Rubin Date: Mon, 6 Mar 2017 08:25:15 +0200 Subject: [PATCH 07/12] [JAXRS-CXF] [bug #4422] use java.util.Date when selecting dateLibrary=legacy (#4724) according to the help message setting dateLibrary to 'legacy' should make the code generator use java.util.Date. before this change, when setting dateLibrary to 'legacy' made the generator use javax.xml.datatype.XMLGregorianCalendar. now, the generator uses java.util.Date such that the documentation and behavior are consistent. --- .../languages/JavaCXFClientCodegen.java | 51 +++++++++---------- .../languages/JavaCXFServerCodegen.java | 1 - .../languages/JavaJAXRSSpecServerCodegen.java | 27 +++++----- 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java index d1c9d41ae310..214b73e0e29b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java @@ -21,30 +21,30 @@ import io.swagger.codegen.languages.features.LoggingTestFeatures; import io.swagger.models.Operation; public class JavaCXFClientCodegen extends AbstractJavaCodegen - implements BeanValidationFeatures, JaxbFeatures, GzipTestFeatures, LoggingTestFeatures -{ + implements BeanValidationFeatures, JaxbFeatures, GzipTestFeatures, LoggingTestFeatures +{ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodegen.class); - + /** * Name of the sub-directory in "src/main/resource" where to find the * Mustache template for the JAX-RS Codegen. */ protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS"; - + protected boolean useJaxbAnnotations = true; protected boolean useBeanValidation = false; - + protected boolean useGzipFeatureForTests = false; - + protected boolean useLoggingFeatureForTests = false; - + public JavaCXFClientCodegen() { super(); supportsInheritance = true; - + sourceFolder = "src/gen/java"; invokerPackage = "io.swagger.api"; artifactId = "swagger-jaxrs-client"; @@ -52,9 +52,9 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; - + outputFolder = "generated-code/JavaJaxRS-CXF"; - + // clear model and api doc template as this codegen // does not support auto-generated markdown doc at the moment //TODO: add doc templates @@ -63,7 +63,6 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen typeMapping.put("date", "LocalDate"); - typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar' importMapping.put("LocalDate", "org.joda.time.LocalDate"); @@ -72,11 +71,11 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen cliOptions.add(CliOption.newBoolean(USE_JAXB_ANNOTATIONS, "Use JAXB annotations for XML")); cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations")); - + cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE_FOR_TESTS, "Use Gzip Feature for tests")); cliOptions.add(CliOption.newBoolean(USE_LOGGING_FEATURE_FOR_TESTS, "Use Logging Feature for tests")); - - + + } @@ -84,7 +83,7 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen public void processOpts() { super.processOpts(); - + if (additionalProperties.containsKey(USE_JAXB_ANNOTATIONS)) { boolean useJaxbAnnotationsProp = convertPropertyToBooleanAndWriteBack(USE_JAXB_ANNOTATIONS); this.setUseJaxbAnnotations(useJaxbAnnotationsProp); @@ -94,15 +93,15 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen boolean useBeanValidationProp = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION); this.setUseBeanValidation(useBeanValidationProp); } - + this.setUseGzipFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_GZIP_FEATURE_FOR_TESTS)); this.setUseLoggingFeatureForTests(convertPropertyToBooleanAndWriteBack(USE_LOGGING_FEATURE_FOR_TESTS)); - - + + supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen - + writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml")); - + } @Override @@ -117,13 +116,13 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen { return CodegenType.CLIENT; } - + @Override public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { - super.addOperationToGroup(tag, resourcePath, operation, co, operations); + super.addOperationToGroup(tag, resourcePath, operation, co, operations); co.subresourceOperation = !co.path.isEmpty(); } - + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); @@ -132,17 +131,17 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen model.imports.remove("JsonSerialize"); model.imports.remove("ToStringSerializer"); } - + @Override public String getHelp() { return "Generates a Java JAXRS Client based on Apache CXF framework."; } - + public void setUseBeanValidation(boolean useBeanValidation) { this.useBeanValidation = useBeanValidation; } - + public void setUseJaxbAnnotations(boolean useJaxbAnnotations) { this.useJaxbAnnotations = useJaxbAnnotations; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java index 720cbc49331b..8c1b012ba62d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java @@ -78,7 +78,6 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen typeMapping.put("date", "LocalDate"); - typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar' importMapping.put("LocalDate", "org.joda.time.LocalDate"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java index 6c91e175db58..55b2b87da64c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -21,9 +21,9 @@ import io.swagger.models.Swagger; import io.swagger.models.properties.Property; import io.swagger.util.Json; -public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen -{ - +public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen +{ + public JavaJAXRSSpecServerCodegen() { super(); @@ -48,7 +48,6 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen additionalProperties.put("title", title); typeMapping.put("date", "LocalDate"); - typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar' importMapping.put("LocalDate", "org.joda.time.LocalDate"); @@ -60,7 +59,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen break; } } - + CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); library.setDefault(DEFAULT_LIBRARY); @@ -71,20 +70,20 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen cliOptions.add(library); } - + @Override public void processOpts() { super.processOpts(); - + supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml")); - + writeOptional(outputFolder, new SupportingFile("RestApplication.mustache", (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java")); - - } - + + } + @Override public String getName() @@ -119,7 +118,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen opList.add(co); co.baseName = basePath; } - + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); @@ -130,10 +129,10 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen model.imports.remove("JsonValue"); model.imports.remove("JsonProperty"); } - + @Override public void preprocessSwagger(Swagger swagger) { - //copy input swagger to output folder + //copy input swagger to output folder try { String swaggerJson = Json.pretty(swagger); FileUtils.writeStringToFile(new File(outputFolder + File.separator + "swagger.json"), swaggerJson); From e477ac94729bcf98a70d692636aa2feec0ba5917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Mon, 6 Mar 2017 07:47:52 +0100 Subject: [PATCH 08/12] Fix #4898 for spring-cloud. (#4919) Somehow I omitted this in #4875. --- .../JavaSpring/libraries/spring-cloud/formParams.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache index e7547a3ba196..bd2cb8bb6409 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestParam("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestParam("{{baseName}}") MultipartFile {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file From 5d327e66a188fbfbd10a549b681b6167d8173027 Mon Sep 17 00:00:00 2001 From: Paul English Date: Sun, 5 Mar 2017 23:50:21 -0700 Subject: [PATCH 09/12] Port the optional/enum template logic from async-scala to the regular scala client (#4849) * Port the optional/enum template logic from async-scala to the regular scala client * oops, accidently pulled template from akka-scala which has custom logic for enum Just going to avoid enum for now, considering I'm not sure what scala client will be official * Update tests to use option --- .../src/main/resources/scala/model.mustache | 3 +- .../io/swagger/client/model/ApiResponse.scala | 7 +- .../io/swagger/client/model/Category.scala | 5 +- .../scala/io/swagger/client/model/Order.scala | 13 +-- .../scala/io/swagger/client/model/Pet.scala | 9 +- .../scala/io/swagger/client/model/Tag.scala | 5 +- .../scala/io/swagger/client/model/User.scala | 17 ++-- .../scala/src/test/scala/PetApiTest.scala | 34 +++---- .../scala/src/test/scala/StoreApiTest.scala | 34 +++---- .../scala/src/test/scala/UserApiTest.scala | 96 +++++++++---------- 10 files changed, 115 insertions(+), 108 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/scala/model.mustache b/modules/swagger-codegen/src/main/resources/scala/model.mustache index b6920ae9fd4e..12b635bfb3e7 100644 --- a/modules/swagger-codegen/src/main/resources/scala/model.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/model.mustache @@ -12,8 +12,9 @@ case class {{classname}} ( {{#description}} /* {{{description}}} */ {{/description}} - {{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}} + {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}} {{/vars}} ) + {{/model}} {{/models}} diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala index 7ddb74d163f7..a2badb49ae17 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala @@ -14,7 +14,8 @@ package io.swagger.client.model case class ApiResponse ( - code: Integer, - _type: String, - message: String + code: Option[Integer], + _type: Option[String], + message: Option[String] ) + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala index 8ec37098e1ba..e39d097b918c 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala @@ -14,6 +14,7 @@ package io.swagger.client.model case class Category ( - id: Long, - name: String + id: Option[Long], + name: Option[String] ) + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala index 446455f76576..a88c0ec23d92 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala @@ -15,11 +15,12 @@ package io.swagger.client.model import org.joda.time.DateTime case class Order ( - id: Long, - petId: Long, - quantity: Integer, - shipDate: DateTime, + id: Option[Long], + petId: Option[Long], + quantity: Option[Integer], + shipDate: Option[DateTime], /* Order Status */ - status: String, - complete: Boolean + status: Option[String], + complete: Option[Boolean] ) + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala index fcf1a205081a..baabc18c99f5 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala @@ -14,11 +14,12 @@ package io.swagger.client.model case class Pet ( - id: Long, - category: Category, + id: Option[Long], + category: Option[Category], name: String, photoUrls: List[String], - tags: List[Tag], + tags: Option[List[Tag]], /* pet status in the store */ - status: String + status: Option[String] ) + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala index 8abb53e09037..5ae718fd7e87 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala @@ -14,6 +14,7 @@ package io.swagger.client.model case class Tag ( - id: Long, - name: String + id: Option[Long], + name: Option[String] ) + diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala index 30f58e19b7ed..c5bdb3866388 100644 --- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala +++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala @@ -14,13 +14,14 @@ package io.swagger.client.model case class User ( - id: Long, - username: String, - firstName: String, - lastName: String, - email: String, - password: String, - phone: String, + id: Option[Long], + username: Option[String], + firstName: Option[String], + lastName: Option[String], + email: Option[String], + password: Option[String], + phone: Option[String], /* User Status */ - userStatus: Integer + userStatus: Option[Integer] ) + diff --git a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala index 426df5871acd..b5ae542a5fef 100644 --- a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala @@ -17,22 +17,22 @@ class PetApiTest extends FlatSpec with Matchers { it should "add and fetch a pet" in { val pet = Pet( - 1000, - Category(1, "sold"), + Some(1000), + Some(Category(Some(1), Some("sold"))), "dragon", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - (for (i <- (1 to 5)) yield io.swagger.client.model.Tag(i, "tag-" + i)).toList, - "lost" + Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList), + Some("lost") ) api.addPet(pet) api.getPetById(1000) match { case Some(pet) => { - pet.id should be(1000) - pet.tags.size should be(5) - pet.status should be("lost") + pet.id should be(Some(1000)) + pet.tags.get.size should be(5) + pet.status should be(Some("lost")) pet.category should not be (null) - pet.category.name should be("sold") + pet.category.get.name should be(Some("sold")) pet.name should be("dragon") pet.photoUrls.size should be(10) } @@ -42,12 +42,12 @@ class PetApiTest extends FlatSpec with Matchers { it should "update a pet" in { val pet = Pet( - 1000, - Category(1, "sold"), + Some(1000), + Some(Category(Some(1), Some("sold"))), "programmer", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - (for (i <- (1 to 5)) yield io.swagger.client.model.Tag(i, "tag-" + i)).toList, - "confused" + Some((for (i <- (1 to 5)) yield io.swagger.client.model.Tag(Some(i), Some("tag-" + i))).toList), + Some("confused") ) api.addPet(pet) @@ -55,16 +55,16 @@ class PetApiTest extends FlatSpec with Matchers { api.getPetById(1000) match { case Some(pet) => { pet.name should be("programmer") - pet.status should be("confused") + pet.status should be(Some("confused")) } case None => fail("didn't find pet created") } - val updatedPet = pet.copy(status = "fulfilled") + val updatedPet = pet.copy(status = Some("fulfilled")) api.updatePet(updatedPet) api.getPetById(1000) match { case Some(pet) => { pet.name should be("programmer") - pet.status should be("fulfilled") + pet.status should be(Some("fulfilled")) } case None => fail("didn't find pet updated") } @@ -83,8 +83,8 @@ class PetApiTest extends FlatSpec with Matchers { api.findPetsByTags(List("tag1", "tag2")) match { case Some(pets) => { pets.foreach(pet => { - val tags = (for (tag <- pet.tags) yield tag.name).toSet - if ((tags & Set("tag1", "tag2")).size == 0) + val tags = (for (tag <- pet.tags.get) yield tag.name).toSet + if ((tags & Set(Some("tag1"), Some("tag2"))).size == 0) fail("unexpected tags in " + tags) }) } diff --git a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala index b0eac1af66ed..4c1a06f1cb6f 100644 --- a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala @@ -20,22 +20,22 @@ class StoreApiTest extends FlatSpec with Matchers { it should "place and fetch an order" in { val now = new org.joda.time.DateTime val order = Order( - petId = 10, - id = 1000, - quantity = 101, - status = "pending", - shipDate = now, - complete = true) + petId = Some(10), + id = Some(1000), + quantity = Some(101), + status = Some("pending"), + shipDate = Some(now), + complete = Some(true)) api.placeOrder(order) api.getOrderById(1000) match { case Some(order) => { - order.id should be(1000) - order.petId should be(10) - order.quantity should be(101) + order.id should be(Some(1000)) + order.petId should be(Some(10)) + order.quantity should be(Some(101)) // use `getMillis` to compare across timezones - order.shipDate.getMillis.equals(now.getMillis) should be(true) + order.shipDate.get.getMillis.equals(now.getMillis) should be(true) } case None => fail("didn't find order created") } @@ -44,17 +44,17 @@ class StoreApiTest extends FlatSpec with Matchers { it should "delete an order" in { val now = new org.joda.time.DateTime val order = Order( - id = 1001, - petId = 10, - quantity = 101, - status = "pending", - shipDate = now, - complete = true) + id = Some(1001), + petId = Some(10), + quantity = Some(101), + status = Some("pending"), + shipDate = Some(now), + complete = Some(true)) api.placeOrder(order) api.getOrderById(1001) match { - case Some(order) => order.id should be(1001) + case Some(order) => order.id should be(Some(1001)) case None => fail("didn't find order created") } diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala index 77614a5dbbba..b47f7002e961 100644 --- a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala @@ -19,14 +19,14 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { // preparation before running a test override def beforeAll() { val user = User( - 11222, - "scala-test-username", - "scala-test-first", - "scala-test-last", - "scala_test@fail.com", - "SCALATEST", - "408-867-5309", - 1) + Some(11222), + Some("scala-test-username"), + Some("scala-test-first"), + Some("scala-test-last"), + Some("scala_test@fail.com"), + Some("SCALATEST"), + Some("408-867-5309"), + Some(1)) api.createUser(user) } @@ -39,14 +39,14 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { it should "fetch a user" in { api.getUserByName("scala-test-username") match { case Some(user) => { - user.id should be(11222) - user.username should be("scala-test-username") - user.password should be("SCALATEST") - user.email should be("scala_test@fail.com") - user.firstName should be("scala-test-first") - user.lastName should be("scala-test-last") - user.phone should be("408-867-5309") - user.userStatus should be(1) + user.id should be(Some(11222)) + user.username should be(Some("scala-test-username")) + user.password should be(Some("SCALATEST")) + user.email should be(Some("scala_test@fail.com")) + user.firstName should be(Some("scala-test-first")) + user.lastName should be(Some("scala-test-last")) + user.phone should be(Some("408-867-5309")) + user.userStatus should be(Some(1)) } case None => } @@ -69,22 +69,22 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { it should "create 2 users" in { val userArray = (for (i <- (1 to 2)) yield { User( - 2000 + i, - "johnny-" + i, - "Johnny", - "Rocket-" + i, - "johnny-" + i + "@fail.com", - "XXXXXXXXXXX", - "408-867-5309", - 1) + Some(2000 + i), + Some("johnny-" + i), + Some("Johnny"), + Some("Rocket-" + i), + Some("johnny-" + i + "@fail.com"), + Some("XXXXXXXXXXX"), + Some("408-867-5309"), + Some(1)) }).toList api.createUsersWithArrayInput(userArray) for (i <- (1 to 2)) { api.getUserByName("johnny-" + i) match { case Some(user) => { - user.id should be(2000 + i) - user.email should be("johnny-" + i + "@fail.com") + user.id should be(Some(2000 + i)) + user.email should be(Some("johnny-" + i + "@fail.com")) } case None => fail("didn't find user " + i) } @@ -94,22 +94,22 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { it should "create 3 users" in { val userList = (for (i <- (1 to 3)) yield { User( - 3000 + i, - "fred-" + i, - "Johnny", - "Rocket-" + i, - "fred-" + i + "@fail.com", - "XXXXXXXXXXX", - "408-867-5309", - 1) + Some(3000 + i), + Some("fred-" + i), + Some("Johnny"), + Some("Rocket-" + i), + Some("fred-" + i + "@fail.com"), + Some("XXXXXXXXXXX"), + Some("408-867-5309"), + Some(1)) }).toList api.createUsersWithListInput(userList) for (i <- (1 to 3)) { api.getUserByName("fred-" + i) match { case Some(user) => { - user.id should be(3000 + i) - user.email should be("fred-" + i + "@fail.com") + user.id should be(Some(3000 + i)) + user.email should be(Some("fred-" + i + "@fail.com")) } case None => fail("didn't find user " + i) } @@ -118,31 +118,31 @@ class UserApiTest extends FlatSpec with Matchers with BeforeAndAfterAll { it should "update a user" in { val user = User( - 4000, - "tony", - "Tony", - "Tiger", - "tony@fail.com", - "XXXXXXXXXXX", - "408-867-5309", - 1) + Some(4000), + Some("tony"), + Some("Tony"), + Some("Tiger"), + Some("tony@fail.com"), + Some("XXXXXXXXXXX"), + Some("408-867-5309"), + Some(1)) api.createUser(user) api.getUserByName("tony") match { case Some(user) => { - user.id should be(4000) - user.username should be("tony") + user.id should be(Some(4000)) + user.username should be(Some("tony")) } case None => } - val updatedUser = user.copy(email = "tony@succeed.com") + val updatedUser = user.copy(email = Some("tony@succeed.com")) api.updateUser("tony", updatedUser) api.getUserByName("tony") match { case Some(user) => { - user.email should be("tony@succeed.com") + user.email should be(Some("tony@succeed.com")) } case None => } From 10950db2ddf80d4bfb38b2a8845987763767b369 Mon Sep 17 00:00:00 2001 From: Zhanwei Wang Date: Mon, 6 Mar 2017 15:01:19 +0800 Subject: [PATCH 10/12] [JavaScript] Do not parse null and undefined as type. (#4933) * [JavaScript] Do not parse null and undefined as type. * update pet store example for #4932 --- .../src/main/resources/Javascript/ApiClient.mustache | 5 ++++- samples/client/petstore/javascript/src/ApiClient.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache index 8f49b13a4c82..ffe6c32dc8fd 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache @@ -452,9 +452,12 @@ * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type: * all properties on data will be converted to this type. - * @returns An instance of the specified type. + * @returns An instance of the specified type or null or undefined if data is null or undefined. */ {{/emitJSDoc}} exports.convertToType = function(data, type) { + if (data === null || data === undefined) + return data + switch (type) { case 'Boolean': return Boolean(data); diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js index f9f2cb06945f..c3be4990de9e 100644 --- a/samples/client/petstore/javascript/src/ApiClient.js +++ b/samples/client/petstore/javascript/src/ApiClient.js @@ -442,9 +442,12 @@ * or the constructor function for a complex type. Pass an array containing the type name to return an array of that type. To * return an object, pass an object with one property whose name is the key type and whose value is the corresponding value type: * all properties on data will be converted to this type. - * @returns An instance of the specified type. + * @returns An instance of the specified type or null or undefined if data is null or undefined. */ exports.convertToType = function(data, type) { + if (data === null || data === undefined) + return data + switch (type) { case 'Boolean': return Boolean(data); From 4b7a50c6a5077b376f7427cec9b29f635b8e60c9 Mon Sep 17 00:00:00 2001 From: Zhanwei Wang Date: Mon, 6 Mar 2017 16:58:57 +0800 Subject: [PATCH 11/12] Add hashdata to user list (#4935) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 040dfb967135..a5bd8be4e531 100644 --- a/README.md +++ b/README.md @@ -858,6 +858,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you - [goTransverse](http://www.gotransverse.com/api) - [GraphHopper](https://graphhopper.com/) - [Gravitate Solutions](http://gravitatesolutions.com/) +- [HashData](http://www.hashdata.cn/) - [Hewlett Packard Enterprise](https://hpe.com) - [High Technologies Center](http://htc-cs.com) - [IMS Health](http://www.imshealth.com/en/solution-areas/technology-and-applications) From f7b5eb85ce3984e211c26c328d2422e6d6a617eb Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 6 Mar 2017 17:16:41 +0800 Subject: [PATCH 12/12] [Swift] add batch files for swift 2,3 to generate petstore samples (#4934) * add bat files for swift 2,3 to generate petstore samples * remove -t from swift3 batch file * remove -t from swift batch files --- bin/windows/swift-petstore-all.bat | 3 +++ bin/windows/swift-petstore-promisekit.bat | 10 ++++++++++ bin/windows/swift-petstore-rxswift.bat | 10 ++++++++++ bin/windows/swift-petstore.bat | 2 +- bin/windows/swift3-petstore-all.bat | 3 +++ bin/windows/swift3-petstore-promisekit.bat | 10 ++++++++++ bin/windows/swift3-petstore-rxswift.bat | 10 ++++++++++ bin/windows/swift3-petstore.bat | 10 ++++++++++ 8 files changed, 57 insertions(+), 1 deletion(-) create mode 100755 bin/windows/swift-petstore-all.bat create mode 100755 bin/windows/swift-petstore-promisekit.bat create mode 100755 bin/windows/swift-petstore-rxswift.bat create mode 100755 bin/windows/swift3-petstore-all.bat create mode 100755 bin/windows/swift3-petstore-promisekit.bat create mode 100755 bin/windows/swift3-petstore-rxswift.bat create mode 100755 bin/windows/swift3-petstore.bat diff --git a/bin/windows/swift-petstore-all.bat b/bin/windows/swift-petstore-all.bat new file mode 100755 index 000000000000..e837f4c1ec65 --- /dev/null +++ b/bin/windows/swift-petstore-all.bat @@ -0,0 +1,3 @@ +call .\bin\windows\swift-petstore.bat +call .\bin\windows\swift-petstore-promisekit.bat +call .\bin\windows\swift-petstore-rxswift.bat diff --git a/bin/windows/swift-petstore-promisekit.bat b/bin/windows/swift-petstore-promisekit.bat new file mode 100755 index 000000000000..bbd0d4c87b9b --- /dev/null +++ b/bin/windows/swift-petstore-promisekit.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -c bin\swift-petstore-promisekit.json -o samples\client\petstore\swift\promisekit + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift-petstore-rxswift.bat b/bin/windows/swift-petstore-rxswift.bat new file mode 100755 index 000000000000..92d80c3a71bf --- /dev/null +++ b/bin/windows/swift-petstore-rxswift.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -c bin\swift-petstore-rxswift.json -o samples\client\petstore\swift\rxswift + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift-petstore.bat b/bin/windows/swift-petstore.bat index b0ef85d695d4..3728a8da8ad5 100755 --- a/bin/windows/swift-petstore.bat +++ b/bin/windows/swift-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift\default java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift3-petstore-all.bat b/bin/windows/swift3-petstore-all.bat new file mode 100755 index 000000000000..7f2b6a9b5d9d --- /dev/null +++ b/bin/windows/swift3-petstore-all.bat @@ -0,0 +1,3 @@ +call .\bin\windows\swift3-petstore.bat +call .\bin\windows\swift3-petstore-promisekit.bat +call .\bin\windows\swift3-petstore-rxswift.bat diff --git a/bin/windows/swift3-petstore-promisekit.bat b/bin/windows/swift3-petstore-promisekit.bat new file mode 100755 index 000000000000..658c395e72e8 --- /dev/null +++ b/bin/windows/swift3-petstore-promisekit.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c bin\swift3-petstore-promisekit.json -o samples\client\petstore\swift3\promisekit + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift3-petstore-rxswift.bat b/bin/windows/swift3-petstore-rxswift.bat new file mode 100755 index 000000000000..3fa97f552452 --- /dev/null +++ b/bin/windows/swift3-petstore-rxswift.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c bin\swift3-petstore-rxswift.json -o samples\client\petstore\swift3\rxswift + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift3-petstore.bat b/bin/windows/swift3-petstore.bat new file mode 100755 index 000000000000..a3dbf929b94c --- /dev/null +++ b/bin/windows/swift3-petstore.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -o samples\client\petstore\swift3\default + +java %JAVA_OPTS% -jar %executable% %ags%