Merge pull request #3359 from sinofool/master

wing328 · web-flow · commit 0986acd2a6e5 · 2016-07-13T20:50:36.000+08:00
Not compare Java String with "=="
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -55,9 +55,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/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);
         }
     }
-}
+}
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
@@ -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);
     }
-}
+}
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
@@ -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);
     }
-}
+}
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
@@ -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
@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -76,9 +76,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -32,10 +32,10 @@ public void setApiKey(String apiKey) {
 
     @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);
         }
     }
-}
+}
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
@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
     } 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
@@ -40,7 +40,7 @@ public Response intercept(Chain chain) throws IOException {
         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 Response intercept(Chain chain) throws IOException {
             }
 
             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);
     }
-}
+}
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
@@ -40,7 +40,7 @@ public Response intercept(Chain chain) throws IOException {
         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 Response intercept(Chain chain) throws IOException {
             }
 
             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);
     }
-}
+}
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
@@ -40,7 +40,7 @@ public Response intercept(Chain chain) throws IOException {
         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 Response intercept(Chain chain) throws IOException {
             }
 
             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);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ public class ApiKeyAuth implements Authentication {`
`55`	`55`	`} else {`
`56`	`56`	`value = apiKey;`
`57`	`57`	`}`
`58`		`- if (location == "query") {`
	`58`	`+ if ("query".equals(location)) {`
`59`	`59`	`queryParams.add(new Pair(paramName, value));`
`60`		`- } else if (location == "header") {`
	`60`	`+ } else if ("header".equals(location)) {`
`61`	`61`	`headerParams.put(paramName, value);`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ public class ApiKeyAuth implements RequestInterceptor {`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public void apply(RequestTemplate template) {`
`35`		`- if (location == "query") {`
	`35`	`+ if ("query".equals(location)) {`
`36`	`36`	`template.query(paramName, apiKey);`
`37`		`- } else if (location == "header") {`
	`37`	`+ } else if ("header".equals(location)) {`
`38`	`38`	`template.header(paramName, apiKey);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ public class ApiKeyAuth implements Authentication {`
`53`	`53`	`} else {`
`54`	`54`	`value = apiKey;`
`55`	`55`	`}`
`56`		`- if (location == "query") {`
	`56`	`+ if ("query".equals(location)) {`
`57`	`57`	`queryParams.add(new Pair(paramName, value));`
`58`		`- } else if (location == "header") {`
	`58`	`+ } else if ("header".equals(location)) {`
`59`	`59`	`headerParams.put(paramName, value);`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara`
`78`	`78`	`} else {`
`79`	`79`	`value = apiKey;`
`80`	`80`	`}`
`81`		`- if (location == "query") {`
	`81`	`+ if ("query".equals(location)) {`
`82`	`82`	`queryParams.add(new Pair(paramName, value));`
`83`		`- } else if (location == "header") {`
	`83`	`+ } else if ("header".equals(location)) {`
`84`	`84`	`headerParams.put(paramName, value);`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,9 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara`
`76`	`76`	`} else {`
`77`	`77`	`value = apiKey;`
`78`	`78`	`}`
`79`		`- if (location == "query") {`
	`79`	`+ if ("query".equals(location)) {`
`80`	`80`	`queryParams.add(new Pair(paramName, value));`
`81`		`- } else if (location == "header") {`
	`81`	`+ } else if ("header".equals(location)) {`
`82`	`82`	`headerParams.put(paramName, value);`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ public void setApiKey(String apiKey) {`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public void apply(RequestTemplate template) {`
`35`		`- if (location == "query") {`
	`35`	`+ if ("query".equals(location)) {`
`36`	`36`	`template.query(paramName, apiKey);`
`37`		`- } else if (location == "header") {`
	`37`	`+ } else if ("header".equals(location)) {`
`38`	`38`	`template.header(paramName, apiKey);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`