From 79a5614be9a8fb7928feca37bc8960e6f6dc60dd Mon Sep 17 00:00:00 2001 From: Raghav Sidhanti Date: Mon, 22 Jun 2015 15:55:29 -0700 Subject: [PATCH] Invalid strings will be passed as blank query param. --- .../src/main/resources/Java/ApiClient.mustache | 7 ++++++- .../src/main/resources/android-java/apiInvoker.mustache | 7 ++++++- .../src/main/java/io/swagger/client/ApiInvoker.java | 7 ++++++- .../java/src/main/java/io/swagger/client/ApiClient.java | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index 888f407a412..9392277b52c 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -247,7 +247,12 @@ public class ApiClient { Set params = new HashSet(); // preconditions - if (name == null || name.isEmpty() || value == null) return params; + if (name == null || name.isEmpty()) return params; + + if (value == null) { + params.add(new Pair(name, value)); + return params; + } Collection valueCollection = null; if (value instanceof Collection) { diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache index 55d85018500..61baf88e8ea 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache @@ -141,7 +141,12 @@ public class ApiInvoker { Set params = new HashSet(); // preconditions - if (name == null || name.isEmpty() || value == null) return params; + if (name == null || name.isEmpty()) return params; + + if (value == null) { + params.add(new Pair(name, value)); + return params; + } Collection valueCollection = null; if (value instanceof Collection) { 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 f148a6fcbb7..73dc1ddc65b 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 @@ -141,7 +141,12 @@ public class ApiInvoker { Set params = new HashSet(); // preconditions - if (name == null || name.isEmpty() || value == null) return params; + if (name == null || name.isEmpty()) return params; + + if (value == null) { + params.add(new Pair(name, value)); + return params; + } Collection valueCollection = null; if (value instanceof Collection) { diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java index 441e5cc1f3c..cd801e0d763 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java @@ -246,7 +246,12 @@ public class ApiClient { Set params = new HashSet(); // preconditions - if (name == null || name.isEmpty() || value == null) return params; + if (name == null || name.isEmpty()) return params; + + if (value == null) { + params.add(new Pair(name, value)); + return params; + } Collection valueCollection = null; if (value instanceof Collection) {