Update proxy configuration properties settings for Netty and CRT httpclients

Author: erin889

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ProxyConfiguration.java

@@ -196,7 +196,7 @@ public interface Builder extends CopyableBuilder<Builder, ProxyConfiguration> {
          * options are not provided during building the {@link ProxyConfiguration} object. To disable this behaviour, set this
          * value to false.
          *
-         * @param useSystemPropertyValues The option whether to use system proerpty values
+         * @param useSystemPropertyValues The option whether to use system property values
          * @return This object for method chaining.
          */
         Builder useSystemPropertyValues(Boolean useSystemPropertyValues);

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyConfigurationTest.java

@@ -20,6 +20,8 @@
 import java.lang.reflect.Method;
 import java.util.Random;
 import java.util.stream.Stream;
+import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -32,14 +34,36 @@ public class ProxyConfigurationTest {
     private static final String TEST_USER = "testuser";
     private static final String TEST_PASSWORD = "123";
 
+    @Before
+    public void setup() {
+        clearProxyProperties();
+    }
+
+    @AfterClass
+    public static void cleanup() {
+        clearProxyProperties();
+    }
+
     @Test
     public void build_setsAllProperties() {
         verifyAllPropertiesSet(allPropertiesSetConfig());
     }
 
+    @Test
+    public void build_systemPropertyDefault() {
+        setProxyProperties();
+        ProxyConfiguration config = ProxyConfiguration.builder().build();
+
+        assertThat(config.host()).isEqualTo(TEST_HOST);
+        assertThat(config.port()).isEqualTo(TEST_PORT);
+        assertThat(config.username()).isEqualTo(TEST_USER);
+        assertThat(config.password()).isEqualTo(TEST_PASSWORD);
+        assertThat(config.scheme()).isNull();
+    }
+
     @Test
     public void build_systemPropertyEnabled() {
-        setSystemProperty();
+        setProxyProperties();
         ProxyConfiguration config = ProxyConfiguration.builder().useSystemPropertyValues(true).build();
 
         assertThat(config.host()).isEqualTo(TEST_HOST);
@@ -51,7 +75,7 @@ public void build_systemPropertyEnabled() {
 
     @Test
     public void build_systemPropertyDisabled() {
-        setSystemProperty();
+        setProxyProperties();
         ProxyConfiguration config = ProxyConfiguration.builder()
                                                       .host("localhost")
                                                       .port(8888)
@@ -110,7 +134,7 @@ private void setRandomValue(Object o, Method setter) throws InvocationTargetExce
         } else if (int.class.equals(paramClass)) {
             setter.invoke(o, RNG.nextInt());
         } else if (Boolean.class.equals(paramClass)) {
-            setter.invoke(o, Boolean.FALSE);
+            setter.invoke(o, RNG.nextBoolean());
         } else {
             throw new RuntimeException("Don't know how create random value for type " + paramClass);
         }
@@ -144,10 +168,17 @@ private String randomString() {
         return sb.toString();
     }
 
-    private void setSystemProperty() {
+    private void setProxyProperties() {
         System.setProperty("http.proxyHost", TEST_HOST);
         System.setProperty("http.proxyPort", Integer.toString(TEST_PORT));
         System.setProperty("http.proxyUser", TEST_USER);
         System.setProperty("http.proxyPassword", TEST_PASSWORD);
     }
+
+    private static void clearProxyProperties() {
+        System.clearProperty("http.proxyHost");
+        System.clearProperty("http.proxyPort");
+        System.clearProperty("http.proxyUser");
+        System.clearProperty("http.proxyPassword");
+    }
 }

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java

@@ -100,7 +100,7 @@ public String password() {
      * system property os returned. If system property is also not set, an unmodifiable empty set is returned.
      */
     public Set<String> nonProxyHosts() {
-        Set<String> hosts = nonProxyHosts == null && useSystemPropertyValues ? parseNonProxyHostProperty()
+        Set<String> hosts = nonProxyHosts == null && useSystemPropertyValues ? parseNonProxyHostsProperty()
                                                                 : nonProxyHosts;
         return Collections.unmodifiableSet(hosts != null ? hosts : Collections.emptySet());
     }
@@ -219,7 +219,7 @@ public interface Builder extends CopyableBuilder<Builder, ProxyConfiguration> {
          * options are not provided during building the {@link ProxyConfiguration} object. To disable this behaviour, set this
          * value to false.
          *
-         * @param useSystemPropertyValues The option whether to use system proerpty values
+         * @param useSystemPropertyValues The option whether to use system property values
          * @return This object for method chaining.
          */
         Builder useSystemPropertyValues(Boolean useSystemPropertyValues);
@@ -243,7 +243,7 @@ private String resolveValue(String value, ProxySystemSetting systemSetting) {
                                                         : value;
     }
 
-    private Set<String> parseNonProxyHostProperty() {
+    private Set<String> parseNonProxyHostsProperty() {
         String nonProxyHosts = ProxySystemSetting.NON_PROXY_HOSTS.getStringValue().orElse(null);
 
         if (!StringUtils.isEmpty(nonProxyHosts)) {

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java

@@ -23,6 +23,8 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.stream.Stream;
+import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -35,12 +37,33 @@ public class ProxyConfigurationTest {
     private static final String TEST_USER = "testuser";
     private static final String TEST_PASSWORD = "123";
 
+    @Before
+    public void setup() {
+        clearProxyProperties();
+    }
+
+    @AfterClass
+    public static void cleanup() {
+        clearProxyProperties();
+    }
 
     @Test
     public void build_setsAllProperties() {
         verifyAllPropertiesSet(allPropertiesSetConfig());
     }
 
+    @Test
+    public void build_systemPropertyDefault() {
+        setSystemProperty();
+        ProxyConfiguration config = ProxyConfiguration.builder().build();
+
+        assertThat(config.host()).isEqualTo(TEST_HOST);
+        assertThat(config.port()).isEqualTo(TEST_PORT);
+        assertThat(config.username()).isEqualTo(TEST_USER);
+        assertThat(config.password()).isEqualTo(TEST_PASSWORD);
+        assertThat(config.scheme()).isNull();
+    }
+
     @Test
     public void build_systemPropertyEnabled() {
         setSystemProperty();
@@ -125,7 +148,7 @@ private void setRandomValue(Object o, Method setter) throws InvocationTargetExce
         } else if (Set.class.isAssignableFrom(paramClass)) {
             setter.invoke(o, randomSet());
         } else if (Boolean.class.equals(paramClass)) {
-            setter.invoke(o, Boolean.FALSE);
+            setter.invoke(o, RNG.nextBoolean());
         } else {
             throw new RuntimeException("Don't know how create random value for type " + paramClass);
         }
@@ -173,4 +196,11 @@ private void setSystemProperty() {
         System.setProperty("http.proxyUser", TEST_USER);
         System.setProperty("http.proxyPassword", TEST_PASSWORD);
     }
+
+    private static void clearProxyProperties() {
+        System.clearProperty("http.proxyHost");
+        System.clearProperty("http.proxyPort");
+        System.clearProperty("http.proxyUser");
+        System.clearProperty("http.proxyPassword");
+    }
 }