Fix compile/checkstyle warnings

smithy-lang · Jan 3, 2024 · 7f1b35b · 7f1b35b
1 parent 6ec9457
commit 7f1b35b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...va/software/amazon/smithy/rulesengine/aws/validators/AwsSpecialCaseEndpointValidator.java b/...va/software/amazon/smithy/rulesengine/aws/validators/AwsSpecialCaseEndpointValidator.java
@@ -115,7 +115,7 @@ private List<ValidationEvent> validateEndpointPatterns(
                     "InvalidEndpointPatternScheme"));
         }
 
-        if (!isValidURL(endpoint)) {
+        if (!isValidUrl(endpoint)) {
             events.add(error(
                     serviceShape, location,
                     String.format("Endpoint `%s` should be a valid URL.",
@@ -126,16 +126,14 @@ private List<ValidationEvent> validateEndpointPatterns(
         return events;
     }
 
-    private boolean isValidURL(String endpointPattern) {
+    private boolean isValidUrl(String endpointPattern) {
         String url = endpointPattern
                 .replace("{", "")
                 .replace("}", "");
         try {
             new URL(url).toURI();
             return true;
-        } catch (MalformedURLException e) {
-            return false;
-        } catch (URISyntaxException e) {
+        } catch (MalformedURLException | URISyntaxException e) {
             return false;
         }
     }

diff --git a/...st/java/software/amazon/smithy/openapi/fromsmithy/protocols/AwsRestJson1ProtocolTest.java b/...st/java/software/amazon/smithy/openapi/fromsmithy/protocols/AwsRestJson1ProtocolTest.java
@@ -215,6 +215,7 @@ private static Stream<Arguments> protocolHeaderCases() {
 
     @ParameterizedTest
     @MethodSource("protocolHeaderCases")
+    @SuppressWarnings("unchecked")
     public void assertProtocolHeaders(
             String operationId,
             Set<String> expectedRequestHeaders,