Merge pull request #3359 from sinofool/master

Not compare Java String with "=="
This commit is contained in:
wing328 2016-07-13 20:50:36 +08:00 committed by GitHub
commit 0986acd2a6
15 changed files with 37 additions and 37 deletions

View File

@ -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);
}
}

View File

@ -32,9 +32,9 @@ 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);
}
}

View File

@ -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,7 +58,7 @@ 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();

View File

@ -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,7 +58,7 @@ 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();

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -32,9 +32,9 @@ 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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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,7 +58,7 @@ 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();

View File

@ -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,7 +58,7 @@ 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();

View File

@ -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,7 +58,7 @@ 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();