rename to SdkUri for checkstyle rules

L-Applin · L-Applin · commit 331dec91f0f0 · 2025-05-06T10:03:13.000-04:00
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
@@ -360,7 +360,7 @@
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
     </Match>
     <Match>
-        <Class name="software.amazon.awssdk.utils.uri.SdkURI" />
+        <Class name="software.amazon.awssdk.utils.uri.SdkUri" />
         <Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE" />
     </Match>
 </FindBugsFilter>
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/CodeGeneratorVisitor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/CodeGeneratorVisitor.java
@@ -26,7 +26,7 @@
 import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
 import software.amazon.awssdk.codegen.model.config.customization.KeyTypePair;
 import software.amazon.awssdk.endpoints.Endpoint;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 
 public class CodeGeneratorVisitor extends WalkRuleExpressionVisitor {
     private final CodeBlock.Builder builder;
@@ -279,7 +279,7 @@ private void codegenTreeBody(RuleSetExpression expr) {
     public Void visitEndpointExpression(EndpointExpression e) {
         builder.add("return $T.endpoint(", typeMirror.rulesResult().type());
         if (endpointCaching) {
-            builder.add("$T.builder().url($T.getInstance().create(", Endpoint.class, SdkURI.class);
+            builder.add("$T.builder().url($T.getInstance().create(", Endpoint.class, SdkUri.class);
         } else {
             builder.add("$T.builder().url($T.create(", Endpoint.class, URI.class);
         }
diff --git a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverter.java b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverter.java
@@ -36,7 +36,7 @@
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 
 @SdkInternalApi
 public final class CrtHttpRequestConverter {
@@ -78,7 +78,7 @@ public SdkHttpFullRequest crtRequestToHttp(SdkHttpFullRequest inputRequest, Http
             String portString = SdkHttpUtils.isUsingStandardPort(builder.protocol(), builder.port()) ? "" : ":" + builder.port();
             String encodedPath = encodedPathFromCrtFormat(inputRequest.encodedPath(), signedCrtRequest.getEncodedPath());
             String fullUriString = builder.protocol() + "://" + builder.host() + portString + encodedPath;
-            fullUri = SdkURI.getInstance().newURI(fullUriString);
+            fullUri = SdkUri.getInstance().newURI(fullUriString);
         } catch (URISyntaxException e) {
             return null;
         }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/AwsClientEndpointProvider.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/AwsClientEndpointProvider.java
@@ -38,7 +38,7 @@
 import software.amazon.awssdk.utils.Lazy;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.OptionalUtils;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.internal.SystemSettingUtils;
@@ -239,7 +239,7 @@ private Optional<ClientEndpoint> clientEndpointFromServiceMetadata(Builder build
                                                           .region(builder.region)
                                                           .tags(endpointTags)
                                                           .build());
-        URI endpoint = SdkURI.getInstance().create(builder.protocol + "://" + endpointWithoutProtocol);
+        URI endpoint = SdkUri.getInstance().create(builder.protocol + "://" + endpointWithoutProtocol);
         if (endpoint.getHost() == null) {
             String error = "Configured region (" + builder.region + ") and tags (" + endpointTags + ") resulted in "
                            + "an invalid URI: " + endpoint + ". This is usually caused by an invalid region "
@@ -261,7 +261,7 @@ private Optional<ClientEndpoint> clientEndpointFromServiceMetadata(Builder build
     private Optional<URI> createUri(String source, Optional<String> uri) {
         return uri.map(u -> {
             try {
-                URI parsedUri = SdkURI.getInstance().newURI(uri.get());
+                URI parsedUri = SdkUri.getInstance().newURI(uri.get());
                 log.trace(() -> "Client endpoint was loaded from the " + source + ": " + parsedUri);
                 return parsedUri;
             } catch (URISyntaxException e) {
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtHttpRequestConverter.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtHttpRequestConverter.java
@@ -31,7 +31,7 @@
 import software.amazon.awssdk.http.auth.aws.crt.internal.io.CrtInputStream;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 
 @SdkInternalApi
 public final class CrtHttpRequestConverter {
@@ -74,7 +74,7 @@ public static SdkHttpRequest toRequest(SdkHttpRequest request, HttpRequest crtRe
             String portString = SdkHttpUtils.isUsingStandardPort(builder.protocol(), builder.port()) ? "" : ":" + builder.port();
             String encodedPath = encodedPathFromCrtFormat(request.encodedPath(), crtRequest.getEncodedPath());
             String fullUriString = builder.protocol() + "://" + builder.host() + portString + encodedPath;
-            fullUri = SdkURI.getInstance().newURI(fullUriString);
+            fullUri = SdkUri.getInstance().newURI(fullUriString);
         } catch (URISyntaxException e) {
             throw new RuntimeException("Full URI could not be formed.", e);
         }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ServiceMetadataUtils.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ServiceMetadataUtils.java
@@ -23,7 +23,7 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceEndpointKey;
 import software.amazon.awssdk.utils.Pair;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.Validate;
 
@@ -39,7 +39,7 @@ public static URI endpointFor(String hostname,
                                   String endpointPrefix,
                                   String region,
                                   String dnsSuffix) {
-        return SdkURI.getInstance().create(StringUtils.replaceEach(hostname, SEARCH_LIST, new String[] {endpointPrefix, region, dnsSuffix }));
+        return SdkUri.getInstance().create(StringUtils.replaceEach(hostname, SEARCH_LIST, new String[] {endpointPrefix, region, dnsSuffix }));
     }
 
     public static Region signingRegion(ServiceEndpointKey key,
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java
@@ -38,7 +38,7 @@
 import software.amazon.awssdk.metrics.NoOpMetricCollector;
 import software.amazon.awssdk.metrics.SdkMetric;
 import software.amazon.awssdk.utils.Pair;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 
 /**
  * Utility methods for working with metrics.
@@ -113,7 +113,7 @@ public static void collectServiceEndpointMetrics(MetricCollector metricCollector
             // Only interested in the service endpoint so don't include any path, query, or fragment component
             URI requestUri = httpRequest.getUri();
             try {
-                URI serviceEndpoint = SdkURI.getInstance().newURI(
+                URI serviceEndpoint = SdkUri.getInstance().newURI(
                     requestUri.getScheme(), requestUri.getAuthority(), null, null, null);
                 metricCollector.reportMetric(CoreMetric.SERVICE_ENDPOINT, serviceEndpoint);
             } catch (URISyntaxException e) {
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java
@@ -26,7 +26,7 @@
 import java.util.function.BiConsumer;
 import software.amazon.awssdk.annotations.Immutable;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
@@ -155,7 +155,7 @@ default URI getUri() {
         // Do not include the port in the URI when using the default port for the protocol.
         String portString = SdkHttpUtils.isUsingStandardPort(protocol(), port()) ? "" : ":" + port();
 
-        return SdkURI.getInstance().create(protocol() + "://" + host() + portString + encodedPath() + encodedQueryString);
+        return SdkUri.getInstance().create(protocol() + "://" + host() + portString + encodedPath() + encodedQueryString);
     }
 
     /**
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
@@ -40,7 +40,7 @@
 import software.amazon.awssdk.http.apache.internal.ApacheHttpRequestConfig;
 import software.amazon.awssdk.http.apache.internal.RepeatableInputStreamRequestEntity;
 import software.amazon.awssdk.http.apache.internal.utils.ApacheUtils;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
@@ -81,7 +81,7 @@ private URI sanitizeUri(SdkHttpRequest request) {
             String portString = SdkHttpUtils.isUsingStandardPort(protocol, port) ?
                                 "" : ":" + port;
 
-            return SdkURI.getInstance().create(protocol + "://" + request.host() + portString + newPath + encodedQueryString);
+            return SdkUri.getInstance().create(protocol + "://" + request.host() + portString + newPath + encodedQueryString);
         }
 
         return request.getUri();
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientBase.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientBase.java
@@ -44,7 +44,7 @@
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 
 /**
  * Common functionality and configuration for the CRT Http clients.
@@ -163,7 +163,7 @@ HttpClientConnectionManager getOrCreateConnectionPool(URI uri) {
     }
 
     URI poolKey(SdkHttpRequest sdkRequest) {
-        return invokeSafely(() -> SdkURI.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
+        return invokeSafely(() -> SdkUri.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
                                                               sdkRequest.port(), null, null, null));
     }
 
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
@@ -59,7 +59,7 @@
 import software.amazon.awssdk.http.nio.netty.internal.utils.NettyClientLogger;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.Either;
-import software.amazon.awssdk.utils.uri.SdkURI;
+import software.amazon.awssdk.utils.uri.SdkUri;
 import software.amazon.awssdk.utils.Validate;
 
 /**
@@ -170,7 +170,7 @@ private SdkEventLoopGroup eventLoopGroup(DefaultBuilder builder) {
     }
 
     private static URI poolKey(SdkHttpRequest sdkRequest) {
-        return invokeSafely(() -> SdkURI.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
+        return invokeSafely(() -> SdkUri.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
                                                               sdkRequest.port(), null, null, null));
     }
 
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/uri/SdkUri.java b/utils/src/main/java/software/amazon/awssdk/utils/uri/SdkUri.java
@@ -29,19 +29,19 @@
  * issues with some uri pattern. Do not directly depend on this class, it will be removed in the future.
  */
 @SdkProtectedApi
-public final class SdkURI {
+public final class SdkUri {
     private static final String HTTPS_PREFIX = "https://";
     private static final String HTTP_PREFIX = "http://";
 
-    private static final Logger log = Logger.loggerFor(SdkURI.class);
+    private static final Logger log = Logger.loggerFor(SdkUri.class);
 
-    private static final SdkURI INSTANCE = new SdkURI();
+    private static final SdkUri INSTANCE = new SdkUri();
 
     private final LruCache<UriConstructorArgs, URI> cache = LruCache.builder(UriConstructorArgs::newInstance)
                                                                     .maxSize(100)
                                                                     .build();
 
-    public static SdkURI getInstance() {
+    public static SdkUri getInstance() {
         return INSTANCE;
     }
 
@@ -79,8 +79,7 @@ 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 {
+                      String path, String query, String fragment) throws URISyntaxException {
         if (!isAccountIdUri(host)) {
             log.trace(() -> "skipping cache for host" + host);
             return new URI(scheme, userInfo, host, port, path, query, fragment);
@@ -102,8 +101,7 @@ public URI newURI(String scheme,
 
     public URI newURI(String scheme,
                       String authority,
-                      String path, String query, String fragment)
-        throws URISyntaxException {
+                      String path, String query, String fragment) throws URISyntaxException {
         if (!isAccountIdUri(authority)) {
             log.trace(() -> "skipping cache for authority" + authority);
             return new URI(scheme, authority, path, query, fragment);
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/SdkUriTest.java b/utils/src/test/java/software/amazon/awssdk/utils/SdkUriTest.java

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`import software.amazon.awssdk.utils.IoUtils;`
`45`	`45`	`import software.amazon.awssdk.utils.Logger;`
`46`	`46`	`import software.amazon.awssdk.utils.SdkAutoCloseable;`
`47`		`-import software.amazon.awssdk.utils.uri.SdkURI;`
	`47`	`+import software.amazon.awssdk.utils.uri.SdkUri;`
`48`	`48`
`49`	`49`	`/**`
`50`	`50`	`* Common functionality and configuration for the CRT Http clients.`
`@@ -163,7 +163,7 @@ HttpClientConnectionManager getOrCreateConnectionPool(URI uri) {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`URI poolKey(SdkHttpRequest sdkRequest) {`
`166`		`- return invokeSafely(() -> SdkURI.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),`
	`166`	`+ return invokeSafely(() -> SdkUri.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),`
`167`	`167`	`sdkRequest.port(), null, null, null));`
`168`	`168`	`}`
`169`	`169`