Address review comments

Author: varunnvs92

core/protocols/aws-ion-protocol/pom.xml

@@ -26,11 +26,6 @@
             <artifactId>aws-json-protocol</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>protocol-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
@@ -79,6 +74,12 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java

@@ -74,7 +74,7 @@ protected BaseAwsJsonProtocolFactory(Builder<?> builder) {
      * @return HttpResponseHandler that will handle the HTTP response and unmarshall into a POJO.
      */
     public final <T extends SdkPojo> HttpResponseHandler<T> createResponseHandler(JsonOperationMetadata operationMetadata,
-                                                                            Supplier<SdkPojo> pojoSupplier) {
+                                                                                  Supplier<SdkPojo> pojoSupplier) {
         return createResponseHandler(operationMetadata, r -> pojoSupplier.get());
     }
 
@@ -88,8 +88,9 @@ public final <T extends SdkPojo> HttpResponseHandler<T> createResponseHandler(Js
      * @param <T> Type being unmarshalled.
      * @return HttpResponseHandler that will handle the HTTP response and unmarshall into a POJO.
      */
-    public final <T extends SdkPojo> HttpResponseHandler<T> createResponseHandler(JsonOperationMetadata operationMetadata,
-                                                                            Function<SdkHttpFullResponse, SdkPojo> pojoSupplier) {
+    public final <T extends SdkPojo> HttpResponseHandler<T> createResponseHandler(
+        JsonOperationMetadata operationMetadata,
+        Function<SdkHttpFullResponse, SdkPojo> pojoSupplier) {
         JsonProtocolUnmarshaller unmarshaller = createJsonProtocolUnmarshaller();
         return new AwsJsonResponseHandler<>(
             new JsonResponseHandler<>(unmarshaller,
@@ -248,4 +249,4 @@ private SubclassT getSubclass() {
         }
 
     }
-}
+}

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonProtocolErrorUnmarshaller.java

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
@@ -49,11 +50,11 @@ public final class AwsJsonProtocolErrorUnmarshaller implements HttpResponseHandl
 
     private AwsJsonProtocolErrorUnmarshaller(Builder builder) {
         this.jsonProtocolUnmarshaller = builder.jsonProtocolUnmarshaller;
-        this.exceptions = builder.exceptions;
         this.errorCodeParser = builder.errorCodeParser;
         this.errorMessageParser = builder.errorMessageParser;
         this.jsonFactory = builder.jsonFactory;
         this.defaultExceptionSupplier = builder.defaultExceptionSupplier;
+        this.exceptions = builder.exceptions;
     }
 
     @Override
@@ -64,12 +65,14 @@ public AwsServiceException handle(SdkHttpFullResponse response, ExecutionAttribu
     private AwsServiceException unmarshall(SdkHttpFullResponse response, ExecutionAttributes executionAttributes) {
         JsonContent jsonContent = JsonContent.createJsonContent(response, jsonFactory);
         String errorCode = errorCodeParser.parseErrorCode(response, jsonContent);
-        SdkPojo sdkPojo = exceptions.stream()
-                                    .filter(e -> e.errorCode().equals(errorCode))
-                                    .map(ExceptionMetadata::exceptionBuilderSupplier)
-                                    .findAny()
-                                    .orElse(defaultExceptionSupplier)
-                                    .get();
+
+        Optional<ExceptionMetadata> modeledExceptionMetadata = exceptions.stream()
+                                                                         .filter(e -> e.errorCode().equals(errorCode))
+                                                                         .findAny();
+
+        SdkPojo sdkPojo = modeledExceptionMetadata.map(ExceptionMetadata::exceptionBuilderSupplier)
+                                                  .orElse(defaultExceptionSupplier)
+                                                  .get();
 
         AwsServiceException.Builder exception = ((AwsServiceException) jsonProtocolUnmarshaller
             .unmarshall(sdkPojo, response, jsonContent.getJsonNode())).toBuilder();
@@ -78,22 +81,19 @@ private AwsServiceException unmarshall(SdkHttpFullResponse response, ExecutionAt
                                                          errorCode, errorMessage));
         // Status code and request id are sdk level fields
         exception.message(errorMessage);
-        exception.statusCode(statusCode(response, errorCode));
+        exception.statusCode(statusCode(response, modeledExceptionMetadata));
         exception.requestId(getRequestIdFromHeaders(response.headers()));
         return exception.build();
     }
 
-    private int statusCode(SdkHttpFullResponse response, String errorCode) {
+    private int statusCode(SdkHttpFullResponse response, Optional<ExceptionMetadata> modeledExceptionMetadata) {
         if (response.statusCode() != 0) {
             return response.statusCode();
         }
 
-        return exceptions.stream()
-                         .filter(e -> e.errorCode().equals(errorCode))
-                         .filter(e -> e.httpStatusCode() != null)
-                         .map(ExceptionMetadata::httpStatusCode)
-                         .findAny()
-                         .orElse(500);
+        return modeledExceptionMetadata.filter(m -> m.httpStatusCode() != null)
+                                       .map(ExceptionMetadata::httpStatusCode)
+                                       .orElse(500);
     }
 
     /**