diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
index d8c48e93b10..e87819e6944 100644
--- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
@@ -246,12 +246,7 @@ public class ApiClient {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty()) return params;
-
-    if (value == null) {
-      params.add(new Pair(name, ""));
-      return params;
-    }
+    if (name == null || name.isEmpty() || value == null) 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 3aeb9b8505d..5aabd2458e8 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
@@ -140,12 +140,7 @@ public class ApiInvoker {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty()) return params;
-
-    if (value == null) {
-      params.add(new Pair(name, ""));
-      return params;
-    }
+    if (name == null || name.isEmpty() || value == null) 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 c55e127cddf..0ccc3713958 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
@@ -140,12 +140,7 @@ public class ApiInvoker {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty()) return params;
-
-    if (value == null) {
-      params.add(new Pair(name, ""));
-      return params;
-    }
+    if (name == null || name.isEmpty() || value == null) return params;
 
     Collection valueCollection = null;
     if (value instanceof Collection) {
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 90a840e6e42..26219b16a45 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,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import io.swagger.client.model.Tag;
 import java.util.*;
+import io.swagger.client.model.Tag;
 
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
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 4d50ab3ce84..9659ce3ba5f 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
@@ -245,12 +245,7 @@ public class ApiClient {
     List<Pair> params = new ArrayList<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty()) return params;
-
-    if (value == null) {
-      params.add(new Pair(name, ""));
-      return params;
-    }
+    if (name == null || name.isEmpty() || value == null) return params;
 
     Collection valueCollection = null;
     if (value instanceof Collection) {
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
index 402fc9da953..609fb66af2b 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
@@ -323,7 +323,7 @@ public class PetApi {
     }
 
     try {
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
       String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
       if(response != null){
         return (Pet) apiClient.deserialize(response, "", Pet.class);
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
index cf7ace02309..ddd0e1038c0 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import io.swagger.client.model.Tag;
 import java.util.*;
+import io.swagger.client.model.Tag;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;