From 0d14496bd6fbdbd763844f239b34e198459fe4d9 Mon Sep 17 00:00:00 2001
From: Jan <jan.leimbach@outlook.com>
Date: Wed, 8 Feb 2017 14:54:56 +0100
Subject: [PATCH] [Java-retrofit] Fix for #4750 String comparison with equals
 (#4751)

* [Java-Feign] Fixed String comparison using equals instead of == operator

* [Java-Feign] Updated ApiClient with ./bin/java-petstore-feign.sh

* [Java-retrofit] Fix for #4750 String comparison with equals
---
 .../resources/Java/libraries/retrofit/ApiClient.mustache    | 2 +-
 .../resources/Java/libraries/retrofit2/ApiClient.mustache   | 2 +-
 .../retrofit/src/main/java/io/swagger/client/ApiClient.java | 6 +++---
 .../src/main/java/io/swagger/client/ApiClient.java          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
index 1da27f21ac2..30de5917a34 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
@@ -54,7 +54,7 @@ public class ApiClient {
         this();
         for(String authName : authNames) { {{#hasAuthMethods}}
             Interceptor auth;
-            {{#authMethods}}if (authName == "{{name}}") { {{#isBasic}}
+            {{#authMethods}}if ("{{name}}".equals(authName)) { {{#isBasic}}
                 auth = new HttpBasicAuth();{{/isBasic}}{{#isApiKey}}
                 auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}}{{#isOAuth}}
                 auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");{{/isOAuth}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index 7d4f106a05a..191b689c8c8 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -60,7 +60,7 @@ public class ApiClient {
         this();
         for(String authName : authNames) { {{#hasAuthMethods}}
             Interceptor auth;
-            {{#authMethods}}if (authName == "{{name}}") { {{#isBasic}}
+            {{#authMethods}}if ("{{name}}".equals(authName)) { {{#isBasic}}
                 auth = new HttpBasicAuth();{{/isBasic}}{{#isApiKey}}
                 auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}}{{#isOAuth}}
                 auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");{{/isOAuth}}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
index be3eaefe6d9..ed9821db8f7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
@@ -54,11 +54,11 @@ public class ApiClient {
         this();
         for(String authName : authNames) { 
             Interceptor auth;
-            if (authName == "api_key") { 
+            if ("api_key".equals(authName)) { 
                 auth = new ApiKeyAuth("header", "api_key");
-            } else if (authName == "http_basic_test") { 
+            } else if ("http_basic_test".equals(authName)) { 
                 auth = new HttpBasicAuth();
-            } else if (authName == "petstore_auth") { 
+            } else if ("petstore_auth".equals(authName)) { 
                 auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
             } else {
                 throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index 6bd0aac79ab..4be862d52ff 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -53,11 +53,11 @@ public class ApiClient {
         this();
         for(String authName : authNames) { 
             Interceptor auth;
-            if (authName == "api_key") { 
+            if ("api_key".equals(authName)) { 
                 auth = new ApiKeyAuth("header", "api_key");
-            } else if (authName == "http_basic_test") { 
+            } else if ("http_basic_test".equals(authName)) { 
                 auth = new HttpBasicAuth();
-            } else if (authName == "petstore_auth") { 
+            } else if ("petstore_auth".equals(authName)) { 
                 auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
             } else {
                 throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");