From aa0fbada0737839c7e62f8043d59b323be00bc1d Mon Sep 17 00:00:00 2001 From: xhh Date: Fri, 9 Oct 2015 22:07:43 +0800 Subject: [PATCH] Add a "fullJavaUtil" option to Java clients to toggle whether to use full qualified name (with full package prefix) for classes under java.util --- .../io/swagger/codegen/DefaultCodegen.java | 15 +++- .../codegen/languages/JavaClientCodegen.java | 49 +++++++++++- .../src/main/resources/Java/api.mustache | 10 ++- .../Java/libraries/jersey2/api.mustache | 12 +-- .../Java/libraries/okhttp-gson/api.mustache | 15 ++-- .../Java/libraries/retrofit/api.mustache | 6 +- .../java/io/swagger/client/api/PetApi.java | 64 +++++++-------- .../java/io/swagger/client/api/StoreApi.java | 35 ++++---- .../java/io/swagger/client/api/UserApi.java | 57 ++++++------- .../java/io/swagger/client/model/Order.java | 9 ++- .../java/io/swagger/client/model/Pet.java | 15 ++-- .../java/io/swagger/client/api/PetApi.java | 66 ++++++++-------- .../java/io/swagger/client/api/StoreApi.java | 37 ++++----- .../java/io/swagger/client/api/UserApi.java | 59 +++++++------- .../java/io/swagger/client/model/Order.java | 9 ++- .../java/io/swagger/client/model/Pet.java | 15 ++-- .../java/io/swagger/client/api/PetApi.java | 79 +++++++++---------- .../java/io/swagger/client/api/StoreApi.java | 42 +++++----- .../java/io/swagger/client/api/UserApi.java | 68 ++++++++-------- .../java/io/swagger/client/model/Order.java | 7 +- .../java/io/swagger/client/model/Pet.java | 13 +-- .../java/io/swagger/client/api/PetApi.java | 20 ++--- .../java/io/swagger/client/api/StoreApi.java | 11 +-- .../java/io/swagger/client/api/UserApi.java | 13 +-- .../java/io/swagger/client/model/Order.java | 7 +- .../java/io/swagger/client/model/Pet.java | 13 +-- 26 files changed, 412 insertions(+), 334 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 55868c0acaf..b5f544a749b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -311,14 +311,15 @@ public class DefaultCodegen { ); typeMapping = new HashMap(); - typeMapping.put("array", "java.util.List"); - typeMapping.put("map", "java.util.Map"); + typeMapping.put("array", "List"); + typeMapping.put("map", "Map"); + typeMapping.put("List", "List"); typeMapping.put("boolean", "Boolean"); typeMapping.put("string", "String"); typeMapping.put("int", "Integer"); typeMapping.put("float", "Float"); typeMapping.put("number", "BigDecimal"); - typeMapping.put("DateTime", "java.util.Date"); + typeMapping.put("DateTime", "Date"); typeMapping.put("long", "Long"); typeMapping.put("short", "Short"); typeMapping.put("char", "String"); @@ -336,7 +337,15 @@ public class DefaultCodegen { importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); importMapping.put("File", "java.io.File"); + importMapping.put("Date", "java.util.Date"); importMapping.put("Timestamp", "java.sql.Timestamp"); + importMapping.put("Map", "java.util.Map"); + importMapping.put("HashMap", "java.util.HashMap"); + importMapping.put("Array", "java.util.List"); + importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("List", "java.util.*"); + importMapping.put("Set", "java.util.*"); + importMapping.put("DateTime", "org.joda.time.*"); importMapping.put("LocalDateTime", "org.joda.time.*"); importMapping.put("LocalDate", "org.joda.time.*"); importMapping.put("LocalTime", "org.joda.time.*"); 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 1276c2dde6c..5d61f1b5932 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 @@ -37,6 +37,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/java"; protected String localVariablePrefix = ""; + protected boolean fullJavaUtil = false; + protected String javaUtilPrefix = ""; protected Boolean serializableModel = false; public JavaClientCodegen() { @@ -71,8 +73,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { "Object", "byte[]") ); - instantiationTypes.put("array", "java.util.ArrayList"); - instantiationTypes.put("map", "java.util.HashMap"); + instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("map", "HashMap"); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC)); @@ -81,6 +83,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC)); cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC)); cliOptions.add(new CliOption(CodegenConstants.SERIALIZABLE_MODEL, CodegenConstants.SERIALIZABLE_MODEL_DESC)); + cliOptions.add(new CliOption("fullJavaUtil", "whether to use full qualified name for classes under java.util (default to false)")); supportedLibraries.put("", "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2"); supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); @@ -152,6 +155,32 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { // need to put back serializableModel (boolean) into additionalProperties as value in additionalProperties is string additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel); + if (additionalProperties.containsKey("fullJavaUtil")) { + fullJavaUtil = Boolean.valueOf(additionalProperties.get("fullJavaUtil").toString()); + } + if (fullJavaUtil) { + javaUtilPrefix = "java.util."; + } + additionalProperties.put("fullJavaUtil", fullJavaUtil); + additionalProperties.put("javaUtilPrefix", javaUtilPrefix); + + if (fullJavaUtil) { + typeMapping.put("array", "java.util.List"); + typeMapping.put("map", "java.util.Map"); + typeMapping.put("DateTime", "java.util.Date"); + typeMapping.remove("List"); + importMapping.remove("Date"); + importMapping.remove("Map"); + importMapping.remove("HashMap"); + importMapping.remove("Array"); + importMapping.remove("ArrayList"); + importMapping.remove("List"); + importMapping.remove("Set"); + importMapping.remove("DateTime"); + instantiationTypes.put("array", "java.util.ArrayList"); + instantiationTypes.put("map", "java.util.HashMap"); + } + this.sanitizeConfig(); final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator); @@ -294,10 +323,22 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { public String toDefaultValue(Property p) { if (p instanceof ArrayProperty) { final ArrayProperty ap = (ArrayProperty) p; - return String.format("new java.util.ArrayList<%s>()", getTypeDeclaration(ap.getItems())); + final String pattern; + if (fullJavaUtil) { + pattern = "new java.util.ArrayList<%s>()"; + } else { + pattern = "new ArrayList<%s>()"; + } + return String.format(pattern, getTypeDeclaration(ap.getItems())); } else if (p instanceof MapProperty) { final MapProperty ap = (MapProperty) p; - return String.format("new java.util.HashMap()", getTypeDeclaration(ap.getAdditionalProperties())); + final String pattern; + if (fullJavaUtil) { + pattern = "new java.util.HashMap()"; + } else { + pattern = "new HashMap()"; + } + return String.format(pattern, getTypeDeclaration(ap.getAdditionalProperties())); } return super.toDefaultValue(p); } diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache index 38ebc1c54ab..08d28ebd51b 100644 --- a/modules/swagger-codegen/src/main/resources/Java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache @@ -9,6 +9,10 @@ import {{invokerPackage}}.TypeRef; {{#imports}}import {{import}}; {{/imports}} +{{^fullJavaUtil}} +import java.util.*; +{{/fullJavaUtil}} + {{>generatedAnnotation}} {{#operations}} public class {{classname}} { @@ -51,9 +55,9 @@ public class {{classname}} { .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; // query params - java.util.List {{localVariablePrefix}}queryParams = new java.util.ArrayList(); - java.util.Map {{localVariablePrefix}}headerParams = new java.util.HashMap(); - java.util.Map {{localVariablePrefix}}formParams = new java.util.HashMap(); + {{javaUtilPrefix}}List {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList(); + {{javaUtilPrefix}}Map {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap(); + {{javaUtilPrefix}}Map {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap(); {{#queryParams}} {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}})); diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache index 532f1ef78cf..10f2fa2f744 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache @@ -6,11 +6,13 @@ import {{invokerPackage}}.Configuration; import {{invokerPackage}}.Pair; import {{invokerPackage}}.TypeRef; -import {{modelPackage}}.*; - {{#imports}}import {{import}}; {{/imports}} +{{^fullJavaUtil}} +import java.util.*; +{{/fullJavaUtil}} + {{>generatedAnnotation}} {{#operations}} public class {{classname}} { @@ -52,9 +54,9 @@ public class {{classname}} { .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; // query params - java.util.List {{localVariablePrefix}}queryParams = new java.util.ArrayList(); - java.util.Map {{localVariablePrefix}}headerParams = new java.util.HashMap(); - java.util.Map {{localVariablePrefix}}formParams = new java.util.HashMap(); + {{javaUtilPrefix}}List {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList(); + {{javaUtilPrefix}}Map {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap(); + {{javaUtilPrefix}}Map {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap(); {{#queryParams}} {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}})); diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache index d1f38f0ac35..efb1a14f27d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache @@ -6,17 +6,18 @@ import {{invokerPackage}}.ApiException; import {{invokerPackage}}.Configuration; import {{invokerPackage}}.Pair; -import {{modelPackage}}.*; - import com.google.gson.reflect.TypeToken; import com.squareup.okhttp.Call; -import java.lang.reflect.Type; - {{#imports}}import {{import}}; {{/imports}} +import java.lang.reflect.Type; +{{^fullJavaUtil}} +import java.util.*; +{{/fullJavaUtil}} + {{#operations}} public class {{classname}} { private ApiClient {{localVariablePrefix}}apiClient; @@ -52,15 +53,15 @@ public class {{classname}} { String {{localVariablePrefix}}path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}} .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; - java.util.List {{localVariablePrefix}}queryParams = new java.util.ArrayList();{{#queryParams}} + {{javaUtilPrefix}}List {{localVariablePrefix}}queryParams = new {{javaUtilPrefix}}ArrayList();{{#queryParams}} if ({{paramName}} != null) {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}} - java.util.Map {{localVariablePrefix}}headerParams = new java.util.HashMap();{{#headerParams}} + {{javaUtilPrefix}}Map {{localVariablePrefix}}headerParams = new {{javaUtilPrefix}}HashMap();{{#headerParams}} if ({{paramName}} != null) {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}} - java.util.Map {{localVariablePrefix}}formParams = new java.util.HashMap();{{#formParams}} + {{javaUtilPrefix}}Map {{localVariablePrefix}}formParams = new {{javaUtilPrefix}}HashMap();{{#formParams}} if ({{paramName}} != null) {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});{{/formParams}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache index 28d2d29f8d1..b41e18aff47 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache @@ -1,7 +1,5 @@ package {{package}}; -import {{modelPackage}}.*; - import retrofit.Callback; import retrofit.http.*; import retrofit.mime.*; @@ -9,6 +7,10 @@ import retrofit.mime.*; {{#imports}}import {{import}}; {{/imports}} +{{^fullJavaUtil}} +import java.util.*; +{{/fullJavaUtil}} + {{#operations}} public interface {{classname}} { {{#operation}} 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 4f503f934cb..8715238ae14 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 @@ -9,7 +9,9 @@ import io.swagger.client.TypeRef; import io.swagger.client.model.Pet; import java.io.File; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:43.997+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:27.235+08:00") public class PetApi { private ApiClient apiClient; @@ -44,9 +46,9 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -91,9 +93,9 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -128,9 +130,9 @@ public class PetApi { * Finds Pets by status * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - * @return java.util.List + * @return List */ - public java.util.List findPetsByStatus (java.util.List status) throws ApiException { + public List findPetsByStatus (List status) throws ApiException { Object postBody = null; byte[] postBinaryBody = null; @@ -138,9 +140,9 @@ public class PetApi { String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("multi", "status", status)); @@ -166,7 +168,7 @@ public class PetApi { - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, postBinaryBody, headerParams, formParams, accept, contentType, authNames, returnType); @@ -178,9 +180,9 @@ public class PetApi { * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - * @return java.util.List + * @return List */ - public java.util.List findPetsByTags (java.util.List tags) throws ApiException { + public List findPetsByTags (List tags) throws ApiException { Object postBody = null; byte[] postBinaryBody = null; @@ -188,9 +190,9 @@ public class PetApi { String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags)); @@ -216,7 +218,7 @@ public class PetApi { - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, postBinaryBody, headerParams, formParams, accept, contentType, authNames, returnType); @@ -244,9 +246,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -300,9 +302,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -358,9 +360,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -415,9 +417,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java index 4d861dcb5d8..916b16e17ff 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java @@ -6,9 +6,12 @@ import io.swagger.client.Configuration; import io.swagger.client.Pair; import io.swagger.client.TypeRef; +import java.util.Map; import io.swagger.client.model.Order; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:43.997+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:27.235+08:00") public class StoreApi { private ApiClient apiClient; @@ -32,9 +35,9 @@ public class StoreApi { /** * Returns pet inventories by status * Returns a map of status codes to quantities - * @return java.util.Map + * @return Map */ - public java.util.Map getInventory () throws ApiException { + public Map getInventory () throws ApiException { Object postBody = null; byte[] postBinaryBody = null; @@ -42,9 +45,9 @@ public class StoreApi { String path = "/store/inventory".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -68,7 +71,7 @@ public class StoreApi { - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, postBinaryBody, headerParams, formParams, accept, contentType, authNames, returnType); @@ -90,9 +93,9 @@ public class StoreApi { String path = "/store/order".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -144,9 +147,9 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -198,9 +201,9 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java index e2e0e90b18d..80ee07041f7 100644 --- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java @@ -7,8 +7,11 @@ import io.swagger.client.Pair; import io.swagger.client.TypeRef; import io.swagger.client.model.User; +import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:43.997+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:27.235+08:00") public class UserApi { private ApiClient apiClient; @@ -43,9 +46,9 @@ public class UserApi { String path = "/user".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -82,7 +85,7 @@ public class UserApi { * @param body List of user object * @return void */ - public void createUsersWithArrayInput (java.util.List body) throws ApiException { + public void createUsersWithArrayInput (List body) throws ApiException { Object postBody = body; byte[] postBinaryBody = null; @@ -90,9 +93,9 @@ public class UserApi { String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -129,7 +132,7 @@ public class UserApi { * @param body List of user object * @return void */ - public void createUsersWithListInput (java.util.List body) throws ApiException { + public void createUsersWithListInput (List body) throws ApiException { Object postBody = body; byte[] postBinaryBody = null; @@ -137,9 +140,9 @@ public class UserApi { String path = "/user/createWithList".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -185,9 +188,9 @@ public class UserApi { String path = "/user/login".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("", "username", username)); @@ -236,9 +239,9 @@ public class UserApi { String path = "/user/logout".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -289,9 +292,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -344,9 +347,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -397,9 +400,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); 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 22320fbb39b..84582f97320 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,6 +1,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; +import java.util.Date; @@ -9,13 +10,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:43.997+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:27.235+08:00") public class Order { private Long id = null; private Long petId = null; private Integer quantity = null; - private java.util.Date shipDate = null; + private Date shipDate = null; public enum StatusEnum { PLACED("placed"), @@ -78,10 +79,10 @@ public enum StatusEnum { **/ @ApiModelProperty(value = "") @JsonProperty("shipDate") - public java.util.Date getShipDate() { + public Date getShipDate() { return shipDate; } - public void setShipDate(java.util.Date shipDate) { + public void setShipDate(Date shipDate) { this.shipDate = shipDate; } 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 fc0db631e60..3076f4a5be9 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 @@ -2,6 +2,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; import io.swagger.client.model.Category; +import java.util.*; import io.swagger.client.model.Tag; @@ -11,14 +12,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:43.997+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:27.235+08:00") public class Pet { private Long id = null; private Category category = null; private String name = null; - private java.util.List photoUrls = new java.util.ArrayList(); - private java.util.List tags = new java.util.ArrayList(); + private List photoUrls = new ArrayList(); + private List tags = new ArrayList(); public enum StatusEnum { AVAILABLE("available"), @@ -80,10 +81,10 @@ public enum StatusEnum { **/ @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - public java.util.List getPhotoUrls() { + public List getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(java.util.List photoUrls) { + public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; } @@ -92,10 +93,10 @@ public enum StatusEnum { **/ @ApiModelProperty(value = "") @JsonProperty("tags") - public java.util.List getTags() { + public List getTags() { return tags; } - public void setTags(java.util.List tags) { + public void setTags(List tags) { this.tags = tags; } diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java index 56c0b1e173c..b979fd08134 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java @@ -6,12 +6,12 @@ import io.swagger.client.Configuration; import io.swagger.client.Pair; import io.swagger.client.TypeRef; -import io.swagger.client.model.*; - import io.swagger.client.model.Pet; import java.io.File; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:48.684+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:19.416+08:00") public class PetApi { private ApiClient apiClient; @@ -45,9 +45,9 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -85,9 +85,9 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -116,18 +116,18 @@ public class PetApi { * Finds Pets by status * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - * @return java.util.List + * @return List */ - public java.util.List findPetsByStatus (java.util.List status) throws ApiException { + public List findPetsByStatus (List status) throws ApiException { Object postBody = null; // create path and map variables String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("multi", "status", status)); @@ -150,7 +150,7 @@ public class PetApi { String[] authNames = new String[] { "petstore_auth" }; - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); } @@ -159,18 +159,18 @@ public class PetApi { * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - * @return java.util.List + * @return List */ - public java.util.List findPetsByTags (java.util.List tags) throws ApiException { + public List findPetsByTags (List tags) throws ApiException { Object postBody = null; // create path and map variables String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags)); @@ -193,7 +193,7 @@ public class PetApi { String[] authNames = new String[] { "petstore_auth" }; - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); } @@ -217,9 +217,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -266,9 +266,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -317,9 +317,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -367,9 +367,9 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java index 5f8a9fb13d8..d011bca1417 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java @@ -6,11 +6,12 @@ import io.swagger.client.Configuration; import io.swagger.client.Pair; import io.swagger.client.TypeRef; -import io.swagger.client.model.*; - +import java.util.Map; import io.swagger.client.model.Order; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:48.684+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:19.416+08:00") public class StoreApi { private ApiClient apiClient; @@ -34,18 +35,18 @@ public class StoreApi { /** * Returns pet inventories by status * Returns a map of status codes to quantities - * @return java.util.Map + * @return Map */ - public java.util.Map getInventory () throws ApiException { + public Map getInventory () throws ApiException { Object postBody = null; // create path and map variables String path = "/store/inventory".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -66,7 +67,7 @@ public class StoreApi { String[] authNames = new String[] { "api_key" }; - TypeRef returnType = new TypeRef>() {}; + TypeRef returnType = new TypeRef>() {}; return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType); } @@ -84,9 +85,9 @@ public class StoreApi { String path = "/store/order".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -131,9 +132,9 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -178,9 +179,9 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java index 36199161b16..1c811a06a3b 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java @@ -6,11 +6,12 @@ import io.swagger.client.Configuration; import io.swagger.client.Pair; import io.swagger.client.TypeRef; -import io.swagger.client.model.*; - import io.swagger.client.model.User; +import java.util.*; -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:48.684+08:00") +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:19.416+08:00") public class UserApi { private ApiClient apiClient; @@ -44,9 +45,9 @@ public class UserApi { String path = "/user".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -77,16 +78,16 @@ public class UserApi { * @param body List of user object * @return void */ - public void createUsersWithArrayInput (java.util.List body) throws ApiException { + public void createUsersWithArrayInput (List body) throws ApiException { Object postBody = body; // create path and map variables String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -117,16 +118,16 @@ public class UserApi { * @param body List of user object * @return void */ - public void createUsersWithListInput (java.util.List body) throws ApiException { + public void createUsersWithListInput (List body) throws ApiException { Object postBody = body; // create path and map variables String path = "/user/createWithList".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -165,9 +166,9 @@ public class UserApi { String path = "/user/login".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); queryParams.addAll(apiClient.parameterToPairs("", "username", username)); @@ -209,9 +210,9 @@ public class UserApi { String path = "/user/logout".replaceAll("\\{format\\}","json"); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -255,9 +256,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -303,9 +304,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); @@ -349,9 +350,9 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - java.util.List queryParams = new java.util.ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); - java.util.Map formParams = new java.util.HashMap(); + List queryParams = new ArrayList(); + Map headerParams = new HashMap(); + Map formParams = new HashMap(); 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 5b952459dde..2f091e48085 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,6 +1,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; +import java.util.Date; @@ -9,13 +10,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:48.684+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:19.416+08:00") public class Order { private Long id = null; private Long petId = null; private Integer quantity = null; - private java.util.Date shipDate = null; + private Date shipDate = null; public enum StatusEnum { PLACED("placed"), @@ -78,10 +79,10 @@ public enum StatusEnum { **/ @ApiModelProperty(value = "") @JsonProperty("shipDate") - public java.util.Date getShipDate() { + public Date getShipDate() { return shipDate; } - public void setShipDate(java.util.Date shipDate) { + public void setShipDate(Date shipDate) { this.shipDate = shipDate; } 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 1e205686fd4..784478c84f9 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 @@ -2,6 +2,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; import io.swagger.client.model.Category; +import java.util.*; import io.swagger.client.model.Tag; @@ -11,14 +12,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-08T20:57:48.684+08:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-10-09T21:30:19.416+08:00") public class Pet { private Long id = null; private Category category = null; private String name = null; - private java.util.List photoUrls = new java.util.ArrayList(); - private java.util.List tags = new java.util.ArrayList(); + private List photoUrls = new ArrayList(); + private List tags = new ArrayList(); public enum StatusEnum { AVAILABLE("available"), @@ -80,10 +81,10 @@ public enum StatusEnum { **/ @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") - public java.util.List getPhotoUrls() { + public List getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(java.util.List photoUrls) { + public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; } @@ -92,10 +93,10 @@ public enum StatusEnum { **/ @ApiModelProperty(value = "") @JsonProperty("tags") - public java.util.List getTags() { + public List getTags() { return tags; } - public void setTags(java.util.List tags) { + public void setTags(List tags) { this.tags = tags; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java index 78bde833079..596596b935a 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java @@ -6,17 +6,16 @@ import io.swagger.client.ApiException; import io.swagger.client.Configuration; import io.swagger.client.Pair; -import io.swagger.client.model.*; - import com.google.gson.reflect.TypeToken; import com.squareup.okhttp.Call; -import java.lang.reflect.Type; - import io.swagger.client.model.Pet; import java.io.File; +import java.lang.reflect.Type; +import java.util.*; + public class PetApi { private ApiClient apiClient; @@ -45,11 +44,11 @@ public class PetApi { // create path and map variables String path = "/pet".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -98,11 +97,11 @@ public class PetApi { // create path and map variables String path = "/pet".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -144,20 +143,20 @@ public class PetApi { } /* Build call for findPetsByStatus */ - private Call findPetsByStatusCall(java.util.List status) throws ApiException { + private Call findPetsByStatusCall(List status) throws ApiException { Object postBody = null; // create path and map variables String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); if (status != null) queryParams.addAll(apiClient.parameterToPairs("multi", "status", status)); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -179,11 +178,11 @@ public class PetApi { * Finds Pets by status * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - * @return java.util.List + * @return List */ - public java.util.List findPetsByStatus(java.util.List status) throws ApiException { + public List findPetsByStatus(List status) throws ApiException { Call call = findPetsByStatusCall(status); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); return apiClient.execute(call, returnType); } @@ -194,28 +193,28 @@ public class PetApi { * @param callback The callback to be executed when the API call finishes * @return The request call */ - public Call findPetsByStatusAsync(java.util.List status, ApiCallback> callback) throws ApiException { + public Call findPetsByStatusAsync(List status, ApiCallback> callback) throws ApiException { Call call = findPetsByStatusCall(status); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); apiClient.executeAsync(call, returnType, callback); return call; } /* Build call for findPetsByTags */ - private Call findPetsByTagsCall(java.util.List tags) throws ApiException { + private Call findPetsByTagsCall(List tags) throws ApiException { Object postBody = null; // create path and map variables String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); if (tags != null) queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags)); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -237,11 +236,11 @@ public class PetApi { * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - * @return java.util.List + * @return List */ - public java.util.List findPetsByTags(java.util.List tags) throws ApiException { + public List findPetsByTags(List tags) throws ApiException { Call call = findPetsByTagsCall(tags); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); return apiClient.execute(call, returnType); } @@ -252,9 +251,9 @@ public class PetApi { * @param callback The callback to be executed when the API call finishes * @return The request call */ - public Call findPetsByTagsAsync(java.util.List tags, ApiCallback> callback) throws ApiException { + public Call findPetsByTagsAsync(List tags, ApiCallback> callback) throws ApiException { Call call = findPetsByTagsCall(tags); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); apiClient.executeAsync(call, returnType, callback); return call; } @@ -273,11 +272,11 @@ public class PetApi { String path = "/pet/{petId}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -335,11 +334,11 @@ public class PetApi { String path = "/pet/{petId}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); if (name != null) formParams.put("name", name); if (status != null) @@ -402,13 +401,13 @@ public class PetApi { String path = "/pet/{petId}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); if (apiKey != null) headerParams.put("api_key", apiClient.parameterToString(apiKey)); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -465,11 +464,11 @@ public class PetApi { String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); if (additionalMetadata != null) formParams.put("additionalMetadata", additionalMetadata); if (file != null) diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java index ff7f02ecf56..cb780538e18 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java @@ -6,16 +6,16 @@ import io.swagger.client.ApiException; import io.swagger.client.Configuration; import io.swagger.client.Pair; -import io.swagger.client.model.*; - import com.google.gson.reflect.TypeToken; import com.squareup.okhttp.Call; -import java.lang.reflect.Type; - +import java.util.Map; import io.swagger.client.model.Order; +import java.lang.reflect.Type; +import java.util.*; + public class StoreApi { private ApiClient apiClient; @@ -44,11 +44,11 @@ public class StoreApi { // create path and map variables String path = "/store/inventory".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -69,11 +69,11 @@ public class StoreApi { /** * Returns pet inventories by status * Returns a map of status codes to quantities - * @return java.util.Map + * @return Map */ - public java.util.Map getInventory() throws ApiException { + public Map getInventory() throws ApiException { Call call = getInventoryCall(); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); return apiClient.execute(call, returnType); } @@ -83,9 +83,9 @@ public class StoreApi { * @param callback The callback to be executed when the API call finishes * @return The request call */ - public Call getInventoryAsync(ApiCallback> callback) throws ApiException { + public Call getInventoryAsync(ApiCallback> callback) throws ApiException { Call call = getInventoryCall(); - Type returnType = new TypeToken>(){}.getType(); + Type returnType = new TypeToken>(){}.getType(); apiClient.executeAsync(call, returnType, callback); return call; } @@ -98,11 +98,11 @@ public class StoreApi { // create path and map variables String path = "/store/order".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -160,11 +160,11 @@ public class StoreApi { String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -222,11 +222,11 @@ public class StoreApi { String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java index dccd7003b2b..a04470b3b40 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java @@ -6,15 +6,15 @@ import io.swagger.client.ApiException; import io.swagger.client.Configuration; import io.swagger.client.Pair; -import io.swagger.client.model.*; - import com.google.gson.reflect.TypeToken; import com.squareup.okhttp.Call; -import java.lang.reflect.Type; - import io.swagger.client.model.User; +import java.util.*; + +import java.lang.reflect.Type; +import java.util.*; public class UserApi { private ApiClient apiClient; @@ -44,11 +44,11 @@ public class UserApi { // create path and map variables String path = "/user".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -90,18 +90,18 @@ public class UserApi { } /* Build call for createUsersWithArrayInput */ - private Call createUsersWithArrayInputCall(java.util.List body) throws ApiException { + private Call createUsersWithArrayInputCall(List body) throws ApiException { Object postBody = body; // create path and map variables String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -124,7 +124,7 @@ public class UserApi { * * @param body List of user object */ - public void createUsersWithArrayInput(java.util.List body) throws ApiException { + public void createUsersWithArrayInput(List body) throws ApiException { Call call = createUsersWithArrayInputCall(body); apiClient.execute(call); } @@ -136,25 +136,25 @@ public class UserApi { * @param callback The callback to be executed when the API call finishes * @return The request call */ - public Call createUsersWithArrayInputAsync(java.util.List body, ApiCallback callback) throws ApiException { + public Call createUsersWithArrayInputAsync(List body, ApiCallback callback) throws ApiException { Call call = createUsersWithArrayInputCall(body); apiClient.executeAsync(call, callback); return call; } /* Build call for createUsersWithListInput */ - private Call createUsersWithListInputCall(java.util.List body) throws ApiException { + private Call createUsersWithListInputCall(List body) throws ApiException { Object postBody = body; // create path and map variables String path = "/user/createWithList".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -177,7 +177,7 @@ public class UserApi { * * @param body List of user object */ - public void createUsersWithListInput(java.util.List body) throws ApiException { + public void createUsersWithListInput(List body) throws ApiException { Call call = createUsersWithListInputCall(body); apiClient.execute(call); } @@ -189,7 +189,7 @@ public class UserApi { * @param callback The callback to be executed when the API call finishes * @return The request call */ - public Call createUsersWithListInputAsync(java.util.List body, ApiCallback callback) throws ApiException { + public Call createUsersWithListInputAsync(List body, ApiCallback callback) throws ApiException { Call call = createUsersWithListInputCall(body); apiClient.executeAsync(call, callback); return call; @@ -203,15 +203,15 @@ public class UserApi { // create path and map variables String path = "/user/login".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); if (username != null) queryParams.addAll(apiClient.parameterToPairs("", "username", username)); if (password != null) queryParams.addAll(apiClient.parameterToPairs("", "password", password)); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -265,11 +265,11 @@ public class UserApi { // create path and map variables String path = "/user/logout".replaceAll("\\{format\\}","json"); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -322,11 +322,11 @@ public class UserApi { String path = "/user/{username}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -384,11 +384,11 @@ public class UserApi { String path = "/user/{username}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" @@ -445,11 +445,11 @@ public class UserApi { String path = "/user/{username}".replaceAll("\\{format\\}","json") .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - java.util.List queryParams = new java.util.ArrayList(); + List queryParams = new ArrayList(); - java.util.Map headerParams = new java.util.HashMap(); + Map headerParams = new HashMap(); - java.util.Map formParams = new java.util.HashMap(); + Map formParams = new HashMap(); final String[] accepts = { "application/json", "application/xml" 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 57c9f791e97..df8e77b6fb3 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,6 +1,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; +import java.util.Date; import com.google.gson.annotations.SerializedName; @@ -23,7 +24,7 @@ public class Order { private Integer quantity = null; @SerializedName("shipDate") - private java.util.Date shipDate = null; + private Date shipDate = null; public enum StatusEnum { @@ -92,10 +93,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(value = "") - public java.util.Date getShipDate() { + public Date getShipDate() { return shipDate; } - public void setShipDate(java.util.Date shipDate) { + public void setShipDate(Date shipDate) { this.shipDate = shipDate; } 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 4b214d56c01..9ab5457e26a 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 @@ -2,6 +2,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; import io.swagger.client.model.Category; +import java.util.*; import io.swagger.client.model.Tag; import com.google.gson.annotations.SerializedName; @@ -25,10 +26,10 @@ public class Pet { private String name = null; @SerializedName("photoUrls") - private java.util.List photoUrls = new java.util.ArrayList(); + private List photoUrls = new ArrayList(); @SerializedName("tags") - private java.util.List tags = new java.util.ArrayList(); + private List tags = new ArrayList(); public enum StatusEnum { @@ -94,10 +95,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(required = true, value = "") - public java.util.List getPhotoUrls() { + public List getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(java.util.List photoUrls) { + public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; } @@ -105,10 +106,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(value = "") - public java.util.List getTags() { + public List getTags() { return tags; } - public void setTags(java.util.List tags) { + public void setTags(List tags) { this.tags = tags; } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java index 568e17b6cfc..f6b29f11a2a 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java @@ -1,7 +1,5 @@ package io.swagger.client.api; -import io.swagger.client.model.*; - import retrofit.Callback; import retrofit.http.*; import retrofit.mime.*; @@ -9,6 +7,8 @@ import retrofit.mime.*; import io.swagger.client.model.Pet; import java.io.File; +import java.util.*; + public interface PetApi { /** @@ -68,12 +68,12 @@ public interface PetApi { * Sync method * Multiple status values can be provided with comma seperated strings * @param status Status values that need to be considered for filter - * @return java.util.List + * @return List */ @GET("/pet/findByStatus") - java.util.List findPetsByStatus( - @Query("status") java.util.List status + List findPetsByStatus( + @Query("status") List status ); /** @@ -86,7 +86,7 @@ public interface PetApi { @GET("/pet/findByStatus") void findPetsByStatus( - @Query("status") java.util.List status, Callback> cb + @Query("status") List status, Callback> cb ); /** @@ -94,12 +94,12 @@ public interface PetApi { * Sync method * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by - * @return java.util.List + * @return List */ @GET("/pet/findByTags") - java.util.List findPetsByTags( - @Query("tags") java.util.List tags + List findPetsByTags( + @Query("tags") List tags ); /** @@ -112,7 +112,7 @@ public interface PetApi { @GET("/pet/findByTags") void findPetsByTags( - @Query("tags") java.util.List tags, Callback> cb + @Query("tags") List tags, Callback> cb ); /** diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java index ce9e9456859..16819d04a94 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java @@ -1,24 +1,25 @@ package io.swagger.client.api; -import io.swagger.client.model.*; - import retrofit.Callback; import retrofit.http.*; import retrofit.mime.*; +import java.util.Map; import io.swagger.client.model.Order; +import java.util.*; + public interface StoreApi { /** * Returns pet inventories by status * Sync method * Returns a map of status codes to quantities - * @return java.util.Map + * @return Map */ @GET("/store/inventory") - java.util.Map getInventory(); + Map getInventory(); /** @@ -30,7 +31,7 @@ public interface StoreApi { @GET("/store/inventory") void getInventory( - Callback> cb + Callback> cb ); /** diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java index 57b8f66f427..a5bc4d03477 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java @@ -1,12 +1,13 @@ package io.swagger.client.api; -import io.swagger.client.model.*; - import retrofit.Callback; import retrofit.http.*; import retrofit.mime.*; import io.swagger.client.model.User; +import java.util.*; + +import java.util.*; public interface UserApi { @@ -46,7 +47,7 @@ public interface UserApi { @POST("/user/createWithArray") Void createUsersWithArrayInput( - @Body java.util.List body + @Body List body ); /** @@ -59,7 +60,7 @@ public interface UserApi { @POST("/user/createWithArray") void createUsersWithArrayInput( - @Body java.util.List body, Callback cb + @Body List body, Callback cb ); /** @@ -72,7 +73,7 @@ public interface UserApi { @POST("/user/createWithList") Void createUsersWithListInput( - @Body java.util.List body + @Body List body ); /** @@ -85,7 +86,7 @@ public interface UserApi { @POST("/user/createWithList") void createUsersWithListInput( - @Body java.util.List body, Callback cb + @Body List body, Callback cb ); /** 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 57c9f791e97..df8e77b6fb3 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,6 +1,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; +import java.util.Date; import com.google.gson.annotations.SerializedName; @@ -23,7 +24,7 @@ public class Order { private Integer quantity = null; @SerializedName("shipDate") - private java.util.Date shipDate = null; + private Date shipDate = null; public enum StatusEnum { @@ -92,10 +93,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(value = "") - public java.util.Date getShipDate() { + public Date getShipDate() { return shipDate; } - public void setShipDate(java.util.Date shipDate) { + public void setShipDate(Date shipDate) { this.shipDate = shipDate; } 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 4b214d56c01..9ab5457e26a 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 @@ -2,6 +2,7 @@ package io.swagger.client.model; import io.swagger.client.StringUtil; import io.swagger.client.model.Category; +import java.util.*; import io.swagger.client.model.Tag; import com.google.gson.annotations.SerializedName; @@ -25,10 +26,10 @@ public class Pet { private String name = null; @SerializedName("photoUrls") - private java.util.List photoUrls = new java.util.ArrayList(); + private List photoUrls = new ArrayList(); @SerializedName("tags") - private java.util.List tags = new java.util.ArrayList(); + private List tags = new ArrayList(); public enum StatusEnum { @@ -94,10 +95,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(required = true, value = "") - public java.util.List getPhotoUrls() { + public List getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(java.util.List photoUrls) { + public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; } @@ -105,10 +106,10 @@ public enum StatusEnum { /** **/ @ApiModelProperty(value = "") - public java.util.List getTags() { + public List getTags() { return tags; } - public void setTags(java.util.List tags) { + public void setTags(List tags) { this.tags = tags; }