From 1fb2a97497a15c6b61de66ba3e721a2810e038d7 Mon Sep 17 00:00:00 2001 From: Eran Stiller Date: Mon, 12 Oct 2015 09:22:36 +0300 Subject: [PATCH] Revert "Regenerate Android-Java sample" This reverts commit 15f5eae2a80da4c658b466da04d11d5d51532cee. --- .../client/petstore/android-java/build.gradle | 6 -- .../java/io/swagger/client/ApiInvoker.java | 4 +- .../main/java/io/swagger/client/JsonUtil.java | 32 ++++----- .../java/io/swagger/client/api/PetApi.java | 42 +++--------- .../java/io/swagger/client/api/StoreApi.java | 10 +-- .../java/io/swagger/client/api/UserApi.java | 35 +--------- .../io/swagger/client/model/ApiResponse.java | 68 ------------------- .../io/swagger/client/model/Category.java | 4 -- .../java/io/swagger/client/model/Order.java | 4 -- .../java/io/swagger/client/model/Pet.java | 10 +-- .../java/io/swagger/client/model/Tag.java | 4 -- .../java/io/swagger/client/model/User.java | 4 -- 12 files changed, 27 insertions(+), 196 deletions(-) delete mode 100644 samples/client/petstore/android-java/src/main/java/io/swagger/client/model/ApiResponse.java diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle index c5f4edf79cb..417503cb51e 100644 --- a/samples/client/petstore/android-java/build.gradle +++ b/samples/client/petstore/android-java/build.gradle @@ -1,8 +1,6 @@ - group = 'io.swagger' project.version = '1.0.0' - buildscript { repositories { jcenter() @@ -23,10 +21,8 @@ allprojects { apply plugin: 'com.android.library' - apply plugin: 'com.github.dcendents.android-maven' - android { compileSdkVersion 22 buildToolsVersion '22.0.0' @@ -85,7 +81,6 @@ afterEvaluate { } } - task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' @@ -94,4 +89,3 @@ task sourcesJar(type: Jar) { artifacts { archives sourcesJar } - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java index aa786ff5b31..eabb47e818d 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -365,10 +365,8 @@ public class ApiInvoker { int code = response.getStatusLine().getStatusCode(); String responseString = null; - if(code == 204) { + if(code == 204) responseString = ""; - return responseString; - } else if(code >= 200 && code < 300) { if(response.getEntity() != null) { HttpEntity resEntity = response.getEntity(); diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java index 93a59d71b5e..5aa10d3ea82 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java @@ -35,10 +35,6 @@ public class JsonUtil { public static Type getListTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); - if ("Order".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - if ("User".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } @@ -47,16 +43,16 @@ public class JsonUtil { return new TypeToken>(){}.getType(); } - if ("Tag".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); - } - if ("Pet".equalsIgnoreCase(className)) { return new TypeToken>(){}.getType(); } - if ("ApiResponse".equalsIgnoreCase(className)) { - return new TypeToken>(){}.getType(); + if ("Tag".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); + } + + if ("Order".equalsIgnoreCase(className)) { + return new TypeToken>(){}.getType(); } return new TypeToken>(){}.getType(); @@ -65,10 +61,6 @@ public class JsonUtil { public static Type getTypeForDeserialization(Class cls) { String className = cls.getSimpleName(); - if ("Order".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - if ("User".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } @@ -77,16 +69,16 @@ public class JsonUtil { return new TypeToken(){}.getType(); } - if ("Tag".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); - } - if ("Pet".equalsIgnoreCase(className)) { return new TypeToken(){}.getType(); } - if ("ApiResponse".equalsIgnoreCase(className)) { - return new TypeToken(){}.getType(); + if ("Tag".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); + } + + if ("Order".equalsIgnoreCase(className)) { + return new TypeToken(){}.getType(); } return new TypeToken(){}.getType(); diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java index 5a607ba393f..f6b6403a342 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java @@ -10,8 +10,6 @@ import java.util.*; import io.swagger.client.model.Pet; import java.io.File; -import io.swagger.client.model.ApiResponse; - import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -20,7 +18,6 @@ import java.util.Map; import java.util.HashMap; import java.io.File; - public class PetApi { String basePath = "http://petstore.swagger.io/v2"; ApiInvoker apiInvoker = ApiInvoker.getInstance(); @@ -51,11 +48,6 @@ public class PetApi { public void updatePet (Pet body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet"); - } - // create path and map variables String path = "/pet".replaceAll("\\{format\\}","json"); @@ -110,11 +102,6 @@ public class PetApi { public void addPet (Pet body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling addPet"); - } - // create path and map variables String path = "/pet".replaceAll("\\{format\\}","json"); @@ -169,11 +156,6 @@ public class PetApi { public List findPetsByStatus (List status) throws ApiException { Object postBody = null; - // verify the required parameter 'status' is set - if (status == null) { - throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); - } - // create path and map variables String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); @@ -186,7 +168,7 @@ public class PetApi { Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("csv", "status", status)); + queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status)); @@ -230,11 +212,6 @@ public class PetApi { public List findPetsByTags (List tags) throws ApiException { Object postBody = null; - // verify the required parameter 'tags' is set - if (tags == null) { - throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); - } - // create path and map variables String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); @@ -247,7 +224,7 @@ public class PetApi { Map formParams = new HashMap(); - queryParams.addAll(ApiInvoker.parameterToPairs("csv", "tags", tags)); + queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags)); @@ -284,8 +261,8 @@ public class PetApi { /** * Find pet by ID - * Returns a single pet - * @param petId ID of pet to return + * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions + * @param petId ID of pet that needs to be fetched * @return Pet */ public Pet getPetById (Long petId) throws ApiException { @@ -349,7 +326,7 @@ public class PetApi { * @param status Updated status of the pet * @return void */ - public void updatePetWithForm (Long petId, String name, String status) throws ApiException { + public void updatePetWithForm (String petId, String name, String status) throws ApiException { Object postBody = null; // verify the required parameter 'petId' is set @@ -480,9 +457,9 @@ public class PetApi { * @param petId ID of pet to update * @param additionalMetadata Additional data to pass to server * @param file file to upload - * @return ApiResponse + * @return void */ - public ApiResponse uploadFile (Long petId, String additionalMetadata, File file) throws ApiException { + public void uploadFile (Long petId, String additionalMetadata, File file) throws ApiException { Object postBody = null; // verify the required parameter 'petId' is set @@ -535,10 +512,10 @@ public class PetApi { try { String response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, postBody, headerParams, formParams, contentType); if(response != null){ - return (ApiResponse) ApiInvoker.deserialize(response, "", ApiResponse.class); + return ; } else { - return null; + return ; } } catch (ApiException ex) { throw ex; @@ -546,4 +523,3 @@ public class PetApi { } } - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java index b89a0ddbd47..49a3ac4aa9a 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java @@ -11,7 +11,6 @@ import java.util.*; import java.util.Map; import io.swagger.client.model.Order; - import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -19,7 +18,6 @@ import java.util.Map; import java.util.HashMap; import java.io.File; - public class StoreApi { String basePath = "http://petstore.swagger.io/v2"; ApiInvoker apiInvoker = ApiInvoker.getInstance(); @@ -103,11 +101,6 @@ public class StoreApi { public Order placeOrder (Order body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder"); - } - // create path and map variables String path = "/store/order".replaceAll("\\{format\\}","json"); @@ -159,7 +152,7 @@ public class StoreApi { * @param orderId ID of pet that needs to be fetched * @return Order */ - public Order getOrderById (Long orderId) throws ApiException { + public Order getOrderById (String orderId) throws ApiException { Object postBody = null; // verify the required parameter 'orderId' is set @@ -272,4 +265,3 @@ public class StoreApi { } } - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java index 6703b54f758..a16a745c7f8 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java @@ -11,7 +11,6 @@ import java.util.*; import io.swagger.client.model.User; import java.util.*; - import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -19,7 +18,6 @@ import java.util.Map; import java.util.HashMap; import java.io.File; - public class UserApi { String basePath = "http://petstore.swagger.io/v2"; ApiInvoker apiInvoker = ApiInvoker.getInstance(); @@ -50,11 +48,6 @@ public class UserApi { public void createUser (User body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling createUser"); - } - // create path and map variables String path = "/user".replaceAll("\\{format\\}","json"); @@ -109,11 +102,6 @@ public class UserApi { public void createUsersWithArrayInput (List body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput"); - } - // create path and map variables String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); @@ -168,11 +156,6 @@ public class UserApi { public void createUsersWithListInput (List body) throws ApiException { Object postBody = body; - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput"); - } - // create path and map variables String path = "/user/createWithList".replaceAll("\\{format\\}","json"); @@ -228,16 +211,6 @@ public class UserApi { public String loginUser (String username, String password) throws ApiException { Object postBody = null; - // verify the required parameter 'username' is set - if (username == null) { - throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); - } - - // verify the required parameter 'password' is set - if (password == null) { - throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); - } - // create path and map variables String path = "/user/login".replaceAll("\\{format\\}","json"); @@ -343,7 +316,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 { @@ -414,11 +387,6 @@ public class UserApi { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - // verify the required parameter 'body' is set - if (body == null) { - throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser"); - } - // create path and map variables String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString())); @@ -524,4 +492,3 @@ public class UserApi { } } - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/ApiResponse.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/ApiResponse.java deleted file mode 100644 index 6dd0a9c2fc2..00000000000 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/ApiResponse.java +++ /dev/null @@ -1,68 +0,0 @@ -package io.swagger.client.model; - - - -import io.swagger.annotations.*; -import com.google.gson.annotations.SerializedName; - - - -@ApiModel(description = "") -public class ApiResponse { - - @SerializedName("code") - private Integer code = null; - @SerializedName("type") - private String type = null; - @SerializedName("message") - private String message = null; - - - /** - **/ - @ApiModelProperty(value = "") - public Integer getCode() { - return code; - } - public void setCode(Integer code) { - this.code = code; - } - - - /** - **/ - @ApiModelProperty(value = "") - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - - - /** - **/ - @ApiModelProperty(value = "") - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ApiResponse {\n"); - - sb.append(" code: ").append(code).append("\n"); - sb.append(" type: ").append(type).append("\n"); - sb.append(" message: ").append(message).append("\n"); - sb.append("}\n"); - return sb.toString(); - } -} - - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java index 98e5c25c80f..44c71e8a620 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java @@ -1,12 +1,10 @@ package io.swagger.client.model; - import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - @ApiModel(description = "") public class Category { @@ -50,5 +48,3 @@ public class Category { return sb.toString(); } } - - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java index 4ef664deba2..f3f42db615c 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java @@ -2,12 +2,10 @@ package io.swagger.client.model; import java.util.Date; - import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - @ApiModel(description = "") public class Order { @@ -111,5 +109,3 @@ public class Order { return sb.toString(); } } - - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java index cf7eb877b2a..90a840e6e42 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java @@ -1,15 +1,13 @@ package io.swagger.client.model; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; - +import java.util.*; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - @ApiModel(description = "") public class Pet { @@ -20,9 +18,9 @@ public class Pet { @SerializedName("name") private String name = null; @SerializedName("photoUrls") - private List photoUrls = null; + private List photoUrls = new ArrayList() ; @SerializedName("tags") - private List tags = null; + private List tags = new ArrayList() ; public enum StatusEnum { available, pending, sold, }; @@ -113,5 +111,3 @@ public class Pet { return sb.toString(); } } - - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java index e87a002a144..7c9651b1ba8 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java @@ -1,12 +1,10 @@ package io.swagger.client.model; - import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - @ApiModel(description = "") public class Tag { @@ -50,5 +48,3 @@ public class Tag { return sb.toString(); } } - - diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java index fabdab0b4e3..dc022697eb0 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java @@ -1,12 +1,10 @@ package io.swagger.client.model; - import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; - @ApiModel(description = "") public class User { @@ -135,5 +133,3 @@ public class User { return sb.toString(); } } - -