made changes for URL client

Author: joviegas

http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java

@@ -503,7 +503,7 @@ public interface Builder extends SdkHttpClient.Builder<UrlConnectionHttpClient.B
 
     private static final class DefaultBuilder implements Builder {
         private final AttributeMap.Builder standardOptions = AttributeMap.builder();
-        private ProxyConfiguration proxyConfiguration;
+        private ProxyConfiguration proxyConfiguration = ProxyConfiguration.builder().build();
 
         private DefaultBuilder() {
         }

http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlClientProxyConfigurationTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.urlconnection;
+
+import java.io.IOException;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.proxy.HttpClientDefaultPoxyConfigTest;
+
+public class UrlClientProxyConfigurationTest extends HttpClientDefaultPoxyConfigTest {
+    @Override
+    protected boolean isSyncClient() {
+        return true;
+    }
+
+    @Override
+    protected SdkAsyncHttpClient createHttpClientWithDefaultProxy() {
+        throw new UnsupportedOperationException("Async client not supported");
+    }
+
+    @Override
+    protected SdkHttpClient createSyncHttpClientWithDefaultProxy() {
+        return UrlConnectionHttpClient.create();
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedExceptionType() {
+        return IOException.class;
+    }
+
+    @Override
+    protected Class<? extends Exception> getProxyFailedCauseExceptionType() {
+        return null;
+    }
+}

test/http-client-tests/src/main/java/software/amazon/awssdk/http/proxy/HttpClientDefaultPoxyConfigTest.java

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
@@ -61,6 +62,8 @@
 
 public abstract class HttpClientDefaultPoxyConfigTest {
 
+    static Random random = new Random();
+
     private static final EnvironmentVariableHelper ENVIRONMENT_VARIABLE_HELPER = new EnvironmentVariableHelper();
 
     protected WireMockServer mockProxy = new WireMockServer(new WireMockConfiguration()
@@ -206,9 +209,14 @@ public void defaultProxyConfigurationSyncHttp(SdkHttpClient client, Class<? exte
                                                                                               .request(request)
                                                                                               .build());
 
-        if (exceptionType != null && proxyFailedCauseExceptionType != null) {
-            assertThatExceptionOfType(exceptionType).isThrownBy(() -> executableHttpRequest.call())
-                                                    .withCauseInstanceOf(proxyFailedCauseExceptionType);
+        if (exceptionType != null) {
+            if (proxyFailedCauseExceptionType != null) {
+                assertThatExceptionOfType(exceptionType).isThrownBy(() -> executableHttpRequest.call())
+                                                        .withCauseInstanceOf(proxyFailedCauseExceptionType);
+            } else {
+
+                assertThatExceptionOfType(exceptionType).isThrownBy(() -> executableHttpRequest.call());
+            }
         } else {
             HttpExecuteResponse executeResponse = executableHttpRequest.call();
             assertThat(error.get()).isNull();
@@ -284,7 +292,7 @@ static SdkHttpFullRequest createRequest(URI endpoint,
     private int getRandomPort(int currentPort) {
         int randomPort;
         do {
-            randomPort = ThreadLocalRandom.current().nextInt(65535);
+            randomPort = random.nextInt(65535);
         } while (randomPort == currentPort);
         return randomPort;
     }