From fb705cb9fabbda551bd45a9eb9b33a5e761ec810 Mon Sep 17 00:00:00 2001 From: Joseph Zuromski Date: Wed, 6 Apr 2016 13:24:59 -0700 Subject: [PATCH 1/3] fix issue 2512: crash w/ NPE when dereferencing networkStatus which could be nil on a volley timeout error --- .../android/libraries/volley/api.mustache | 5 +- .../client/petstore/android/default/pom.xml | 4 +- .../main/java/io/swagger/client/JsonUtil.java | 24 +++++++ .../java/io/swagger/client/api/UserApi.java | 2 +- .../java/io/swagger/client/model/Animal.java | 36 ++++++++++ .../java/io/swagger/client/model/Cat.java | 51 ++++++++++++++ .../java/io/swagger/client/model/Dog.java | 51 ++++++++++++++ .../client/model/InlineResponse200.java | 70 +++++++++---------- .../client/model/Model200Response.java | 5 +- .../io/swagger/client/model/ModelReturn.java | 5 +- .../java/io/swagger/client/model/Name.java | 5 +- .../petstore/android/volley/build.gradle | 7 +- .../java/io/swagger/client/ApiInvoker.java | 30 ++++---- .../main/java/io/swagger/client/JsonUtil.java | 24 +++++++ .../java/io/swagger/client/api/PetApi.java | 67 +++++++++++++----- .../java/io/swagger/client/api/StoreApi.java | 34 ++++++--- .../java/io/swagger/client/api/UserApi.java | 44 +++++++++--- .../java/io/swagger/client/model/Animal.java | 36 ++++++++++ .../java/io/swagger/client/model/Cat.java | 51 ++++++++++++++ .../java/io/swagger/client/model/Dog.java | 51 ++++++++++++++ .../client/model/InlineResponse200.java | 70 +++++++++---------- .../client/model/Model200Response.java | 5 +- .../io/swagger/client/model/ModelReturn.java | 5 +- .../java/io/swagger/client/model/Name.java | 5 +- 24 files changed, 554 insertions(+), 133 deletions(-) create mode 100644 samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java create mode 100644 samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java create mode 100644 samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java create mode 100644 samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java create mode 100644 samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java create mode 100644 samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache index af6f859c73d..38c7f00cdaa 100644 --- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache +++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache @@ -121,7 +121,10 @@ public class {{classname}} { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { diff --git a/samples/client/petstore/android/default/pom.xml b/samples/client/petstore/android/default/pom.xml index f9c620b7528..afedf8f3027 100644 --- a/samples/client/petstore/android/default/pom.xml +++ b/samples/client/petstore/android/default/pom.xml @@ -110,7 +110,7 @@ io.swagger swagger-annotations - ${swagger-annotations-version} + ${swagger-core-version} com.google.code.gson @@ -145,7 +145,7 @@ - 1.5.4 + 1.5.8 2.3.1 4.8.1 1.0.0 diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java index 49ce07a07ae..17ff327a8aa 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java @@ -35,10 +35,22 @@ public class JsonUtil { public static Type getListTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); + if ("Animal".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + + if ("Cat".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + if ("Category".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } + if ("Dog".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } @@ -81,10 +93,22 @@ public class JsonUtil { public static Type getTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); + if ("Animal".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Cat".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + if ("Category".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } + if ("Dog".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java index a28410fd0a9..848f1d2a6cc 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java @@ -258,7 +258,7 @@ public class UserApi { /** * Get user by user name * - * @param username The name that needs to be fetched. Use user1 for testing. + * @param username The name that needs to be fetched. Use user1 for testing. * @return User */ public User getUserByName (String username) throws ApiException { diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java new file mode 100644 index 00000000000..6f956f69f9e --- /dev/null +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java @@ -0,0 +1,36 @@ +package io.swagger.client.model; + + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Animal { + + @SerializedName("className") + private String className = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + + sb.append(" className: ").append(className).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java new file mode 100644 index 00000000000..b0cd7e96b43 --- /dev/null +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java @@ -0,0 +1,51 @@ +package io.swagger.client.model; + +import io.swagger.client.model.Animal; + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Cat extends Animal { + + @SerializedName("className") + private String className = null; + @SerializedName("declawed") + private Boolean declawed = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Boolean getDeclawed() { + return declawed; + } + public void setDeclawed(Boolean declawed) { + this.declawed = declawed; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Cat {\n"); + sb.append(" " + super.toString()).append("\n"); + sb.append(" className: ").append(className).append("\n"); + sb.append(" declawed: ").append(declawed).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java new file mode 100644 index 00000000000..07b2df5488a --- /dev/null +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java @@ -0,0 +1,51 @@ +package io.swagger.client.model; + +import io.swagger.client.model.Animal; + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Dog extends Animal { + + @SerializedName("className") + private String className = null; + @SerializedName("breed") + private String breed = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getBreed() { + return breed; + } + public void setBreed(String breed) { + this.breed = breed; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Dog {\n"); + sb.append(" " + super.toString()).append("\n"); + sb.append(" className: ").append(className).append("\n"); + sb.append(" breed: ").append(breed).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java index c4fd8ce357d..303d160d764 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java @@ -10,31 +10,42 @@ import com.google.gson.annotations.SerializedName; @ApiModel(description = "") public class InlineResponse200 { - @SerializedName("tags") - private List tags = null; + @SerializedName("photoUrls") + private List photoUrls = null; + @SerializedName("name") + private String name = null; @SerializedName("id") private Long id = null; @SerializedName("category") private Object category = null; + @SerializedName("tags") + private List tags = null; public enum StatusEnum { available, pending, sold, }; @SerializedName("status") private StatusEnum status = null; - @SerializedName("name") - private String name = null; - @SerializedName("photoUrls") - private List photoUrls = null; /** **/ @ApiModelProperty(value = "") - public List getTags() { - return tags; + public List getPhotoUrls() { + return photoUrls; } - public void setTags(List tags) { - this.tags = tags; + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; } @@ -60,6 +71,17 @@ public class InlineResponse200 { } + /** + **/ + @ApiModelProperty(value = "") + public List getTags() { + return tags; + } + public void setTags(List tags) { + this.tags = tags; + } + + /** * pet status in the store **/ @@ -72,40 +94,18 @@ public class InlineResponse200 { } - /** - **/ - @ApiModelProperty(value = "") - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - - /** - **/ - @ApiModelProperty(value = "") - public List getPhotoUrls() { - return photoUrls; - } - public void setPhotoUrls(List photoUrls) { - this.photoUrls = photoUrls; - } - - @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class InlineResponse200 {\n"); - sb.append(" tags: ").append(tags).append("\n"); + sb.append(" photoUrls: ").append(photoUrls).append("\n"); + sb.append(" name: ").append(name).append("\n"); sb.append(" id: ").append(id).append("\n"); sb.append(" category: ").append(category).append("\n"); + sb.append(" tags: ").append(tags).append("\n"); sb.append(" status: ").append(status).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append(" photoUrls: ").append(photoUrls).append("\n"); sb.append("}\n"); return sb.toString(); } diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java index 4a6e58b2a5e..6d3c93d9799 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing model name starting with number + **/ +@ApiModel(description = "Model for testing model name starting with number") public class Model200Response { @SerializedName("name") diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java index 24763f3acb4..464b0cca25e 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing reserved words + **/ +@ApiModel(description = "Model for testing reserved words") public class ModelReturn { @SerializedName("return") diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java index 9763aca7b34..1b320fb26ea 100644 --- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing model name same as property name + **/ +@ApiModel(description = "Model for testing model name same as property name") public class Name { @SerializedName("name") diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle index e678620cb00..9ce6bde2b52 100644 --- a/samples/client/petstore/android/volley/build.gradle +++ b/samples/client/petstore/android/volley/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:1.5.+' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' @@ -55,9 +55,10 @@ android { ext { swagger_annotations_version = "1.5.0" gson_version = "2.3.1" - httpclient_version = "4.3.3" + httpclient_version = "4.5.2" + httpcore_version = "4.4.4" volley_version = "1.0.19" - junit_version = "4.8.1" + junit_version = "4.12" robolectric_version = "3.0" concurrent_unit_version = "0.4.2" } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java index 21ee5f36286..b9921b4fb66 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java @@ -191,7 +191,20 @@ public class ApiInvoker { INSTANCE.authentications = new HashMap(); - INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header")); + + + // TODO: comment out below as OAuth does not exist + //INSTANCE.authentications.put("petstore_auth", new OAuth()); + + + + INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id")); + + + + + + INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret")); @@ -209,28 +222,15 @@ public class ApiInvoker { - INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret")); - - - - - - INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id")); - - - - - INSTANCE.authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query")); + INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header")); - // TODO: comment out below as OAuth does not exist - //INSTANCE.authentications.put("petstore_auth", new OAuth()); // Prevent the authentications from being modified. diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java index 49ce07a07ae..17ff327a8aa 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java @@ -35,10 +35,22 @@ public class JsonUtil { public static Type getListTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); + if ("Animal".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + + if ("Cat".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + if ("Category".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } + if ("Dog".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } @@ -81,10 +93,22 @@ public class JsonUtil { public static Type getTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); + if ("Animal".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Cat".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + if ("Category".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } + if ("Dog".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java index b0a72ab7d8a..5c2c5bdffba 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java @@ -102,7 +102,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -231,7 +234,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -369,7 +375,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -508,7 +517,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -646,7 +658,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -773,7 +788,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames); @@ -788,7 +803,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -843,7 +861,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames, @@ -919,7 +937,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames); @@ -934,7 +952,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -989,7 +1010,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames, @@ -1065,7 +1086,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames); @@ -1080,7 +1101,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -1135,7 +1159,7 @@ public class PetApi { } - String[] authNames = new String[] { "api_key", "petstore_auth" }; + String[] authNames = new String[] { "petstore_auth", "api_key" }; try { apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames, @@ -1220,7 +1244,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -1367,7 +1394,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -1530,7 +1560,10 @@ public class PetApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java index e0aa403200a..b9f6b2d551c 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java @@ -107,7 +107,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -244,7 +247,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -379,7 +385,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -512,7 +521,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -637,7 +649,7 @@ public class StoreApi { } - String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" }; + String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" }; try { String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames); @@ -652,7 +664,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -707,7 +722,7 @@ public class StoreApi { } - String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" }; + String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" }; try { apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames, @@ -792,7 +807,10 @@ public class StoreApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java index 0938e600dd2..bb80b4234f9 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java @@ -101,7 +101,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -230,7 +233,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -359,7 +365,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -494,7 +503,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -576,7 +588,7 @@ public class UserApi { /** * Get user by user name * - * @param username The name that needs to be fetched. Use user1 for testing. + * @param username The name that needs to be fetched. Use user1 for testing. * @return User */ public User getUserByName (String username) throws TimeoutException, ExecutionException, InterruptedException, ApiException { @@ -635,7 +647,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -646,7 +661,7 @@ public class UserApi { /** * Get user by user name * - * @param username The name that needs to be fetched. Use user1 for testing. + * @param username The name that needs to be fetched. Use user1 for testing. */ public void getUserByName (String username, final Response.Listener responseListener, final Response.ErrorListener errorListener) { Object postBody = null; @@ -780,7 +795,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -917,7 +935,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { @@ -1053,7 +1074,10 @@ public class UserApi { throw ex; } catch (ExecutionException ex) { if(ex.getCause() instanceof VolleyError) { - throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage()); + VolleyError volleyError = (VolleyError)ex.getCause(); + if (volleyError.networkResponse != null) { + throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage()); + } } throw ex; } catch (TimeoutException ex) { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java new file mode 100644 index 00000000000..6f956f69f9e --- /dev/null +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java @@ -0,0 +1,36 @@ +package io.swagger.client.model; + + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Animal { + + @SerializedName("className") + private String className = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + + sb.append(" className: ").append(className).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java new file mode 100644 index 00000000000..b0cd7e96b43 --- /dev/null +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java @@ -0,0 +1,51 @@ +package io.swagger.client.model; + +import io.swagger.client.model.Animal; + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Cat extends Animal { + + @SerializedName("className") + private String className = null; + @SerializedName("declawed") + private Boolean declawed = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + /** + **/ + @ApiModelProperty(value = "") + public Boolean getDeclawed() { + return declawed; + } + public void setDeclawed(Boolean declawed) { + this.declawed = declawed; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Cat {\n"); + sb.append(" " + super.toString()).append("\n"); + sb.append(" className: ").append(className).append("\n"); + sb.append(" declawed: ").append(declawed).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java new file mode 100644 index 00000000000..07b2df5488a --- /dev/null +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java @@ -0,0 +1,51 @@ +package io.swagger.client.model; + +import io.swagger.client.model.Animal; + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class Dog extends Animal { + + @SerializedName("className") + private String className = null; + @SerializedName("breed") + private String breed = null; + + + /** + **/ + @ApiModelProperty(required = true, value = "") + public String getClassName() { + return className; + } + public void setClassName(String className) { + this.className = className; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getBreed() { + return breed; + } + public void setBreed(String breed) { + this.breed = breed; + } + + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Dog {\n"); + sb.append(" " + super.toString()).append("\n"); + sb.append(" className: ").append(className).append("\n"); + sb.append(" breed: ").append(breed).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java index c4fd8ce357d..303d160d764 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java @@ -10,31 +10,42 @@ import com.google.gson.annotations.SerializedName; @ApiModel(description = "") public class InlineResponse200 { - @SerializedName("tags") - private List tags = null; + @SerializedName("photoUrls") + private List photoUrls = null; + @SerializedName("name") + private String name = null; @SerializedName("id") private Long id = null; @SerializedName("category") private Object category = null; + @SerializedName("tags") + private List tags = null; public enum StatusEnum { available, pending, sold, }; @SerializedName("status") private StatusEnum status = null; - @SerializedName("name") - private String name = null; - @SerializedName("photoUrls") - private List photoUrls = null; /** **/ @ApiModelProperty(value = "") - public List getTags() { - return tags; + public List getPhotoUrls() { + return photoUrls; } - public void setTags(List tags) { - this.tags = tags; + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + + /** + **/ + @ApiModelProperty(value = "") + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; } @@ -60,6 +71,17 @@ public class InlineResponse200 { } + /** + **/ + @ApiModelProperty(value = "") + public List getTags() { + return tags; + } + public void setTags(List tags) { + this.tags = tags; + } + + /** * pet status in the store **/ @@ -72,40 +94,18 @@ public class InlineResponse200 { } - /** - **/ - @ApiModelProperty(value = "") - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - - /** - **/ - @ApiModelProperty(value = "") - public List getPhotoUrls() { - return photoUrls; - } - public void setPhotoUrls(List photoUrls) { - this.photoUrls = photoUrls; - } - - @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class InlineResponse200 {\n"); - sb.append(" tags: ").append(tags).append("\n"); + sb.append(" photoUrls: ").append(photoUrls).append("\n"); + sb.append(" name: ").append(name).append("\n"); sb.append(" id: ").append(id).append("\n"); sb.append(" category: ").append(category).append("\n"); + sb.append(" tags: ").append(tags).append("\n"); sb.append(" status: ").append(status).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append(" photoUrls: ").append(photoUrls).append("\n"); sb.append("}\n"); return sb.toString(); } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java index 4a6e58b2a5e..6d3c93d9799 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing model name starting with number + **/ +@ApiModel(description = "Model for testing model name starting with number") public class Model200Response { @SerializedName("name") diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java index 24763f3acb4..464b0cca25e 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing reserved words + **/ +@ApiModel(description = "Model for testing reserved words") public class ModelReturn { @SerializedName("return") diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java index 9763aca7b34..1b320fb26ea 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java @@ -5,7 +5,10 @@ import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; -@ApiModel(description = "") +/** + * Model for testing model name same as property name + **/ +@ApiModel(description = "Model for testing model name same as property name") public class Name { @SerializedName("name") From d9cee4c26992cf629a915a1ee8112ab96e1ab51c Mon Sep 17 00:00:00 2001 From: Joseph Zuromski Date: Thu, 14 Apr 2016 00:00:22 -0700 Subject: [PATCH 2/3] update samples --- .../petstore/android/volley/build.gradle | 2 - .../java/io/swagger/client/ApiInvoker.java | 36 ---- .../main/java/io/swagger/client/JsonUtil.java | 8 + .../java/io/swagger/client/api/PetApi.java | 189 +++--------------- .../java/io/swagger/client/api/StoreApi.java | 106 ++-------- .../java/io/swagger/client/api/UserApi.java | 127 ++---------- .../java/io/swagger/client/model/Animal.java | 2 - .../java/io/swagger/client/model/Cat.java | 3 - .../io/swagger/client/model/Category.java | 3 - .../java/io/swagger/client/model/Dog.java | 3 - .../io/swagger/client/model/FormatTest.java | 179 +++++++++++++++++ .../client/model/InlineResponse200.java | 7 - .../client/model/Model200Response.java | 2 - .../io/swagger/client/model/ModelReturn.java | 2 - .../java/io/swagger/client/model/Name.java | 5 +- .../java/io/swagger/client/model/Order.java | 7 - .../java/io/swagger/client/model/Pet.java | 7 - .../client/model/SpecialModelName.java | 2 - .../java/io/swagger/client/model/Tag.java | 3 - .../java/io/swagger/client/model/User.java | 9 - 20 files changed, 248 insertions(+), 454 deletions(-) create mode 100644 samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle index 9ce6bde2b52..cfee16e960c 100644 --- a/samples/client/petstore/android/volley/build.gradle +++ b/samples/client/petstore/android/volley/build.gradle @@ -7,9 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.+' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' - } } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java index b9921b4fb66..7ef69c6f0ab 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java @@ -189,50 +189,14 @@ public class ApiInvoker { // Setup authentications (key: authentication name, value: authentication). INSTANCE.authentications = new HashMap(); - - - - // TODO: comment out below as OAuth does not exist //INSTANCE.authentications.put("petstore_auth", new OAuth()); - - - INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id")); - - - - - INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret")); - - - - - INSTANCE.authentications.put("api_key", new ApiKeyAuth("header", "api_key")); - - - - - - INSTANCE.authentications.put("test_http_basic", new HttpBasicAuth()); - - - - INSTANCE.authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query")); - - - - - INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header")); - - - - // Prevent the authentications from being modified. INSTANCE.authentications = Collections.unmodifiableMap(INSTANCE.authentications); } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java index 17ff327a8aa..318c23f957d 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java @@ -51,6 +51,10 @@ public class JsonUtil { return new TypeToken>(){}.getType(); } + if ("FormatTest".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } @@ -109,6 +113,10 @@ public class JsonUtil { return new TypeToken(){}.getType(); } + if ("FormatTest".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + if ("InlineResponse200".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java index 5c2c5bdffba..2f39cf7cab1 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java @@ -45,7 +45,6 @@ public class PetApi { return basePath; } - /** * Add a new pet to the store * @@ -66,9 +65,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -84,8 +81,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -133,9 +129,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -151,8 +145,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -161,11 +154,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -177,7 +166,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Fake endpoint to test byte array in body parameter for adding a new pet to the store * @@ -189,7 +177,7 @@ public class PetApi { // create path and map variables - String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json"); + String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json"); // query params List queryParams = new ArrayList(); @@ -198,9 +186,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -216,8 +202,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -256,7 +241,7 @@ public class PetApi { // create path and map variables - String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json"); + String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json"); // query params List queryParams = new ArrayList(); @@ -265,9 +250,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -283,8 +266,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -293,11 +275,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -309,7 +287,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Deletes a pet * @@ -337,11 +314,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - - headerParams.put("api_key", ApiInvoker.parameterToString(apiKey)); - String[] contentTypes = { @@ -357,8 +331,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -412,11 +385,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - - headerParams.put("api_key", ApiInvoker.parameterToString(apiKey)); - String[] contentTypes = { @@ -432,8 +402,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -442,11 +411,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -458,7 +423,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Finds Pets by status * Multiple status values can be provided with comma separated strings @@ -479,11 +443,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status)); - - String[] contentTypes = { @@ -499,8 +460,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -548,11 +508,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status)); - - String[] contentTypes = { @@ -568,8 +525,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -578,16 +534,11 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((List) ApiInvoker.deserialize(localVarResponse, "array", Pet.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -599,7 +550,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Finds Pets by tags * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing. @@ -620,11 +570,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags)); - - String[] contentTypes = { @@ -640,8 +587,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -689,11 +635,8 @@ public class PetApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags)); - - String[] contentTypes = { @@ -709,8 +652,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -719,16 +661,11 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((List) ApiInvoker.deserialize(localVarResponse, "array", Pet.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -740,7 +677,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Find pet by ID * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions @@ -767,9 +703,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -785,8 +719,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -840,9 +773,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -858,8 +789,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -868,16 +798,11 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((Pet) ApiInvoker.deserialize(localVarResponse, "", Pet.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -889,7 +814,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Fake endpoint to test inline arbitrary object return by 'Find pet by ID' * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions @@ -907,7 +831,7 @@ public class PetApi { // create path and map variables - String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); + String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); // query params List queryParams = new ArrayList(); @@ -916,9 +840,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -934,8 +856,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -980,7 +901,7 @@ public class PetApi { // create path and map variables - String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); + String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); // query params List queryParams = new ArrayList(); @@ -989,9 +910,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -1007,8 +926,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -1017,16 +935,11 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((InlineResponse200) ApiInvoker.deserialize(localVarResponse, "", InlineResponse200.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -1038,7 +951,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Fake endpoint to test byte array return by 'Find pet by ID' * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions @@ -1056,7 +968,7 @@ public class PetApi { // create path and map variables - String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); + String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); // query params List queryParams = new ArrayList(); @@ -1065,9 +977,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -1083,8 +993,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -1129,7 +1038,7 @@ public class PetApi { // create path and map variables - String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); + String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString())); // query params List queryParams = new ArrayList(); @@ -1138,9 +1047,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -1156,8 +1063,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth", "api_key" }; @@ -1166,16 +1072,11 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((byte[]) ApiInvoker.deserialize(localVarResponse, "", byte[].class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -1187,7 +1088,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Update an existing pet * @@ -1208,9 +1108,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -1226,8 +1124,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -1275,9 +1172,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/json","application/xml" @@ -1293,8 +1188,7 @@ public class PetApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "petstore_auth" }; @@ -1303,11 +1197,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -1319,7 +1209,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Updates a pet in the store with form data * @@ -1348,9 +1237,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/x-www-form-urlencoded" @@ -1375,8 +1262,7 @@ public class PetApi { } else { // normal form params formParams.put("name", ApiInvoker.parameterToString(name)); - formParams.put("status", ApiInvoker.parameterToString(status)); - +formParams.put("status", ApiInvoker.parameterToString(status)); } String[] authNames = new String[] { "petstore_auth" }; @@ -1431,9 +1317,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "application/x-www-form-urlencoded" @@ -1458,8 +1342,7 @@ public class PetApi { } else { // normal form params formParams.put("name", ApiInvoker.parameterToString(name)); - formParams.put("status", ApiInvoker.parameterToString(status)); - +formParams.put("status", ApiInvoker.parameterToString(status)); } String[] authNames = new String[] { "petstore_auth" }; @@ -1469,11 +1352,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -1485,7 +1364,6 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * uploads an image * @@ -1514,9 +1392,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "multipart/form-data" @@ -1541,8 +1417,7 @@ public class PetApi { } else { // normal form params formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata)); - - + } String[] authNames = new String[] { "petstore_auth" }; @@ -1597,9 +1472,7 @@ public class PetApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { "multipart/form-data" @@ -1624,8 +1497,7 @@ public class PetApi { } else { // normal form params formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata)); - - + } String[] authNames = new String[] { "petstore_auth" }; @@ -1635,11 +1507,7 @@ public class PetApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -1651,5 +1519,4 @@ public class PetApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java index b9f6b2d551c..2d7b1e7683f 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java @@ -44,7 +44,6 @@ public class StoreApi { return basePath; } - /** * Delete purchase order by ID * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -71,9 +70,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -89,8 +86,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -144,9 +140,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -162,8 +156,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -172,11 +165,7 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -188,7 +177,6 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Finds orders by status * A single status value can be provided as a string @@ -209,11 +197,8 @@ public class StoreApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status)); - - String[] contentTypes = { @@ -229,8 +214,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" }; @@ -278,11 +262,8 @@ public class StoreApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status)); - - String[] contentTypes = { @@ -298,8 +279,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" }; @@ -308,16 +288,11 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((List) ApiInvoker.deserialize(localVarResponse, "array", Order.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -329,7 +304,6 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Returns pet inventories by status * Returns a map of status codes to quantities @@ -349,9 +323,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -367,8 +339,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "api_key" }; @@ -416,9 +387,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -434,8 +403,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "api_key" }; @@ -444,16 +412,11 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((Map) ApiInvoker.deserialize(localVarResponse, "map", Map.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -465,7 +428,6 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Fake endpoint to test arbitrary object return by 'Get inventory' * Returns an arbitrary object which is actually a map of status codes to quantities @@ -476,7 +438,7 @@ public class StoreApi { // create path and map variables - String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json"); + String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json"); // query params List queryParams = new ArrayList(); @@ -485,9 +447,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -503,8 +463,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "api_key" }; @@ -543,7 +502,7 @@ public class StoreApi { // create path and map variables - String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json"); + String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json"); // query params List queryParams = new ArrayList(); @@ -552,9 +511,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -570,8 +527,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "api_key" }; @@ -580,16 +536,11 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((Object) ApiInvoker.deserialize(localVarResponse, "", Object.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -601,10 +552,9 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * @param orderId ID of pet that needs to be fetched * @return Order */ @@ -628,9 +578,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -646,8 +594,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" }; @@ -677,7 +624,7 @@ public class StoreApi { /** * Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions * @param orderId ID of pet that needs to be fetched */ public void getOrderById (String orderId, final Response.Listener responseListener, final Response.ErrorListener errorListener) { @@ -701,9 +648,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -719,8 +664,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" }; @@ -729,16 +673,11 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse, "", Order.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -750,7 +689,6 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Place an order for a pet * @@ -771,9 +709,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -789,8 +725,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" }; @@ -838,9 +773,7 @@ public class StoreApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -856,8 +789,7 @@ public class StoreApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" }; @@ -866,16 +798,11 @@ public class StoreApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse, "", Order.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -887,5 +814,4 @@ public class StoreApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java index bb80b4234f9..33575e314b9 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java @@ -44,7 +44,6 @@ public class UserApi { return basePath; } - /** * Create user * This can only be done by the logged in user. @@ -65,9 +64,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -83,8 +80,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -132,9 +128,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -150,8 +144,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -160,11 +153,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -176,7 +165,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Creates list of users with given input array * @@ -197,9 +185,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -215,8 +201,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -264,9 +249,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -282,8 +265,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -292,11 +274,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -308,7 +286,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Creates list of users with given input array * @@ -329,9 +306,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -347,8 +322,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -396,9 +370,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -414,8 +386,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -424,11 +395,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -440,7 +407,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Delete user * This can only be done by the logged in user. @@ -467,9 +433,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -485,8 +449,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_http_basic" }; @@ -540,9 +503,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -558,8 +519,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { "test_http_basic" }; @@ -568,11 +528,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -584,7 +540,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Get user by user name * @@ -611,9 +566,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -629,8 +582,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -684,9 +636,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -702,8 +652,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -712,16 +661,11 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((User) ApiInvoker.deserialize(localVarResponse, "", User.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -733,7 +677,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Logs user into the system * @@ -755,13 +698,9 @@ public class UserApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username)); - queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password)); - - String[] contentTypes = { @@ -777,8 +716,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -826,13 +764,9 @@ public class UserApi { // form params Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username)); - queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password)); - - String[] contentTypes = { @@ -848,8 +782,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -858,16 +791,11 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - try { responseListener.onResponse((String) ApiInvoker.deserialize(localVarResponse, "", String.class)); - - - } catch (ApiException exception) { errorListener.onErrorResponse(new VolleyError(exception)); } - } }, new Response.ErrorListener() { @Override @@ -879,7 +807,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Logs out current logged in user session * @@ -899,9 +826,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -917,8 +842,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -966,9 +890,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -984,8 +906,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -994,11 +915,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -1010,7 +927,6 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - /** * Updated user * This can only be done by the logged in user. @@ -1038,9 +954,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -1056,8 +970,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -1111,9 +1024,7 @@ public class UserApi { // form params Map formParams = new HashMap(); - - String[] contentTypes = { @@ -1129,8 +1040,7 @@ public class UserApi { postBody = httpEntity; } else { // normal form params - - } + } String[] authNames = new String[] { }; @@ -1139,11 +1049,7 @@ public class UserApi { new Response.Listener() { @Override public void onResponse(String localVarResponse) { - - responseListener.onResponse(localVarResponse); - - } }, new Response.ErrorListener() { @Override @@ -1155,5 +1061,4 @@ public class UserApi { errorListener.onErrorResponse(new VolleyError(ex)); } } - } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java index 6f956f69f9e..80b84fb850a 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java @@ -11,7 +11,6 @@ public class Animal { @SerializedName("className") private String className = null; - /** **/ @ApiModelProperty(required = true, value = "") @@ -22,7 +21,6 @@ public class Animal { this.className = className; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java index b0cd7e96b43..449d6bddaa7 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java @@ -14,7 +14,6 @@ public class Cat extends Animal { @SerializedName("declawed") private Boolean declawed = null; - /** **/ @ApiModelProperty(required = true, value = "") @@ -25,7 +24,6 @@ public class Cat extends Animal { this.className = className; } - /** **/ @ApiModelProperty(value = "") @@ -36,7 +34,6 @@ public class Cat extends Animal { this.declawed = declawed; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java index 44c71e8a620..b3fa2f93341 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java @@ -13,7 +13,6 @@ public class Category { @SerializedName("name") private String name = null; - /** **/ @ApiModelProperty(value = "") @@ -24,7 +23,6 @@ public class Category { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -35,7 +33,6 @@ public class Category { this.name = name; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java index 07b2df5488a..8f35b9b0ea9 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java @@ -14,7 +14,6 @@ public class Dog extends Animal { @SerializedName("breed") private String breed = null; - /** **/ @ApiModelProperty(required = true, value = "") @@ -25,7 +24,6 @@ public class Dog extends Animal { this.className = className; } - /** **/ @ApiModelProperty(value = "") @@ -36,7 +34,6 @@ public class Dog extends Animal { this.breed = breed; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java new file mode 100644 index 00000000000..3f362afc925 --- /dev/null +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java @@ -0,0 +1,179 @@ +package io.swagger.client.model; + +import java.math.BigDecimal; +import java.util.Date; + +import io.swagger.annotations.*; +import com.google.gson.annotations.SerializedName; + + +@ApiModel(description = "") +public class FormatTest { + + @SerializedName("integer") + private Integer integer = null; + @SerializedName("int32") + private Integer int32 = null; + @SerializedName("int64") + private Long int64 = null; + @SerializedName("number") + private BigDecimal number = null; + @SerializedName("float") + private Float _float = null; + @SerializedName("double") + private Double _double = null; + @SerializedName("string") + private String string = null; + @SerializedName("byte") + private byte[] _byte = null; + @SerializedName("binary") + private byte[] binary = null; + @SerializedName("date") + private Date date = null; + @SerializedName("dateTime") + private Date dateTime = null; + @SerializedName("password") + private String password = null; + + /** + **/ + @ApiModelProperty(value = "") + public Integer getInteger() { + return integer; + } + public void setInteger(Integer integer) { + this.integer = integer; + } + + /** + **/ + @ApiModelProperty(value = "") + public Integer getInt32() { + return int32; + } + public void setInt32(Integer int32) { + this.int32 = int32; + } + + /** + **/ + @ApiModelProperty(value = "") + public Long getInt64() { + return int64; + } + public void setInt64(Long int64) { + this.int64 = int64; + } + + /** + **/ + @ApiModelProperty(required = true, value = "") + public BigDecimal getNumber() { + return number; + } + public void setNumber(BigDecimal number) { + this.number = number; + } + + /** + **/ + @ApiModelProperty(value = "") + public Float getFloat() { + return _float; + } + public void setFloat(Float _float) { + this._float = _float; + } + + /** + **/ + @ApiModelProperty(value = "") + public Double getDouble() { + return _double; + } + public void setDouble(Double _double) { + this._double = _double; + } + + /** + **/ + @ApiModelProperty(value = "") + public String getString() { + return string; + } + public void setString(String string) { + this.string = string; + } + + /** + **/ + @ApiModelProperty(value = "") + public byte[] getByte() { + return _byte; + } + public void setByte(byte[] _byte) { + this._byte = _byte; + } + + /** + **/ + @ApiModelProperty(value = "") + public byte[] getBinary() { + return binary; + } + public void setBinary(byte[] binary) { + this.binary = binary; + } + + /** + **/ + @ApiModelProperty(value = "") + public Date getDate() { + return date; + } + public void setDate(Date date) { + this.date = date; + } + + /** + **/ + @ApiModelProperty(value = "") + public Date getDateTime() { + return dateTime; + } + public void setDateTime(Date dateTime) { + this.dateTime = dateTime; + } + + /** + **/ + @ApiModelProperty(value = "") + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FormatTest {\n"); + + sb.append(" integer: ").append(integer).append("\n"); + sb.append(" int32: ").append(int32).append("\n"); + sb.append(" int64: ").append(int64).append("\n"); + sb.append(" number: ").append(number).append("\n"); + sb.append(" _float: ").append(_float).append("\n"); + sb.append(" _double: ").append(_double).append("\n"); + sb.append(" string: ").append(string).append("\n"); + sb.append(" _byte: ").append(_byte).append("\n"); + sb.append(" binary: ").append(binary).append("\n"); + sb.append(" date: ").append(date).append("\n"); + sb.append(" dateTime: ").append(dateTime).append("\n"); + sb.append(" password: ").append(password).append("\n"); + sb.append("}\n"); + return sb.toString(); + } +} diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java index 303d160d764..85b56f0e488 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java @@ -26,7 +26,6 @@ public class InlineResponse200 { @SerializedName("status") private StatusEnum status = null; - /** **/ @ApiModelProperty(value = "") @@ -37,7 +36,6 @@ public class InlineResponse200 { this.photoUrls = photoUrls; } - /** **/ @ApiModelProperty(value = "") @@ -48,7 +46,6 @@ public class InlineResponse200 { this.name = name; } - /** **/ @ApiModelProperty(required = true, value = "") @@ -59,7 +56,6 @@ public class InlineResponse200 { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -70,7 +66,6 @@ public class InlineResponse200 { this.category = category; } - /** **/ @ApiModelProperty(value = "") @@ -81,7 +76,6 @@ public class InlineResponse200 { this.tags = tags; } - /** * pet status in the store **/ @@ -93,7 +87,6 @@ public class InlineResponse200 { this.status = status; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java index 6d3c93d9799..31664d1e6cf 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java @@ -14,7 +14,6 @@ public class Model200Response { @SerializedName("name") private Integer name = null; - /** **/ @ApiModelProperty(value = "") @@ -25,7 +24,6 @@ public class Model200Response { this.name = name; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java index 464b0cca25e..f0b0802096f 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java @@ -14,7 +14,6 @@ public class ModelReturn { @SerializedName("return") private Integer _return = null; - /** **/ @ApiModelProperty(value = "") @@ -25,7 +24,6 @@ public class ModelReturn { this._return = _return; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java index 1b320fb26ea..d9f6153eb45 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java @@ -16,10 +16,9 @@ public class Name { @SerializedName("snake_case") private Integer snakeCase = null; - /** **/ - @ApiModelProperty(value = "") + @ApiModelProperty(required = true, value = "") public Integer getName() { return name; } @@ -27,7 +26,6 @@ public class Name { this.name = name; } - /** **/ @ApiModelProperty(value = "") @@ -38,7 +36,6 @@ public class Name { this.snakeCase = snakeCase; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java index f3f42db615c..be6f1b96db2 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java @@ -25,7 +25,6 @@ public class Order { @SerializedName("complete") private Boolean complete = null; - /** **/ @ApiModelProperty(value = "") @@ -36,7 +35,6 @@ public class Order { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -47,7 +45,6 @@ public class Order { this.petId = petId; } - /** **/ @ApiModelProperty(value = "") @@ -58,7 +55,6 @@ public class Order { this.quantity = quantity; } - /** **/ @ApiModelProperty(value = "") @@ -69,7 +65,6 @@ public class Order { this.shipDate = shipDate; } - /** * Order Status **/ @@ -81,7 +76,6 @@ public class Order { this.status = status; } - /** **/ @ApiModelProperty(value = "") @@ -92,7 +86,6 @@ public class Order { this.complete = complete; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java index 20865ad5434..425b11a6ddc 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java @@ -27,7 +27,6 @@ public class Pet { @SerializedName("status") private StatusEnum status = null; - /** **/ @ApiModelProperty(value = "") @@ -38,7 +37,6 @@ public class Pet { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -49,7 +47,6 @@ public class Pet { this.category = category; } - /** **/ @ApiModelProperty(required = true, value = "") @@ -60,7 +57,6 @@ public class Pet { this.name = name; } - /** **/ @ApiModelProperty(required = true, value = "") @@ -71,7 +67,6 @@ public class Pet { this.photoUrls = photoUrls; } - /** **/ @ApiModelProperty(value = "") @@ -82,7 +77,6 @@ public class Pet { this.tags = tags; } - /** * pet status in the store **/ @@ -94,7 +88,6 @@ public class Pet { this.status = status; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java index d804bdd8765..78aae71a5c5 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java @@ -11,7 +11,6 @@ public class SpecialModelName { @SerializedName("$special[property.name]") private Long specialPropertyName = null; - /** **/ @ApiModelProperty(value = "") @@ -22,7 +21,6 @@ public class SpecialModelName { this.specialPropertyName = specialPropertyName; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java index 7c9651b1ba8..2d21e6240db 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java @@ -13,7 +13,6 @@ public class Tag { @SerializedName("name") private String name = null; - /** **/ @ApiModelProperty(value = "") @@ -24,7 +23,6 @@ public class Tag { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -35,7 +33,6 @@ public class Tag { this.name = name; } - @Override public String toString() { diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java index dc022697eb0..d2b89faec07 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java @@ -25,7 +25,6 @@ public class User { @SerializedName("userStatus") private Integer userStatus = null; - /** **/ @ApiModelProperty(value = "") @@ -36,7 +35,6 @@ public class User { this.id = id; } - /** **/ @ApiModelProperty(value = "") @@ -47,7 +45,6 @@ public class User { this.username = username; } - /** **/ @ApiModelProperty(value = "") @@ -58,7 +55,6 @@ public class User { this.firstName = firstName; } - /** **/ @ApiModelProperty(value = "") @@ -69,7 +65,6 @@ public class User { this.lastName = lastName; } - /** **/ @ApiModelProperty(value = "") @@ -80,7 +75,6 @@ public class User { this.email = email; } - /** **/ @ApiModelProperty(value = "") @@ -91,7 +85,6 @@ public class User { this.password = password; } - /** **/ @ApiModelProperty(value = "") @@ -102,7 +95,6 @@ public class User { this.phone = phone; } - /** * User Status **/ @@ -114,7 +106,6 @@ public class User { this.userStatus = userStatus; } - @Override public String toString() { From 7bbe4404d740c22366b501e6f866b0cb20f76116 Mon Sep 17 00:00:00 2001 From: Joseph Zuromski Date: Thu, 14 Apr 2016 00:44:30 -0700 Subject: [PATCH 3/3] fix regression introduced in commit 00c97c8ff6a0b50027d6805d78b1b0f185c174e3 --- .../src/main/resources/android/libraries/volley/build.mustache | 2 +- samples/client/petstore/android/volley/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache index fabdd14a6d6..917f9d11eff 100644 --- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache +++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache @@ -70,7 +70,7 @@ ext { dependencies { compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "com.google.code.gson:gson:$gson_version" - compile "org.apache.httpcomponents:httpcore:$httpclient_version" + compile "org.apache.httpcomponents:httpcore:$httpcore_version" compile "org.apache.httpcomponents:httpmime:$httpclient_version" compile "com.mcxiaoke.volley:library:${volley_version}@aar" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle index cfee16e960c..f794267c737 100644 --- a/samples/client/petstore/android/volley/build.gradle +++ b/samples/client/petstore/android/volley/build.gradle @@ -64,7 +64,7 @@ ext { dependencies { compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "com.google.code.gson:gson:$gson_version" - compile "org.apache.httpcomponents:httpcore:$httpclient_version" + compile "org.apache.httpcomponents:httpcore:$httpcore_version" compile "org.apache.httpcomponents:httpmime:$httpclient_version" compile "com.mcxiaoke.volley:library:${volley_version}@aar" testCompile "junit:junit:$junit_version"