Use provided port value for netty and crt http client if set

Author: erin889

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

@@ -207,7 +207,8 @@ private String resolveHost(String host) {
     }
 
     private int resolvePort(int port) {
-        return useSystemPropertyValues ? ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0)
+        return port == 0 && useSystemPropertyValues ?
+               ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0)
                                        : port;
     }
 
@@ -222,7 +223,7 @@ private String resolveValue(String value, ProxySystemSetting systemSetting) {
     private static final class BuilderImpl implements Builder {
         private String scheme;
         private String host;
-        private int port;
+        private int port = 0;
         private String username;
         private String password;
         private Boolean useSystemPropertyValues = Boolean.TRUE;

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

@@ -64,7 +64,7 @@ public void build_systemPropertyDefault() {
     @Test
     public void build_systemPropertyEnabled() {
         setProxyProperties();
-        ProxyConfiguration config = ProxyConfiguration.builder().useSystemPropertyValues(true).build();
+        ProxyConfiguration config = ProxyConfiguration.builder().useSystemPropertyValues(Boolean.TRUE).build();
 
         assertThat(config.host()).isEqualTo(TEST_HOST);
         assertThat(config.port()).isEqualTo(TEST_PORT);
@@ -81,7 +81,24 @@ public void build_systemPropertyDisabled() {
                                                       .port(8888)
                                                       .username("username")
                                                       .password("password")
-                                                      .useSystemPropertyValues(false).build();
+                                                      .useSystemPropertyValues(Boolean.FALSE).build();
+
+        assertThat(config.host()).isEqualTo("localhost");
+        assertThat(config.port()).isEqualTo(8888);
+        assertThat(config.username()).isEqualTo("username");
+        assertThat(config.password()).isEqualTo("password");
+        assertThat(config.scheme()).isNull();
+    }
+
+    @Test
+    public void build_systemPropertyOverride() {
+        setProxyProperties();
+        ProxyConfiguration config = ProxyConfiguration.builder()
+                                                      .host("localhost")
+                                                      .port(8888)
+                                                      .username("username")
+                                                      .password("password")
+                                                      .build();
 
         assertThat(config.host()).isEqualTo("localhost");
         assertThat(config.port()).isEqualTo(8888);

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

@@ -231,7 +231,8 @@ private String resolveHost(String host) {
     }
 
     private int resolvePort(int port) {
-        return useSystemPropertyValues ? ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0)
+        return port == 0 && useSystemPropertyValues ?
+               ProxySystemSetting.PROXY_PORT.getStringValue().map(Integer::parseInt).orElse(0)
                                        : port;
     }
 
@@ -258,7 +259,7 @@ private Set<String> parseNonProxyHostsProperty() {
     private static final class BuilderImpl implements Builder {
         private String scheme;
         private String host;
-        private int port;
+        private int port = 0;
         private String username;
         private String password;
         private Set<String> nonProxyHosts = Collections.emptySet();

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

@@ -54,7 +54,7 @@ public void build_setsAllProperties() {
 
     @Test
     public void build_systemPropertyDefault() {
-        setSystemProperty();
+        setProxyProperties();
         ProxyConfiguration config = ProxyConfiguration.builder().build();
 
         assertThat(config.host()).isEqualTo(TEST_HOST);
@@ -66,8 +66,8 @@ public void build_systemPropertyDefault() {
 
     @Test
     public void build_systemPropertyEnabled() {
-        setSystemProperty();
-        ProxyConfiguration config = ProxyConfiguration.builder().useSystemPropertyValues(true).build();
+        setProxyProperties();
+        ProxyConfiguration config = ProxyConfiguration.builder().useSystemPropertyValues(Boolean.TRUE).build();
 
         assertThat(config.host()).isEqualTo(TEST_HOST);
         assertThat(config.port()).isEqualTo(TEST_PORT);
@@ -78,13 +78,30 @@ public void build_systemPropertyEnabled() {
 
     @Test
     public void build_systemPropertyDisabled() {
-        setSystemProperty();
+        setProxyProperties();
         ProxyConfiguration config = ProxyConfiguration.builder()
                                                       .host("localhost")
                                                       .port(8888)
                                                       .username("username")
                                                       .password("password")
-                                                      .useSystemPropertyValues(false).build();
+                                                      .useSystemPropertyValues(Boolean.FALSE).build();
+
+        assertThat(config.host()).isEqualTo("localhost");
+        assertThat(config.port()).isEqualTo(8888);
+        assertThat(config.username()).isEqualTo("username");
+        assertThat(config.password()).isEqualTo("password");
+        assertThat(config.scheme()).isNull();
+    }
+
+    @Test
+    public void build_systemPropertyOverride() {
+        setProxyProperties();
+        ProxyConfiguration config = ProxyConfiguration.builder()
+                                                      .host("localhost")
+                                                      .port(8888)
+                                                      .username("username")
+                                                      .password("password")
+                                                      .build();
 
         assertThat(config.host()).isEqualTo("localhost");
         assertThat(config.port()).isEqualTo(8888);
@@ -190,7 +207,7 @@ private Set<String> randomSet() {
         return ss;
     }
 
-    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);