refactor

Author: jshum2479

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/HttpUtil.java

@@ -124,22 +124,26 @@ public static HttpClient getOraClient(String userId, String password) {
         String proxyHost = System.getProperty("https.proxyHost");
         String proxyPort  = System.getProperty("https.proxyPort");
         HttpClient result;
-        CredentialsProvider credentialsProvider = null;
+
+        HttpClientBuilder builder = HttpClientBuilder.create()
+            .setDefaultRequestConfig(config.build())
+            .setRetryHandler(retryHandler())
+            .setUserAgent("Wget/1.10")
+            .setDefaultCookieStore(cookieStore).useSystemProperties();
 
         if (userId != null && password != null) {
-            credentialsProvider = new BasicCredentialsProvider();
+            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
             credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(
                 userId, password));
+            builder.setDefaultCredentialsProvider(credentialsProvider);
         }
 
-        result = HttpClientBuilder.create()
-            .setDefaultRequestConfig(config.build())
-            .setRetryHandler(retryHandler())
-            .setProxy(proxyHost != null ? new HttpHost(proxyHost, Integer.parseInt(proxyPort)) : null)
-            .setUserAgent("Wget/1.10")
-            .setDefaultCookieStore(cookieStore).useSystemProperties()
-            .setDefaultCredentialsProvider(credentialsProvider)
-            .build();
+        if (proxyHost != null) {
+            // credentials are set in the getHttpExecutor
+            builder.setProxy( new HttpHost(proxyHost, Integer.parseInt(proxyPort)));
+        }
+
+        result = builder.build();
 
         logger.exiting();
         return result;