fix spotbugs and checkstyle

Author: L-Applin

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

@@ -359,4 +359,8 @@
         <Class name="software.amazon.awssdk.v2migration.EnumCasingToV2$Visitor"/>
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
     </Match>
+    <Match>
+        <Class name="software.amazon.awssdk.utils.uri.SdkURI" />
+        <Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE" />
+    </Match>
 </FindBugsFilter>

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

@@ -26,13 +26,12 @@
 
 /**
  * Global cache for account-id based URI. Prevent calling new URI constructor for the same string, which can cause performance
- * issues with some uri pattern.
- * Do not directly depend on this class, it will be removed in the future.
+ * issues with some uri pattern. Do not directly depend on this class, it will be removed in the future.
  */
 @SdkProtectedApi
 public final class SdkURI {
-    private final String HTTPS_PREFIX = "https://";
-    private final String HTTP_PREFIX = "http://";
+    private static final String HTTPS_PREFIX = "https://";
+    private static final String HTTP_PREFIX = "http://";
 
     private static final Logger log = Logger.loggerFor(SdkURI.class);
 
@@ -71,7 +70,7 @@ public URI newURI(String s) throws URISyntaxException {
             return uri;
         } catch (IllegalArgumentException e) {
             // URI.create() wraps the URISyntaxException thrown by new URI in a IllegalArgumentException, we need to unwrap it
-            if (e.getCause() != null && e.getCause() instanceof URISyntaxException) {
+            if (e.getCause() instanceof URISyntaxException) {
                 throw (URISyntaxException) e.getCause();
             }
             throw e;
@@ -81,7 +80,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 {
+                        throws URISyntaxException {
         if (!isAccountIdUri(host)) {
             log.trace(() -> "skipping cache for host" + host);
             return new URI(scheme, userInfo, host, port, path, query, fragment);
@@ -96,7 +95,7 @@ public URI newURI(String scheme,
     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);
@@ -208,7 +207,9 @@ public boolean equals(Object o) {
             }
 
             HostConstructorArgs that = (HostConstructorArgs) o;
-            return port == that.port && Objects.equals(scheme, that.scheme) && Objects.equals(userInfo, that.userInfo) && Objects.equals(host, that.host) && Objects.equals(path, that.path) && Objects.equals(query, that.query) && Objects.equals(fragment, that.fragment);
+            return port == that.port && Objects.equals(scheme, that.scheme) && Objects.equals(userInfo, that.userInfo)
+                   && Objects.equals(host, that.host) && Objects.equals(path, that.path) && Objects.equals(query, that.query)
+                   && Objects.equals(fragment, that.fragment);
         }
 
         @Override
@@ -255,8 +256,9 @@ public boolean equals(Object o) {
             }
 
             AuthorityConstructorArgs that = (AuthorityConstructorArgs) o;
-            return Objects.equals(scheme, that.scheme) && Objects.equals(authority, that.authority) && Objects.equals(path,
-                                                                                                                      that.path) && Objects.equals(query, that.query) && Objects.equals(fragment, that.fragment);
+            return Objects.equals(scheme, that.scheme) && Objects.equals(authority, that.authority)
+                   && Objects.equals(path, that.path) && Objects.equals(query, that.query)
+                   && Objects.equals(fragment, that.fragment);
         }
 
         @Override