From f4581d3008496b6a4ac9cda30be1eb1a52a681c1 Mon Sep 17 00:00:00 2001 From: xhh Date: Thu, 31 Dec 2015 12:44:34 +0800 Subject: [PATCH] Update imports in models of Java clients - Remove the StringUtil import which is no longer needed - Remove duplicated imports of Objects and io.swagger.annotations.* - Only include jackson related imports in the Java clients needing it (i.e. the default, jersey2 and feign Java clients) --- .../codegen/languages/JavaClientCodegen.java | 11 +++-- .../Java/libraries/okhttp-gson/model.mustache | 8 +-- .../Java/libraries/retrofit/model.mustache | 8 +-- .../Java/libraries/retrofit2/model.mustache | 8 +-- .../java/io/swagger/client/api/PetApi.java | 42 +--------------- .../io/swagger/client/model/Category.java | 15 +++--- .../java/io/swagger/client/model/Order.java | 47 ++++++++++-------- .../java/io/swagger/client/model/Pet.java | 49 ++++++++++--------- .../java/io/swagger/client/model/Tag.java | 15 +++--- .../java/io/swagger/client/model/User.java | 21 +++++--- .../io/swagger/client/model/Category.java | 15 +++--- .../java/io/swagger/client/model/Order.java | 47 ++++++++++-------- .../java/io/swagger/client/model/Pet.java | 49 ++++++++++--------- .../java/io/swagger/client/model/Tag.java | 15 +++--- .../java/io/swagger/client/model/User.java | 21 +++++--- .../io/swagger/client/model/Category.java | 15 +++--- .../java/io/swagger/client/model/Order.java | 47 ++++++++++-------- .../java/io/swagger/client/model/Pet.java | 49 ++++++++++--------- .../java/io/swagger/client/model/Tag.java | 15 +++--- .../java/io/swagger/client/model/User.java | 21 +++++--- .../io/swagger/client/model/Category.java | 8 ++- .../java/io/swagger/client/model/Order.java | 8 ++- .../java/io/swagger/client/model/Pet.java | 10 ++-- .../java/io/swagger/client/model/Tag.java | 8 ++- .../java/io/swagger/client/model/User.java | 8 ++- .../io/swagger/client/model/Category.java | 8 ++- .../java/io/swagger/client/model/Order.java | 8 ++- .../java/io/swagger/client/model/Pet.java | 10 ++-- .../java/io/swagger/client/model/Tag.java | 8 ++- .../java/io/swagger/client/model/User.java | 8 ++- .../io/swagger/client/model/Category.java | 8 ++- .../java/io/swagger/client/model/Order.java | 8 ++- .../java/io/swagger/client/model/Pet.java | 10 ++-- .../java/io/swagger/client/model/Tag.java | 8 ++- .../java/io/swagger/client/model/User.java | 8 ++- 35 files changed, 308 insertions(+), 336 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 44eb67d3c74..76fe95c30a9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -482,12 +482,15 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { // needed by all pojos, but not enums model.imports.add("ApiModelProperty"); model.imports.add("ApiModel"); - model.imports.add("JsonProperty"); model.imports.add("Objects"); - model.imports.add("StringUtil"); - if(model.hasEnums != null || model.hasEnums == true) { - model.imports.add("JsonValue"); + final String lib = getLibrary(); + if(StringUtils.isEmpty(lib) || "feign".equals(lib) || "jersey2".equals(lib)) { + model.imports.add("JsonProperty"); + + if(model.hasEnums != null || model.hasEnums == true) { + model.imports.add("JsonValue"); + } } } return; diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache index 0794a94f6dc..d9084de6fa2 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache @@ -1,17 +1,11 @@ package {{package}}; -import {{invokerPackage}}.StringUtil; {{#imports}}import {{import}}; {{/imports}} import com.google.gson.annotations.SerializedName; -{{#serializableModel}} -import java.io.Serializable;{{/serializableModel}} -import java.util.Objects; - -import io.swagger.annotations.*; - +{{#serializableModel}}import java.io.Serializable;{{/serializableModel}} {{#models}} {{#model}}{{#description}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache index 0794a94f6dc..d9084de6fa2 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/model.mustache @@ -1,17 +1,11 @@ package {{package}}; -import {{invokerPackage}}.StringUtil; {{#imports}}import {{import}}; {{/imports}} import com.google.gson.annotations.SerializedName; -{{#serializableModel}} -import java.io.Serializable;{{/serializableModel}} -import java.util.Objects; - -import io.swagger.annotations.*; - +{{#serializableModel}}import java.io.Serializable;{{/serializableModel}} {{#models}} {{#model}}{{#description}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache index 0794a94f6dc..d9084de6fa2 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/model.mustache @@ -1,17 +1,11 @@ package {{package}}; -import {{invokerPackage}}.StringUtil; {{#imports}}import {{import}}; {{/imports}} import com.google.gson.annotations.SerializedName; -{{#serializableModel}} -import java.io.Serializable;{{/serializableModel}} -import java.util.Objects; - -import io.swagger.annotations.*; - +{{#serializableModel}}import java.io.Serializable;{{/serializableModel}} {{#models}} {{#model}}{{#description}} diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java index 22af7b53b18..c77f0c5a462 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java @@ -12,7 +12,7 @@ import java.io.File; import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-21T14:12:11.520+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:26:41.149+08:00") public class PetApi { private ApiClient apiClient; @@ -347,46 +347,6 @@ public class PetApi { } - /** - * downloads an image - * - * @return File - */ - public File downloadFile() throws ApiException { - Object postBody = null; - - // create path and map variables - String path = "/pet/{petId}/downloadImage".replaceAll("\\{format\\}","json"); - - // query params - List queryParams = new ArrayList(); - Map headerParams = new HashMap(); - Map formParams = new HashMap(); - - - - - - - - final String[] accepts = { - "application/octet-stream" - }; - final String accept = apiClient.selectHeaderAccept(accepts); - - final String[] contentTypes = { - - }; - final String contentType = apiClient.selectHeaderContentType(contentTypes); - - String[] authNames = new String[] { }; - - - GenericType returnType = new GenericType() {}; - return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); - - } - /** * uploads an image * diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java index 03efe0d240c..4aa667c7bab 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:32:50.163+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:17:07.711+08:00") public class Category { private Long id = null; @@ -20,6 +19,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java index fc1cb16b320..7f1a6a3fe47 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java @@ -1,18 +1,17 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; - - import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:32:50.163+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:17:07.711+08:00") public class Order { private Long id = null; @@ -21,30 +20,31 @@ public class Order { private Date shipDate = null; -public enum StatusEnum { - PLACED("placed"), - APPROVED("approved"), - DELIVERED("delivered"); + public enum StatusEnum { + PLACED("placed"), + APPROVED("approved"), + DELIVERED("delivered"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; private Boolean complete = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -57,6 +57,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { @@ -69,6 +70,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -81,6 +83,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -94,6 +97,7 @@ public enum StatusEnum { /** * Order Status **/ + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -106,6 +110,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java index d5577325a7c..33220411c7f 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java @@ -1,20 +1,19 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; - - +import java.util.*; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:32:50.163+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:17:07.711+08:00") public class Pet { private Long id = null; @@ -24,29 +23,30 @@ public class Pet { private List tags = new ArrayList(); -public enum StatusEnum { - AVAILABLE("available"), - PENDING("pending"), - SOLD("sold"); + public enum StatusEnum { + AVAILABLE("available"), + PENDING("pending"), + SOLD("sold"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -59,6 +59,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { @@ -71,6 +72,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("name") public String getName() { @@ -83,6 +85,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { @@ -95,6 +98,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { @@ -108,6 +112,7 @@ public enum StatusEnum { /** * pet status in the store **/ + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java index 66f5ea8474d..c5b400b9970 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:32:50.163+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:17:07.711+08:00") public class Tag { private Long id = null; @@ -20,6 +19,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java index 5f2ad2cd4cf..61084d36fa8 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:32:50.163+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:17:07.711+08:00") public class User { private Long id = null; @@ -26,6 +25,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -38,6 +38,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { @@ -50,6 +51,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { @@ -62,6 +64,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { @@ -74,6 +77,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { @@ -86,6 +90,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { @@ -98,6 +103,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { @@ -111,6 +117,7 @@ public class User { /** * User Status **/ + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java index c0d16bbe2c1..e5b753282fd 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:53:36.016+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:27:43.581+08:00") public class Category { private Long id = null; @@ -20,6 +19,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java index d2a2d7a66e2..ffed1691638 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java @@ -1,18 +1,17 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; - - import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:53:36.016+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:27:43.581+08:00") public class Order { private Long id = null; @@ -21,30 +20,31 @@ public class Order { private Date shipDate = null; -public enum StatusEnum { - PLACED("placed"), - APPROVED("approved"), - DELIVERED("delivered"); + public enum StatusEnum { + PLACED("placed"), + APPROVED("approved"), + DELIVERED("delivered"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; private Boolean complete = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -57,6 +57,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { @@ -69,6 +70,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -81,6 +83,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -94,6 +97,7 @@ public enum StatusEnum { /** * Order Status **/ + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -106,6 +110,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java index b7095d0e74f..0b4f00b4fad 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java @@ -1,20 +1,19 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; - - +import java.util.*; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:53:36.016+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:27:43.581+08:00") public class Pet { private Long id = null; @@ -24,29 +23,30 @@ public class Pet { private List tags = new ArrayList(); -public enum StatusEnum { - AVAILABLE("available"), - PENDING("pending"), - SOLD("sold"); + public enum StatusEnum { + AVAILABLE("available"), + PENDING("pending"), + SOLD("sold"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -59,6 +59,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { @@ -71,6 +72,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("name") public String getName() { @@ -83,6 +85,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { @@ -95,6 +98,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { @@ -108,6 +112,7 @@ public enum StatusEnum { /** * pet status in the store **/ + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java index b9469ad2a50..cd10a77fd98 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:53:36.016+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:27:43.581+08:00") public class Tag { private Long id = null; @@ -20,6 +19,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java index 1fdfef1eece..e9d835f03e2 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:53:36.016+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:27:43.581+08:00") public class User { private Long id = null; @@ -26,6 +25,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -38,6 +38,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { @@ -50,6 +51,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { @@ -62,6 +64,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { @@ -74,6 +77,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { @@ -86,6 +90,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { @@ -98,6 +103,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { @@ -111,6 +117,7 @@ public class User { /** * User Status **/ + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java index c0b1b559f90..530f158aa3a 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:35:06.891+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:19:27.559+08:00") public class Category { private Long id = null; @@ -20,6 +19,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Category { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java index 002d51a2908..396e03467d6 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java @@ -1,18 +1,17 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; - - import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:35:06.891+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:19:27.559+08:00") public class Order { private Long id = null; @@ -21,30 +20,31 @@ public class Order { private Date shipDate = null; -public enum StatusEnum { - PLACED("placed"), - APPROVED("approved"), - DELIVERED("delivered"); + public enum StatusEnum { + PLACED("placed"), + APPROVED("approved"), + DELIVERED("delivered"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; private Boolean complete = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -57,6 +57,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { @@ -69,6 +70,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -81,6 +83,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -94,6 +97,7 @@ public enum StatusEnum { /** * Order Status **/ + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -106,6 +110,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java index 33126c58b78..40d0da47fed 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java @@ -1,20 +1,19 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; - - +import java.util.*; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:35:06.891+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:19:27.559+08:00") public class Pet { private Long id = null; @@ -24,29 +23,30 @@ public class Pet { private List tags = new ArrayList(); -public enum StatusEnum { - AVAILABLE("available"), - PENDING("pending"), - SOLD("sold"); + public enum StatusEnum { + AVAILABLE("available"), + PENDING("pending"), + SOLD("sold"); - private String value; + private String value; - StatusEnum(String value) { - this.value = value; + StatusEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return value; + } } - @Override - @JsonValue - public String toString() { - return value; - } -} - private StatusEnum status = null; /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -59,6 +59,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { @@ -71,6 +72,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("name") public String getName() { @@ -83,6 +85,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { @@ -95,6 +98,7 @@ public enum StatusEnum { /** **/ + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { @@ -108,6 +112,7 @@ public enum StatusEnum { /** * pet status in the store **/ + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java index 28d7f5779a6..4351f3d209e 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:35:06.891+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:19:27.559+08:00") public class Tag { private Long id = null; @@ -20,6 +19,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -32,6 +32,7 @@ public class Tag { /** **/ + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java index d68a953a95c..51067b1cbc4 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java @@ -1,17 +1,16 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; - - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Objects; -import io.swagger.annotations.*; -import com.fasterxml.jackson.annotation.*; -@ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-29T11:35:06.891+08:00") + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-31T12:19:27.559+08:00") public class User { private Long id = null; @@ -26,6 +25,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -38,6 +38,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { @@ -50,6 +51,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { @@ -62,6 +64,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { @@ -74,6 +77,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { @@ -86,6 +90,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { @@ -98,6 +103,7 @@ public class User { /** **/ + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { @@ -111,6 +117,7 @@ public class User { /** * User Status **/ + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java index 25ca3dbe94e..c7a17b8c139 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java index 3e9c7bb0765..d2ab4bdc7fc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java @@ -1,15 +1,13 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java index d67add42e25..2e442471792 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java @@ -1,17 +1,15 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java index b444bf87487..80b1c7931a7 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java index 8fbc8cbd231..fc3af61725f 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java index 25ca3dbe94e..c7a17b8c139 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java index 3e9c7bb0765..d2ab4bdc7fc 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java @@ -1,15 +1,13 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java index d67add42e25..2e442471792 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java @@ -1,17 +1,15 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java index b444bf87487..80b1c7931a7 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java index 8fbc8cbd231..fc3af61725f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java index 25ca3dbe94e..c7a17b8c139 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java index 3e9c7bb0765..d2ab4bdc7fc 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java @@ -1,15 +1,13 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java index d67add42e25..2e442471792 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java @@ -1,17 +1,15 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java index b444bf87487..80b1c7931a7 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "") diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java index 8fbc8cbd231..fc3af61725f 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java @@ -1,14 +1,12 @@ package io.swagger.client.model; -import io.swagger.client.StringUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Objects; - -import io.swagger.annotations.*; - @ApiModel(description = "")