[1.9.x] + move all the com.ning.http.client.providers.netty.util.HttpUtil methods except getNettyHeaderValuesByCaseInsensitiveName to the com.ning.http.util.AsyncHttpProviderUtils

Author: oleksiys

src/main/java/com/ning/http/client/providers/grizzly/AhcEventFilter.java

@@ -55,7 +55,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.getNTLM;
 import static com.ning.http.util.AsyncHttpProviderUtils.*;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 /**

src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -13,9 +13,9 @@
  */
 package com.ning.http.client.providers.netty.channel;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.WEBSOCKET;
-import static com.ning.http.client.providers.netty.util.HttpUtils.isSecure;
-import static com.ning.http.client.providers.netty.util.HttpUtils.isWebSocket;
+import static com.ning.http.util.AsyncHttpProviderUtils.WEBSOCKET;
+import static com.ning.http.util.AsyncHttpProviderUtils.isSecure;
+import static com.ning.http.util.AsyncHttpProviderUtils.isWebSocket;
 import static com.ning.http.util.MiscUtils.buildStaticIOException;
 import static org.jboss.netty.channel.Channels.pipeline;
 import static org.jboss.netty.handler.ssl.SslHandler.getDefaultBufferPool;

src/main/java/com/ning/http/client/providers/netty/handler/HttpProtocol.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -13,7 +13,7 @@
  */
 package com.ning.http.client.providers.netty.handler;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.getNTLM;
+import static com.ning.http.util.AsyncHttpProviderUtils.getNTLM;
 import static com.ning.http.util.AsyncHttpProviderUtils.getDefaultPort;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.CONTINUE;

src/main/java/com/ning/http/client/providers/netty/handler/Protocol.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -13,8 +13,6 @@
  */
 package com.ning.http.client.providers.netty.handler;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.HTTP;
-import static com.ning.http.client.providers.netty.util.HttpUtils.WEBSOCKET;
 import static com.ning.http.util.AsyncHttpProviderUtils.*;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -13,10 +13,10 @@
  */
 package com.ning.http.client.providers.netty.request;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.getNTLM;
-import static com.ning.http.client.providers.netty.util.HttpUtils.isSecure;
-import static com.ning.http.client.providers.netty.util.HttpUtils.isWebSocket;
-import static com.ning.http.client.providers.netty.util.HttpUtils.useProxyConnect;
+import static com.ning.http.util.AsyncHttpProviderUtils.getNTLM;
+import static com.ning.http.util.AsyncHttpProviderUtils.isSecure;
+import static com.ning.http.util.AsyncHttpProviderUtils.isWebSocket;
+import static com.ning.http.util.AsyncHttpProviderUtils.useProxyConnect;
 import static com.ning.http.client.providers.netty.ws.WebSocketUtils.getKey;
 import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
 import static com.ning.http.util.AsyncHttpProviderUtils.getAuthority;

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -12,9 +12,9 @@
  */
 package com.ning.http.client.providers.netty.request;
 
-import static com.ning.http.client.providers.netty.util.HttpUtils.WEBSOCKET;
-import static com.ning.http.client.providers.netty.util.HttpUtils.isSecure;
-import static com.ning.http.client.providers.netty.util.HttpUtils.useProxyConnect;
+import static com.ning.http.util.AsyncHttpProviderUtils.WEBSOCKET;
+import static com.ning.http.util.AsyncHttpProviderUtils.isSecure;
+import static com.ning.http.util.AsyncHttpProviderUtils.useProxyConnect;
 import static com.ning.http.util.AsyncHttpProviderUtils.REMOTELY_CLOSED_EXCEPTION;
 import static com.ning.http.util.AsyncHttpProviderUtils.getDefaultPort;
 import static com.ning.http.util.AsyncHttpProviderUtils.requestTimeout;

src/main/java/com/ning/http/client/providers/netty/util/HttpUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ * Copyright (c) 2014-2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -15,34 +15,14 @@
 
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 
-import com.ning.http.client.uri.Uri;
-import com.ning.http.util.MiscUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
 public final class HttpUtils {
-
-    public static final String HTTP = "http";
-    public static final String HTTPS = "https";
-    public static final String WEBSOCKET = "ws";
-    public static final String WEBSOCKET_SSL = "wss";
-
     private HttpUtils() {
     }
 
-    public static String getNTLM(List<String> authenticateHeaders) {
-        if (MiscUtils.isNonEmpty(authenticateHeaders)) {
-            for (String authenticateHeader: authenticateHeaders) {
-                if (authenticateHeader.startsWith("NTLM"))
-                    return authenticateHeader;
-            }
-        }
-
-        return null;
-    }
-
     public static List<String> getNettyHeaderValuesByCaseInsensitiveName(HttpHeaders headers, String name) {
         ArrayList<String> l = new ArrayList<>();
         for (Entry<String, String> e : headers) {
@@ -52,20 +32,4 @@ public static List<String> getNettyHeaderValuesByCaseInsensitiveName(HttpHeaders
         }
         return l;
     }
-
-    public static boolean isWebSocket(String scheme) {
-        return WEBSOCKET.equals(scheme) || WEBSOCKET_SSL.equalsIgnoreCase(scheme);
-    }
-
-    public static boolean isSecure(String scheme) {
-        return HTTPS.equals(scheme) || WEBSOCKET_SSL.equals(scheme);
-    }
-
-    public static boolean isSecure(Uri uri) {
-        return isSecure(uri.getScheme());
-    }
-
-    public static boolean useProxyConnect(Uri uri) {
-        return isSecure(uri) || isWebSocket(uri.getScheme());
-    }
 }

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2010-2015 Sonatype, Inc. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -41,6 +41,11 @@ public class AsyncHttpProviderUtils {
 
     public final static Charset DEFAULT_CHARSET = ISO_8859_1;
 
+    public static final String HTTP = "http";
+    public static final String HTTPS = "https";
+    public static final String WEBSOCKET = "ws";
+    public static final String WEBSOCKET_SSL = "wss";
+    
     static final byte[] EMPTY_BYTE_ARRAY = "".getBytes();
 
     public static final void validateSupportedScheme(Uri uri) {
@@ -191,4 +196,31 @@ private static void encodeAndAppendFormParam(final StringBuilder sb, final CharS
         }
         sb.append('&');
     }
+    
+    public static String getNTLM(List<String> authenticateHeaders) {
+        if (MiscUtils.isNonEmpty(authenticateHeaders)) {
+            for (String authenticateHeader: authenticateHeaders) {
+                if (authenticateHeader.startsWith("NTLM"))
+                    return authenticateHeader;
+            }
+        }
+
+        return null;
+    }
+
+    public static boolean isWebSocket(String scheme) {
+        return WEBSOCKET.equals(scheme) || WEBSOCKET_SSL.equalsIgnoreCase(scheme);
+    }
+
+    public static boolean isSecure(String scheme) {
+        return HTTPS.equals(scheme) || WEBSOCKET_SSL.equals(scheme);
+    }
+
+    public static boolean isSecure(Uri uri) {
+        return isSecure(uri.getScheme());
+    }
+
+    public static boolean useProxyConnect(Uri uri) {
+        return isSecure(uri) || isWebSocket(uri.getScheme());
+    }    
 }