fix exception thrown for malformed URI with newURI method

Author: L-Applin

utils/src/main/java/software/amazon/awssdk/utils/uri/SdkURI.java

@@ -80,31 +80,46 @@ public URI newURI(String s) throws URISyntaxException {
     public URI newURI(String scheme,
                       String userInfo, String host, int port,
                       String path, String query, String fragment)
-                        throws URISyntaxException {
+        throws URISyntaxException {
         if (!isAccountIdUri(host)) {
             log.trace(() -> "skipping cache for host" + host);
             return new URI(scheme, userInfo, host, port, path, query, fragment);
         }
-        HostConstructorArgs key = new HostConstructorArgs(scheme, userInfo, host, port, path, query, fragment);
-        boolean containsK = cache.contains(key);
-        URI uri = cache.get(key);
-        logCacheUsage(containsK, uri);
-        return uri;
+        try {
+            HostConstructorArgs key = new HostConstructorArgs(scheme, userInfo, host, port, path, query, fragment);
+            boolean containsK = cache.contains(key);
+            URI uri = cache.get(key);
+            logCacheUsage(containsK, uri);
+            return uri;
+        } catch (IllegalArgumentException e) {
+            if (e.getCause() instanceof URISyntaxException) {
+                throw (URISyntaxException) e.getCause();
+            }
+            throw e;
+        }
+
     }
 
     public URI newURI(String scheme,
                       String authority,
                       String path, String query, String fragment)
-                        throws URISyntaxException {
+        throws URISyntaxException {
         if (!isAccountIdUri(authority)) {
             log.trace(() -> "skipping cache for authority" + authority);
             return new URI(scheme, authority, path, query, fragment);
         }
-        AuthorityConstructorArgs key = new AuthorityConstructorArgs(scheme, authority, path, query, fragment);
-        boolean containsK = cache.contains(key);
-        URI uri = cache.get(key);
-        logCacheUsage(containsK, uri);
-        return uri;
+        try {
+            AuthorityConstructorArgs key = new AuthorityConstructorArgs(scheme, authority, path, query, fragment);
+            boolean containsK = cache.contains(key);
+            URI uri = cache.get(key);
+            logCacheUsage(containsK, uri);
+            return uri;
+        } catch (IllegalArgumentException e) {
+            if (e.getCause() instanceof URISyntaxException) {
+                throw (URISyntaxException) e.getCause();
+            }
+            throw e;
+        }
     }
 
     /*

utils/src/test/java/software/amazon/awssdk/utils/SdkURITest.java

@@ -212,9 +212,8 @@ void notCached_shouldCreateNewInstance() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"potatoes tomatoes", "123412341234. potatoes tomatoes"})
-    void malformedURI_shouldThrowsSameExceptionAsUriClass(String malformedURI) {
-        String malformedUri = "potatoes tomatoes"; // not cached by SdkURI
+    @ValueSource(strings = {"potatoes tomatoes", "123412341234 potatoes tomatoes"})
+    void malformedURI_shouldThrowsSameExceptionAsUriClass(String malformedUri) {
 
         assertThatThrownBy(() -> SdkURI.getInstance().create(malformedUri))
             .as("Malformed uri should throw IllegalArgumentException using the create method")
@@ -234,6 +233,13 @@ void malformedURI_shouldThrowsSameExceptionAsUriClass(String malformedURI) {
         assertThat(getCache().size()).as("Cache should be empty if create URI fails")
                                      .isEqualTo(0);
 
+        assertThatThrownBy(() -> new URI("scheme", malformedUri, "path", "query", "fragment"))
+            .as("CONSTRUCTOR")
+            .isInstanceOf(URISyntaxException.class);
+        assertThat(getCache().size()).as("Cache should be empty if create URI fails")
+                                     .isEqualTo(0);
+
+
         assertThatThrownBy(() -> SdkURI.getInstance().newURI("scheme", "userInfo", malformedUri,
                                                              444, "path", "query", "fragment"))
             .as("Malformed uri should throw URISyntaxException using the newURI with host method")