From f75a42f81038b4e9445c61dc2c658c69a86bcd9d Mon Sep 17 00:00:00 2001 From: Bochun Bai Date: Wed, 13 Jul 2016 18:06:45 +0800 Subject: [PATCH] Remove more Java String comparison using "==" --- .../resources/Java/libraries/feign/auth/ApiKeyAuth.mustache | 6 +++--- .../Java/libraries/retrofit/auth/ApiKeyAuth.mustache | 6 +++--- .../Java/libraries/retrofit2/auth/ApiKeyAuth.mustache | 6 +++--- .../android/libraries/volley/auth/apikeyauth.mustache | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 6 +++--- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 4 ++-- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 6 +++--- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 6 +++--- .../src/main/java/io/swagger/client/auth/ApiKeyAuth.java | 6 +++--- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache index 371b24dbe55..9982cd7fc49 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache @@ -32,10 +32,10 @@ public class ApiKeyAuth implements RequestInterceptor { @Override public void apply(RequestTemplate template) { - if (location == "query") { + if ("query".equals(location)) { template.query(paramName, apiKey); - } else if (location == "header") { + } else if ("header".equals(location)) { template.header(paramName, apiKey); } } -} \ No newline at end of file +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache index fec45262e93..f6a86f22ab4 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache @@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor { String paramValue; Request request = chain.request(); - if (location == "query") { + if ("query".equals(location)) { String newQuery = request.uri().getQuery(); paramValue = paramName + "=" + apiKey; if (newQuery == null) { @@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor { } request = request.newBuilder().url(newUri.toURL()).build(); - } else if (location == "header") { + } else if ("header".equals(location)) { request = request.newBuilder() .addHeader(paramName, apiKey) .build(); } return chain.proceed(request); } -} \ No newline at end of file +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache index 92c0df0ddea..2f4bae3dd02 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache @@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor { String paramValue; Request request = chain.request(); - if (location == "query") { + if ("query".equals(location)) { String newQuery = request.url().uri().getQuery(); paramValue = paramName + "=" + apiKey; if (newQuery == null) { @@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor { } request = request.newBuilder().url(newUri.toURL()).build(); - } else if (location == "header") { + } else if ("header".equals(location)) { request = request.newBuilder() .addHeader(paramName, apiKey) .build(); } return chain.proceed(request); } -} \ No newline at end of file +} diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache index 0805918e0d0..2208935ee42 100644 --- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache +++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/auth/apikeyauth.mustache @@ -53,9 +53,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index 70697c99ad3..e12f1535217 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index f2633f688b7..9f30bc7dff7 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -76,9 +76,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index 067672104a9..6e963f39d5c 100644 --- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -32,10 +32,10 @@ public class ApiKeyAuth implements RequestInterceptor { @Override public void apply(RequestTemplate template) { - if (location == "query") { + if ("query".equals(location)) { template.query(paramName, apiKey); - } else if (location == "header") { + } else if ("header".equals(location)) { template.header(paramName, apiKey); } } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index a125fff5f24..ad7abe402f8 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index a125fff5f24..ad7abe402f8 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index a125fff5f24..ad7abe402f8 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index a125fff5f24..ad7abe402f8 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication { } else { value = apiKey; } - if (location == "query") { + if ("query".equals(location)) { queryParams.add(new Pair(paramName, value)); - } else if (location == "header") { + } else if ("header".equals(location)) { headerParams.put(paramName, value); } } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index 59d01238796..2f973bb5e05 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor { String paramValue; Request request = chain.request(); - if (location == "query") { + if ("query".equals(location)) { String newQuery = request.uri().getQuery(); paramValue = paramName + "=" + apiKey; if (newQuery == null) { @@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor { } request = request.newBuilder().url(newUri.toURL()).build(); - } else if (location == "header") { + } else if ("header".equals(location)) { request = request.newBuilder() .addHeader(paramName, apiKey) .build(); } return chain.proceed(request); } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index f210c2110b5..05bf9561fe3 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor { String paramValue; Request request = chain.request(); - if (location == "query") { + if ("query".equals(location)) { String newQuery = request.url().uri().getQuery(); paramValue = paramName + "=" + apiKey; if (newQuery == null) { @@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor { } request = request.newBuilder().url(newUri.toURL()).build(); - } else if (location == "header") { + } else if ("header".equals(location)) { request = request.newBuilder() .addHeader(paramName, apiKey) .build(); } return chain.proceed(request); } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index f210c2110b5..05bf9561fe3 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor { String paramValue; Request request = chain.request(); - if (location == "query") { + if ("query".equals(location)) { String newQuery = request.url().uri().getQuery(); paramValue = paramName + "=" + apiKey; if (newQuery == null) { @@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor { } request = request.newBuilder().url(newUri.toURL()).build(); - } else if (location == "header") { + } else if ("header".equals(location)) { request = request.newBuilder() .addHeader(paramName, apiKey) .build(); } return chain.proceed(request); } -} \ No newline at end of file +}