Remove more Java String comparison using "=="

This commit is contained in:
Bochun Bai 2016-07-13 18:06:45 +08:00
parent 6d4d81b652
commit f75a42f810
14 changed files with 35 additions and 35 deletions

View File

@ -32,10 +32,10 @@ public class ApiKeyAuth implements RequestInterceptor {
@Override @Override
public void apply(RequestTemplate template) { public void apply(RequestTemplate template) {
if (location == "query") { if ("query".equals(location)) {
template.query(paramName, apiKey); template.query(paramName, apiKey);
} else if (location == "header") { } else if ("header".equals(location)) {
template.header(paramName, apiKey); template.header(paramName, apiKey);
} }
} }
} }

View File

@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor {
String paramValue; String paramValue;
Request request = chain.request(); Request request = chain.request();
if (location == "query") { if ("query".equals(location)) {
String newQuery = request.uri().getQuery(); String newQuery = request.uri().getQuery();
paramValue = paramName + "=" + apiKey; paramValue = paramName + "=" + apiKey;
if (newQuery == null) { if (newQuery == null) {
@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor {
} }
request = request.newBuilder().url(newUri.toURL()).build(); request = request.newBuilder().url(newUri.toURL()).build();
} else if (location == "header") { } else if ("header".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader(paramName, apiKey) .addHeader(paramName, apiKey)
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);
} }
} }

View File

@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor {
String paramValue; String paramValue;
Request request = chain.request(); Request request = chain.request();
if (location == "query") { if ("query".equals(location)) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
paramValue = paramName + "=" + apiKey; paramValue = paramName + "=" + apiKey;
if (newQuery == null) { if (newQuery == null) {
@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor {
} }
request = request.newBuilder().url(newUri.toURL()).build(); request = request.newBuilder().url(newUri.toURL()).build();
} else if (location == "header") { } else if ("header".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader(paramName, apiKey) .addHeader(paramName, apiKey)
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);
} }
} }

View File

@ -53,9 +53,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -76,9 +76,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -32,10 +32,10 @@ public class ApiKeyAuth implements RequestInterceptor {
@Override @Override
public void apply(RequestTemplate template) { public void apply(RequestTemplate template) {
if (location == "query") { if ("query".equals(location)) {
template.query(paramName, apiKey); template.query(paramName, apiKey);
} else if (location == "header") { } else if ("header".equals(location)) {
template.header(paramName, apiKey); template.header(paramName, apiKey);
} }
} }
} }

View File

@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -78,9 +78,9 @@ public class ApiKeyAuth implements Authentication {
} else { } else {
value = apiKey; value = apiKey;
} }
if (location == "query") { if ("query".equals(location)) {
queryParams.add(new Pair(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if ("header".equals(location)) {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }
} }

View File

@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor {
String paramValue; String paramValue;
Request request = chain.request(); Request request = chain.request();
if (location == "query") { if ("query".equals(location)) {
String newQuery = request.uri().getQuery(); String newQuery = request.uri().getQuery();
paramValue = paramName + "=" + apiKey; paramValue = paramName + "=" + apiKey;
if (newQuery == null) { if (newQuery == null) {
@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor {
} }
request = request.newBuilder().url(newUri.toURL()).build(); request = request.newBuilder().url(newUri.toURL()).build();
} else if (location == "header") { } else if ("header".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader(paramName, apiKey) .addHeader(paramName, apiKey)
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);
} }
} }

View File

@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor {
String paramValue; String paramValue;
Request request = chain.request(); Request request = chain.request();
if (location == "query") { if ("query".equals(location)) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
paramValue = paramName + "=" + apiKey; paramValue = paramName + "=" + apiKey;
if (newQuery == null) { if (newQuery == null) {
@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor {
} }
request = request.newBuilder().url(newUri.toURL()).build(); request = request.newBuilder().url(newUri.toURL()).build();
} else if (location == "header") { } else if ("header".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader(paramName, apiKey) .addHeader(paramName, apiKey)
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);
} }
} }

View File

@ -40,7 +40,7 @@ public class ApiKeyAuth implements Interceptor {
String paramValue; String paramValue;
Request request = chain.request(); Request request = chain.request();
if (location == "query") { if ("query".equals(location)) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
paramValue = paramName + "=" + apiKey; paramValue = paramName + "=" + apiKey;
if (newQuery == null) { if (newQuery == null) {
@ -58,11 +58,11 @@ public class ApiKeyAuth implements Interceptor {
} }
request = request.newBuilder().url(newUri.toURL()).build(); request = request.newBuilder().url(newUri.toURL()).build();
} else if (location == "header") { } else if ("header".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader(paramName, apiKey) .addHeader(paramName, apiKey)
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);
} }
} }