Minor clean up

Author: Stephane Landelle

src/main/java/com/ning/http/client/ProxyServer.java

@@ -63,7 +63,7 @@ public ProxyServer(final Protocol protocol, final String host, final int port, S
         this.port = port;
         this.principal = principal;
         this.password = password;
-        uri = AsyncHttpProviderUtils.createUri(toString());
+        uri = AsyncHttpProviderUtils.createNonEmptyPathURI(toString());
     }
 
     public ProxyServer(final String host, final int port, String principal, String password) {

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -298,7 +298,7 @@ public File getFile() {
         }
 
         public boolean isRedirectEnabled() {
-            return (followRedirects != null && followRedirects);
+            return followRedirects != null && followRedirects;
         }
 
         public boolean isRedirectOverrideSet() {

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

@@ -465,9 +465,9 @@ public T call() {
             try {
                 URI uri = null;
                 try {
-                    uri = AsyncHttpProviderUtils.createUri(request.getRawUrl());
+                    uri = AsyncHttpProviderUtils.createNonEmptyPathURI(request.getRawUrl());
                 } catch (IllegalArgumentException u) {
-                    uri = AsyncHttpProviderUtils.createUri(request.getUrl());
+                    uri = AsyncHttpProviderUtils.createNonEmptyPathURI(request.getUrl());
                 }
 
                 int delay = requestTimeout(config, future.getRequest().getPerRequestConfig());

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

@@ -231,9 +231,9 @@ public T call() throws Exception {
                 URI uri = null;
                 // Encoding with URLConnection is a bit bogus so we need to try both way before setting it
                 try {
-                    uri = AsyncHttpProviderUtils.createUri(request.getRawUrl());
+                    uri = AsyncHttpProviderUtils.createNonEmptyPathURI(request.getRawUrl());
                 } catch (IllegalArgumentException u) {
-                    uri = AsyncHttpProviderUtils.createUri(request.getUrl());
+                    uri = AsyncHttpProviderUtils.createNonEmptyPathURI(request.getUrl());
                 }
 
                 configure(uri, urlConnection, request);

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -995,12 +995,8 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
         boolean resultOfAConnect = f != null && f.getNettyRequest() != null && f.getNettyRequest().getMethod().equals(HttpMethod.CONNECT);
         boolean useProxy = proxyServer != null && !resultOfAConnect;
 
-        URI uri;
-        if (useRawUrl) {
-            uri = request.getRawURI();
-        } else {
-            uri = request.getURI();
-        }
+        URI uri = useRawUrl ? request.getRawURI() : request.getURI();
+
         ChannelBuffer bufferedBytes = null;
         if (f != null && f.getRequest().getFile() == null && !f.getNettyRequest().getMethod().getName().equals(HttpMethod.CONNECT.getName())) {
             bufferedBytes = f.getNettyRequest().getContent();

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

@@ -57,28 +57,22 @@ public static final void validateSupportedScheme(URI uri) {
         }
     }
 
-    public final static URI createUri(String u) {
+    public final static URI createNonEmptyPathURI(String u) {
         URI uri = URI.create(u);
         validateSupportedScheme(uri);
 
         String path = uri.getPath();
         if (path == null) {
-            throw new IllegalArgumentException("The URI path, of the URI " + uri
-                    + ", must be non-null");
+            throw new IllegalArgumentException("The URI path, of the URI " + uri  + ", must be non-null");
         } else if (isNonEmpty(path) && path.charAt(0) != '/') {
-            throw new IllegalArgumentException("The URI path, of the URI " + uri
-                    + ". must start with a '/'");
+            throw new IllegalArgumentException("The URI path, of the URI " + uri  + ". must start with a '/'");
         } else if (!isNonEmpty(path)) {
             return URI.create(u + "/");
         }
 
         return uri;
     }
 
-    public static String getBaseUrl(String url) {
-        return getBaseUrl(createUri(url));
-    }
-
     public final static String getBaseUrl(URI uri) {
         String url = uri.getScheme() + "://" + uri.getAuthority();
         int port = uri.getPort();