Clean up default user agent

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -385,8 +385,6 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
             method.setRequestHeader("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
         } else if (config.getUserAgent() != null) {
             method.setRequestHeader("User-Agent", config.getUserAgent());
-        } else {
-            method.setRequestHeader("User-Agent", AsyncHttpProviderUtils.constructUserAgent(ApacheAsyncHttpProvider.class, config));
         }
 
         if (config.isCompressionEnabled()) {

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -522,8 +522,6 @@ private void configure(UriComponents uri, HttpURLConnection urlConnection, Reque
                 urlConnection.setRequestProperty("User-Agent", request.getHeaders().getFirstValue("User-Agent"));
             } else if (config.getUserAgent() != null) {
                 urlConnection.setRequestProperty("User-Agent", config.getUserAgent());
-            } else {
-                urlConnection.setRequestProperty("User-Agent", AsyncHttpProviderUtils.constructUserAgent(JDKAsyncHttpProvider.class, config));
             }
 
             if (isNonEmpty(request.getCookies())) {

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

@@ -13,6 +13,19 @@
  */
 package com.ning.http.client.providers.netty.request;
 
+import static com.ning.http.client.providers.netty.util.HttpUtils.isNTLM;
+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.client.providers.netty.ws.WebSocketUtils.getKey;
+import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
+import static com.ning.http.util.AsyncHttpProviderUtils.getAuthority;
+import static com.ning.http.util.AsyncHttpProviderUtils.getNonEmptyPath;
+import static com.ning.http.util.AsyncHttpProviderUtils.keepAliveHeaderValue;
+import static com.ning.http.util.AuthenticatorUtils.computeBasicAuthentication;
+import static com.ning.http.util.AuthenticatorUtils.computeDigestAuthentication;
+import static com.ning.http.util.MiscUtils.isNonEmpty;
+
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
@@ -30,7 +43,6 @@
 import com.ning.http.client.generators.InputStreamBodyGenerator;
 import com.ning.http.client.ntlm.NTLMEngine;
 import com.ning.http.client.ntlm.NTLMEngineException;
-import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
 import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
 import com.ning.http.client.providers.netty.request.body.NettyBody;
 import com.ning.http.client.providers.netty.request.body.NettyBodyBody;
@@ -39,12 +51,7 @@
 import com.ning.http.client.providers.netty.request.body.NettyInputStreamBody;
 import com.ning.http.client.providers.netty.request.body.NettyMultipartBody;
 import com.ning.http.client.providers.netty.spnego.SpnegoEngine;
-import static com.ning.http.client.providers.netty.util.HttpUtils.*;
-import static com.ning.http.client.providers.netty.ws.WebSocketUtils.*;
 import com.ning.http.client.uri.UriComponents;
-import static com.ning.http.util.AsyncHttpProviderUtils.*;
-import static com.ning.http.util.AuthenticatorUtils.*;
-import static com.ning.http.util.MiscUtils.*;
 import com.ning.http.util.UTF8UrlEncoder;
 
 import java.io.IOException;
@@ -313,11 +320,8 @@ public NettyRequest newNettyRequest(Request request, UriComponents uri, boolean
             httpRequest.headers().set(HttpHeaders.Names.ACCEPT, "*/*");
 
         // Add default user agent
-        if (!httpRequest.headers().contains(HttpHeaders.Names.USER_AGENT)) {
-            String userAgent = config.getUserAgent() != null ? config.getUserAgent() : constructUserAgent(NettyAsyncHttpProvider.class,
-                    config);
-            httpRequest.headers().set(HttpHeaders.Names.USER_AGENT, userAgent);
-        }
+        if (!httpRequest.headers().contains(HttpHeaders.Names.USER_AGENT) && config.getUserAgent() != null)
+            httpRequest.headers().set(HttpHeaders.Names.USER_AGENT, config.getUserAgent());
 
         return nettyRequest;
     }

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

@@ -15,7 +15,6 @@
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 
 import com.ning.http.client.AsyncHttpClientConfig;
-import com.ning.http.client.AsyncHttpProvider;
 import com.ning.http.client.HttpResponseBodyPart;
 import com.ning.http.client.HttpResponseBodyPartsInputStream;
 import com.ning.http.client.Param;
@@ -131,14 +130,6 @@ private static byte[] doubleUp(byte[] b) {
         return b2;
     }
 
-    public static String constructUserAgent(Class<? extends AsyncHttpProvider> httpProvider, AsyncHttpClientConfig config) {
-        return new StringBuilder("AHC (").append(httpProvider.getSimpleName())//
-                .append(" - ").append(System.getProperty("os.name"))//
-                .append(" - ").append(System.getProperty("os.version"))//
-                .append(" - ").append(System.getProperty("java.version"))//
-                .append(" - ").append(Runtime.getRuntime().availableProcessors()).append(" core(s))").toString();
-    }
-
     public static String parseCharset(String contentType) {
         for (String part : contentType.split(";")) {
             if (part.trim().startsWith("charset=")) {