sonar

Author: mkleene

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

@@ -3,10 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 
 class AddressNormalizer {
     private static final Logger logger = LoggerFactory.getLogger(AddressNormalizer.class);
@@ -22,10 +20,11 @@ static String normalizeAddress(String urlString, boolean usePlaintext) {
             throw new SDKException("error trying to parse URL [" + urlString + "]", e);
         }
 
+        final String scheme = usePlaintext ? "http" : "https";
         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);
+                uri = new URI(scheme, 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);
             }
@@ -36,7 +35,6 @@ static String normalizeAddress(String urlString, boolean usePlaintext) {
         } else {
             port = uri.getPort();
         }
-        final String scheme = usePlaintext ? "http" : "https";
 
         try {
             var returnUrl = new URI(scheme, null, uri.getHost(), port, null, null, null).toString();
@@ -46,19 +44,4 @@ static String normalizeAddress(String urlString, boolean usePlaintext) {
             throw new SDKException("error creating KAS address", e);
         }
     }
-
-    private static URI tryParseHostAndPort(String urlString) {
-        URI uri;
-        try {
-            uri = new URI(null, urlString, null, null, null).parseServerAuthority();
-        } catch (URISyntaxException e) {
-            throw new SDKException("error trying to parse host and port", e);
-        }
-
-        try {
-            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/NanoTDF.java

@@ -1,7 +1,6 @@
 package io.opentdf.platform.sdk;
 
 import com.connectrpc.ResponseMessageKt;
-import io.opentdf.platform.policy.kasregistry.KeyAccessServerRegistryServiceClient;
 import io.opentdf.platform.policy.kasregistry.ListKeyAccessServersRequest;
 import io.opentdf.platform.policy.kasregistry.ListKeyAccessServersResponse;
 import io.opentdf.platform.sdk.TDF.KasAllowlistException;

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

@@ -1,14 +1,11 @@
 package io.opentdf.platform.sdk;
 
 import com.connectrpc.ConnectException;
-import com.connectrpc.ResponseMessageKt;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.nimbusds.jose.*;
 
 import io.opentdf.platform.policy.Value;
-import io.opentdf.platform.policy.attributes.AttributesServiceClient;
-import io.opentdf.platform.policy.kasregistry.KeyAccessServerRegistryServiceClient;
 import io.opentdf.platform.policy.kasregistry.ListKeyAccessServersRequest;
 import io.opentdf.platform.policy.kasregistry.ListKeyAccessServersResponse;
 import io.opentdf.platform.sdk.Config.TDFConfig;

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

@@ -11,7 +11,6 @@
 import io.opentdf.platform.sdk.TDF.Reader;
 import io.opentdf.platform.sdk.nanotdf.ECKeyPair;
 import io.opentdf.platform.sdk.nanotdf.NanoTDFType;
-import org.apache.commons.codec.DecoderException;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -22,12 +21,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -256,7 +253,7 @@ void testSimpleTDFWithAssertionWithRS256() throws Exception {
                 keypair.getPrivate());
 
         var rsaKasInfo = new Config.KASInfo();
-        rsaKasInfo.URL = "https://example.com/kas"+Integer.toString(0);
+        rsaKasInfo.URL = "https://example.com/kas"+ 0;
 
         Config.TDFConfig config = Config.newTDFConfig(
                 Config.withAutoconfigure(false),
@@ -549,7 +546,7 @@ public void testCreateTDFWithMimeType() throws Exception {
     }
 
     @Test
-    void legacyTDFRoundTrips() throws DecoderException, IOException, JOSEException, ParseException, NoSuchAlgorithmException, URISyntaxException {
+    void legacyTDFRoundTrips() throws IOException, NoSuchAlgorithmException {
         final String mimeType = "application/pdf";
         var assertionConfig1 = new AssertionConfig();
         assertionConfig1.id = "assertion1";