code review comments

Author: mkleene

sdk/src/main/java/io/opentdf/platform/sdk/AddressNormalizer.java

@@ -15,30 +15,39 @@ private AddressNormalizer(){
     }
 
     static String normalizeAddress(String urlString, boolean usePlaintext) {
-        URL url;
+        URI uri;
         try {
-            url = new URL(urlString);
-        } catch (MalformedURLException e) {
-            url = tryParseHostAndPort(urlString);
+            uri = new URI(urlString);
+        } catch (URISyntaxException e) {
+            throw new SDKException("error trying to parse URL [" + urlString + "]", e);
+        }
+
+        if (uri.getHost() == null) {
+            // if there is no host then we are likely dealing with a host and port
+            try {
+                uri = new URI(usePlaintext ? "http" : "https", null, uri.getScheme(), Integer.parseInt(uri.getSchemeSpecificPart()), null, null, null);
+            } catch (URISyntaxException e) {
+                throw new SDKException("error trying to create URL for host and port[" + urlString + "]", e);
+            }
         }
         final int port;
-        if (url.getPort() == -1) {
-            port = "http".equals(url.getProtocol()) ? 80 : 443;
+        if (uri.getPort() == -1) {
+            port = usePlaintext ? 80 : 443;
         } else {
-            port = url.getPort();
+            port = uri.getPort();
         }
-        final String protocol = usePlaintext && "http".equals(url.getProtocol()) ? "http" : "https";
+        final String scheme = usePlaintext ? "http" : "https";
 
         try {
-            var returnUrl = new URL(protocol, url.getHost(), port, "").toString();
+            var returnUrl = new URI(scheme, null, uri.getHost(), port, null, null, null).toString();
             logger.debug("normalized url [{}] to [{}]", urlString, returnUrl);
             return returnUrl;
-        } catch (MalformedURLException e) {
+        } catch (URISyntaxException e) {
             throw new SDKException("error creating KAS address", e);
         }
     }
 
-    private static URL tryParseHostAndPort(String urlString) {
+    private static URI tryParseHostAndPort(String urlString) {
         URI uri;
         try {
             uri = new URI(null, urlString, null, null, null).parseServerAuthority();
@@ -47,8 +56,8 @@ private static URL tryParseHostAndPort(String urlString) {
         }
 
         try {
-            return new URL(uri.getPort() == 443 ? "https" : "http", uri.getHost(), uri.getPort(), "");
-        } catch (MalformedURLException e) {
+            return new URI(uri.getPort() == 443 ? "https" : "http", null, uri.getHost(), uri.getPort(), "", "", "");
+        } catch (URISyntaxException e) {
             throw new SDKException("error trying to create URL from host and port", e);
         }
     }

sdk/src/main/java/io/opentdf/platform/sdk/KASClient.java

@@ -41,7 +41,7 @@
  * This class provides methods to retrieve public keys, unwrap encrypted keys,
  * and manage key caches.
  */
-public class KASClient implements SDK.KAS {
+class KASClient implements SDK.KAS {
 
     private final OkHttpClient httpClient;
     private final BiFunction<OkHttpClient, String, ProtocolClient> protocolClientFactory;

sdk/src/test/java/io/opentdf/platform/sdk/AddressNormalizerTest.java

@@ -10,16 +10,18 @@ class AddressNormalizerTest {
 
     @Test
     void testAddressNormalizationWithHTTPSClient() {
-        assertThat(normalizeAddress("http://example.org", false)).isEqualTo("https://example.org:80");
+        assertThat(normalizeAddress("http://example.org", false)).isEqualTo("https://example.org:443");
         // default to https if no scheme is provided
         assertThat(normalizeAddress("example.org:1234", false)).isEqualTo("https://example.org:1234");
+        assertThat(normalizeAddress("ftp://example.org", false)).isEqualTo("https://example.org:443");
     }
 
     @Test
     void testAddressNormaliationWithInsecureHTTPClient() {
         assertThat(normalizeAddress("http://localhost:8080", true)).isEqualTo("http://localhost:8080");
-        assertThat(normalizeAddress("https://example.org", true)).isEqualTo("https://example.org:443");
+        assertThat(normalizeAddress("http://example.org", true)).isEqualTo("http://example.org:80");
         // default to http if no scheme is provided
         assertThat(normalizeAddress("example.org:1234", true)).isEqualTo("http://example.org:1234");
+        assertThat(normalizeAddress("sftp://example.org", true)).isEqualTo("http://example.org:80");
     }
 }