From fa06331cfd9f059bc1f2271ed9e11dae99ff1e79 Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Tue, 17 Nov 2015 17:51:34 +0500 Subject: [PATCH] Fix : Strings literals should be placed on the left side when checking for equality --- client/src/main/java/org/asynchttpclient/Realm.java | 8 ++++---- .../org/asynchttpclient/netty/NettyResponseFuture.java | 2 +- .../org/asynchttpclient/netty/handler/HttpProtocol.java | 4 ++-- .../asynchttpclient/oauth/OAuthSignatureCalculator.java | 4 ++-- .../test/java/org/asynchttpclient/test/EchoHandler.java | 2 +- .../src/test/java/org/asynchttpclient/ws/EchoSocket.java | 2 +- .../extras/simple/SimpleAsyncHttpClient.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/src/main/java/org/asynchttpclient/Realm.java b/client/src/main/java/org/asynchttpclient/Realm.java index db5db23e2d..5630968658 100644 --- a/client/src/main/java/org/asynchttpclient/Realm.java +++ b/client/src/main/java/org/asynchttpclient/Realm.java @@ -323,12 +323,12 @@ private String parseRawQop(String rawQop) { // prefer auth over auth-int for (String rawServerSupportedQop : serverSupportedQops) { - if (rawServerSupportedQop.equals("auth")) + if ("auth".equals(rawServerSupportedQop)) return rawServerSupportedQop; } for (String rawServerSupportedQop : serverSupportedQops) { - if (rawServerSupportedQop.equals("auth-int")) + if ("auth-int".equals(rawServerSupportedQop)) return rawServerSupportedQop; } @@ -407,7 +407,7 @@ private byte[] secretDigest(StringBuilder sb, MessageDigest md) { sb.append(principal).append(':').append(realmName).append(':').append(password); byte[] ha1 = md5FromRecycledStringBuilder(sb, md); - if (algorithm == null || algorithm.equals("MD5")) { + if (algorithm == null || "MD5".equals(algorithm)) { return ha1; } else if ("MD5-sess".equals(algorithm)) { appendBase16(sb, ha1); @@ -424,7 +424,7 @@ private byte[] dataDigest(StringBuilder sb, String digestUri, MessageDigest md) if ("auth-int".equals(qop)) { sb.append(':').append(EMPTY_ENTITY_MD5); - } else if (qop != null && !qop.equals("auth")) { + } else if (qop != null && !"auth".equals(qop)) { throw new UnsupportedOperationException("Digest qop not supported: " + qop); } diff --git a/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java b/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java index 65c3009963..ae4a69be89 100755 --- a/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java +++ b/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java @@ -439,7 +439,7 @@ public void setCurrentRequest(Request currentRequest) { * @return true if that {@link Future} cannot be recovered. */ public boolean canBeReplayed() { - return !isDone() && canRetry() && !(Channels.isChannelValid(channel) && !getUri().getScheme().equalsIgnoreCase("https")) && !inAuth.get() && !inProxyAuth.get(); + return !isDone() && canRetry() && !(Channels.isChannelValid(channel) && !"https".equalsIgnoreCase(getUri().getScheme())) && !inAuth.get() && !inProxyAuth.get(); } public long getStart() { diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java b/client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java index e3751df3b6..99e9bd4da1 100755 --- a/client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java +++ b/client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java @@ -89,7 +89,7 @@ private void ntlmChallenge(String authenticateHeader,// Realm realm,// NettyResponseFuture future) { - if (authenticateHeader.equals("NTLM")) { + if ("NTLM".equals(authenticateHeader)) { // server replied bare NTLM => we didn't preemptively sent Type1Msg String challengeHeader = NtlmEngine.INSTANCE.generateType1Msg(); // FIXME we might want to filter current NTLM and add (leave other @@ -112,7 +112,7 @@ private void ntlmProxyChallenge(String authenticateHeader,// HttpHeaders headers,// NettyResponseFuture future) { - if (authenticateHeader.equals("NTLM")) { + if ("NTLM".equals(authenticateHeader)) { // server replied bare NTLM => we didn't preemptively sent Type1Msg String challengeHeader = NtlmEngine.INSTANCE.generateType1Msg(); // FIXME we might want to filter current NTLM and add (leave other diff --git a/client/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java b/client/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java index 4ebe319547..a87f1c5421 100644 --- a/client/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java +++ b/client/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java @@ -99,10 +99,10 @@ private String baseUrl(Uri uri) { sb.append(scheme).append("://").append(uri.getHost()); int port = uri.getPort(); - if (scheme.equals("http")) { + if ("http".equals(scheme)) { if (port == 80) port = -1; - } else if (scheme.equals("https")) { + } else if ("https".equals(scheme)) { if (port == 443) port = -1; } diff --git a/client/src/test/java/org/asynchttpclient/test/EchoHandler.java b/client/src/test/java/org/asynchttpclient/test/EchoHandler.java index cbc779688d..4a4286bc9b 100644 --- a/client/src/test/java/org/asynchttpclient/test/EchoHandler.java +++ b/client/src/test/java/org/asynchttpclient/test/EchoHandler.java @@ -26,7 +26,7 @@ public void handle(String pathInContext, Request request, HttpServletRequest htt httpResponse.setContentType(TestUtils.TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET); } - if (request.getMethod().equalsIgnoreCase("OPTIONS")) { + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { httpResponse.addHeader("Allow", "GET,HEAD,POST,OPTIONS,TRACE"); } diff --git a/client/src/test/java/org/asynchttpclient/ws/EchoSocket.java b/client/src/test/java/org/asynchttpclient/ws/EchoSocket.java index dcb7d75ea6..162021e6cc 100644 --- a/client/src/test/java/org/asynchttpclient/ws/EchoSocket.java +++ b/client/src/test/java/org/asynchttpclient/ws/EchoSocket.java @@ -38,7 +38,7 @@ public void onWebSocketText(String message) { return; } try { - if (message.equals("CLOSE")) + if ("CLOSE".equals(message)) getSession().close(); else getRemote().sendString(message); diff --git a/extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java b/extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java index 3ea07836b9..edac3c6e68 100644 --- a/extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java +++ b/extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java @@ -298,7 +298,7 @@ private Future execute(RequestBuilder rb, BodyConsumer bodyConsumer, T ProgressAsyncHandler handler = new BodyConsumerAsyncHandler(bodyConsumer, throwableHandler, errorDocumentBehaviour, request.getUri(), listener); - if (resumeEnabled && request.getMethod().equals("GET") && bodyConsumer != null && bodyConsumer instanceof ResumableBodyConsumer) { + if (resumeEnabled && "GET".equals(request.getMethod()) && bodyConsumer != null && bodyConsumer instanceof ResumableBodyConsumer) { ResumableBodyConsumer fileBodyConsumer = (ResumableBodyConsumer) bodyConsumer; long length = fileBodyConsumer.getTransferredBytes(); fileBodyConsumer.resume();