minor clean up

Author: slandelle

providers/netty3/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -174,7 +174,7 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
 
         // connection header and friends
         boolean webSocket = isWebSocket(uri.getScheme());
-        if (method != HttpMethod.CONNECT && webSocket) {
+        if (!connect && webSocket) {
             String origin = "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort());
             headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
                     .set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE)//

providers/netty3/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -329,7 +329,7 @@ public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
                     channel.write(httpRequest).addListener(new ProgressListener(config, future.getAsyncHandler(), future, true));
             }
 
-            if (!future.isDontWriteBodyBecauseExpectContinue() && !httpRequest.getMethod().equals(HttpMethod.CONNECT)
+            if (!future.isDontWriteBodyBecauseExpectContinue() && httpRequest.getMethod() != HttpMethod.CONNECT
                     && nettyRequest.getBody() != null)
                 nettyRequest.getBody().write(channel, future);
 

providers/netty4/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -179,7 +179,7 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
 
         // connection header and friends
         boolean webSocket = isWebSocket(uri.getScheme());
-        if (method != HttpMethod.CONNECT && webSocket) {
+        if (!connect && webSocket) {
             headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
             .set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.UPGRADE)//
             .set(HttpHeaders.Names.ORIGIN, "http://" + uri.getHost() + ":" + (uri.getPort() == -1 ? isSecure(uri.getScheme()) ? 443 : 80 : uri.getPort()))//

providers/netty4/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -330,7 +330,7 @@ public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
                 channel.writeAndFlush(httpRequest, channel.newProgressivePromise()).addListener(new ProgressListener(config, future.getAsyncHandler(), future, true, 0L));
             }
 
-            if (!future.isDontWriteBodyBecauseExpectContinue() && !httpRequest.getMethod().equals(HttpMethod.CONNECT) && nettyRequest.getBody() != null)
+            if (!future.isDontWriteBodyBecauseExpectContinue() && httpRequest.getMethod() != HttpMethod.CONNECT && nettyRequest.getBody() != null)
                 nettyRequest.getBody().write(channel, future);
 
             // don't bother scheduling timeouts if channel became invalid