minor clean up

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java

@@ -13,6 +13,7 @@
  */
 package org.asynchttpclient.netty.handler.intercept;
 
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
 import static org.asynchttpclient.Dsl.realm;
 import static org.asynchttpclient.util.AuthenticatorUtils.*;
 import static org.asynchttpclient.util.MiscUtils.withDefault;
@@ -72,7 +73,7 @@ public boolean exitAfterHandling401(//
             return false;
         }
 
-        List<String> wwwAuthHeaders = response.headers().getAll(HttpHeaders.Names.WWW_AUTHENTICATE);
+        List<String> wwwAuthHeaders = response.headers().getAll(WWW_AUTHENTICATE);
 
         if (wwwAuthHeaders.isEmpty()) {
             LOGGER.info("Can't handle 401 as response doesn't contain WWW-Authenticate headers");
@@ -193,15 +194,15 @@ private void ntlmChallenge(String authenticateHeader,//
             String challengeHeader = NtlmEngine.INSTANCE.generateType1Msg();
             // FIXME we might want to filter current NTLM and add (leave other
             // Authorization headers untouched)
-            requestHeaders.set(HttpHeaders.Names.AUTHORIZATION, "NTLM " + challengeHeader);
+            requestHeaders.set(AUTHORIZATION, "NTLM " + challengeHeader);
             future.getInAuth().set(false);
 
         } else {
             String serverChallenge = authenticateHeader.substring("NTLM ".length()).trim();
             String challengeHeader = NtlmEngine.INSTANCE.generateType3Msg(realm.getPrincipal(), realm.getPassword(), realm.getNtlmDomain(), realm.getNtlmHost(), serverChallenge);
             // FIXME we might want to filter current NTLM and add (leave other
             // Authorization headers untouched)
-            requestHeaders.set(HttpHeaders.Names.AUTHORIZATION, "NTLM " + challengeHeader);
+            requestHeaders.set(AUTHORIZATION, "NTLM " + challengeHeader);
         }
     }
 
@@ -215,6 +216,6 @@ private void kerberosChallenge(Channel channel,//
         Uri uri = request.getUri();
         String host = withDefault(request.getVirtualHost(), uri.getHost());
         String challengeHeader = SpnegoEngine.instance().generateToken(host);
-        headers.set(HttpHeaders.Names.AUTHORIZATION, NEGOTIATE + " " + challengeHeader);
+        headers.set(AUTHORIZATION, NEGOTIATE + " " + challengeHeader);
     }
 }

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -14,6 +14,7 @@
 package org.asynchttpclient.netty.request;
 
 import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 import static org.asynchttpclient.util.AuthenticatorUtils.*;
 import static org.asynchttpclient.util.HttpUtils.*;
 import static org.asynchttpclient.util.MiscUtils.*;
@@ -182,7 +183,7 @@ public NettyRequest newNettyRequest(Request request, boolean forceConnect, Proxy
 
         // connection header and friends
         if (!connect && uri.isWebSocket()) {
-            headers.set(UPGRADE, HttpHeaders.Values.WEBSOCKET)//
+            headers.set(HttpHeaders.Names.UPGRADE, HttpHeaders.Values.WEBSOCKET)//
                     .set(CONNECTION, HttpHeaders.Values.UPGRADE)//
                     .set(ORIGIN, "http://" + uri.getHost() + ":" + uri.getExplicitPort())//
                     .set(SEC_WEBSOCKET_KEY, getKey())//
@@ -236,9 +237,9 @@ else if (proxyServer != null && !uri.isSecured())
 
     private String connectionHeader(boolean keepAlive, HttpVersion httpVersion) {
         if (httpVersion.isKeepAliveDefault()) {
-            return keepAlive ? null : HttpHeaders.Values.CLOSE;
+            return keepAlive ? null : CLOSE;
         } else {
-            return keepAlive ? HttpHeaders.Values.KEEP_ALIVE : null;
+            return keepAlive ? KEEP_ALIVE : null;
         }
     }
 }