Add SdkHttpResponse to SdkResponse so that customers can retrieve HTTP data such as headers and status code from the response object.

Author: zoewangg

.changes/next-release/feature-AWSSDKforJavav2-28934b0.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Add [SdkHttpResponse](https://github.com/aws/aws-sdk-java-v2/blob/master/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpResponse.java) to [SdkResponse](https://github.com/aws/aws-sdk-java-v2/blob/master/core/src/main/java/software/amazon/awssdk/core/SdkResponse.java) so that customers can retrieve Http data such as headers, status code from the response object."
+}

aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponse.java

@@ -23,22 +23,25 @@
 public abstract class AwsResponse extends SdkResponse {
 
     protected AwsResponse(Builder builder) {
+        super(builder);
     }
 
     @Override
     public abstract Builder toBuilder();
 
     protected interface Builder extends SdkResponse.Builder {
+
         @Override
         AwsResponse build();
     }
 
-    protected abstract static class BuilderImpl implements Builder {
+    protected abstract static class BuilderImpl extends SdkResponse.BuilderImpl implements Builder {
 
         protected BuilderImpl() {
         }
 
         protected BuilderImpl(AwsResponse response) {
+            super(response);
         }
     }
 }

aws-core/src/main/java/software/amazon/awssdk/awscore/http/response/StaxResponseHandler.java

@@ -24,7 +24,8 @@
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.awscore.protocol.xml.StaxUnmarshallerContext;
 import software.amazon.awssdk.awscore.protocol.xml.VoidStaxUnmarshaller;
-import software.amazon.awssdk.core.ResponseMetadata;
+import software.amazon.awssdk.core.SdkResponse;
+import software.amazon.awssdk.core.SdkResponseMetadata;
 import software.amazon.awssdk.core.SdkStandardLoggers;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.http.HttpResponse;
@@ -45,8 +46,8 @@
  * @param <T> Indicates the type being unmarshalled by this response handler.
  */
 @SdkProtectedApi
-@ReviewBeforeRelease("Metadata is currently broken. Revisit when base result types are refactored")
-public class StaxResponseHandler<T> implements HttpResponseHandler<T> {
+@ReviewBeforeRelease("ResponseMetadata is currently broken. Revisit when base result types are refactored")
+public class StaxResponseHandler<T extends SdkResponse> implements HttpResponseHandler<T> {
     private static final Logger log = Logger.loggerFor(StaxResponseHandler.class);
 
     /**
@@ -73,7 +74,7 @@ public StaxResponseHandler(Unmarshaller<T, StaxUnmarshallerContext> responseUnma
          * don't have to do this check here.
          */
         if (this.responseUnmarshaller == null) {
-            this.responseUnmarshaller = new VoidStaxUnmarshaller<T>();
+            this.responseUnmarshaller = new VoidStaxUnmarshaller<>();
         }
     }
 
@@ -92,8 +93,8 @@ public T handle(HttpResponse response, ExecutionAttributes executionAttributes)
 
         try {
             StaxUnmarshallerContext unmarshallerContext = new StaxUnmarshallerContext(eventReader, response.getHeaders());
-            unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, ResponseMetadata.AWS_REQUEST_ID);
-            unmarshallerContext.registerMetadataExpression("requestId", 2, ResponseMetadata.AWS_REQUEST_ID);
+            unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, SdkResponseMetadata.AWS_REQUEST_ID);
+            unmarshallerContext.registerMetadataExpression("requestId", 2, SdkResponseMetadata.AWS_REQUEST_ID);
             registerAdditionalMetadataExpressions(unmarshallerContext);
 
             T result = responseUnmarshaller.unmarshall(unmarshallerContext);
@@ -111,11 +112,11 @@ public T handle(HttpResponse response, ExecutionAttributes executionAttributes)
     }
 
     /**
-     * Create the default {@link ResponseMetadata}. Subclasses may override this to create a
-     * subclass of {@link ResponseMetadata}. Currently only SimpleDB does this.
+     * Create the default {@link SdkResponseMetadata}. Subclasses may override this to create a
+     * subclass of {@link SdkResponseMetadata}. Currently only SimpleDB does this.
      */
-    protected ResponseMetadata getResponseMetadata(Map<String, String> metadata) {
-        return new ResponseMetadata(metadata);
+    protected SdkResponseMetadata getResponseMetadata(Map<String, String> metadata) {
+        return new SdkResponseMetadata(metadata);
     }
 
     /**
@@ -147,7 +148,7 @@ public boolean needsConnectionLeftOpen() {
      * @param unmarshaller Unmarshaller for response POJO.
      * @param <ResponseT> Response POJO type.
      */
-    public static <ResponseT> HttpResponseHandler<ResponseT> createStreamingResponseHandler(
+    public static <ResponseT extends SdkResponse> HttpResponseHandler<ResponseT> createStreamingResponseHandler(
         Unmarshaller<ResponseT, StaxUnmarshallerContext> unmarshaller) {
         UnsafeFunction<HttpResponse, ResponseT> unmarshallFunction = response -> unmarshallStreaming(unmarshaller, response);
         return new HttpResponseHandler<ResponseT>() {
@@ -173,16 +174,16 @@ public boolean needsConnectionLeftOpen() {
      * @return Unmarshalled response type.
      * @throws Exception if error occurs during unmarshalling.
      */
-    private static <ResponseT> ResponseT unmarshallStreaming(Unmarshaller<ResponseT, StaxUnmarshallerContext> unmarshaller,
-                                                             HttpResponse response) throws Exception {
+    private static <ResponseT extends SdkResponse> ResponseT unmarshallStreaming(Unmarshaller<ResponseT,
+        StaxUnmarshallerContext> unmarshaller, HttpResponse response) throws Exception {
         // Create a dummy event reader to make unmarshallers happy
         XMLEventReader eventReader = XmlUtils.xmlInputFactory().createXMLEventReader(
             new ByteArrayInputStream("<eof/>".getBytes(StringUtils.UTF8)));
 
         StaxUnmarshallerContext unmarshallerContext = new StaxUnmarshallerContext(eventReader, response.getHeaders());
-        unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, ResponseMetadata.AWS_REQUEST_ID);
-        unmarshallerContext.registerMetadataExpression("requestId", 2, ResponseMetadata.AWS_REQUEST_ID);
+        unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, SdkResponseMetadata.AWS_REQUEST_ID);
+        unmarshallerContext.registerMetadataExpression("requestId", 2, SdkResponseMetadata.AWS_REQUEST_ID);
+
         return unmarshaller.unmarshall(unmarshallerContext);
     }
-
 }

aws-core/src/main/java/software/amazon/awssdk/awscore/protocol/json/AwsJsonProtocolFactory.java

@@ -20,6 +20,7 @@
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.protocol.OperationInfo;
@@ -56,7 +57,7 @@ public AwsJsonProtocolFactory(JsonClientMetadata metadata, AwsJsonProtocolMetada
      * @param operationMetadata Additional context information about an operation to create the appropriate response handler.
      */
     @Override
-    public <T> JsonResponseHandler<T> createResponseHandler(
+    public <T extends SdkResponse> JsonResponseHandler<T> createResponseHandler(
         JsonOperationMetadata operationMetadata,
         Unmarshaller<T, JsonUnmarshallerContext> responseUnmarshaller) {
         return getSdkFactory().createResponseHandler(operationMetadata, responseUnmarshaller);

aws-core/src/main/java/software/amazon/awssdk/awscore/protocol/json/BaseAwsStructuredJsonFactory.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import software.amazon.awssdk.awscore.http.response.AwsJsonErrorResponseHandler;
+import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.protocol.json.JsonOperationMetadata;
 import software.amazon.awssdk.core.protocol.json.StructuredJsonGenerator;
 import software.amazon.awssdk.core.runtime.http.response.JsonResponseHandler;
@@ -47,7 +48,7 @@ public StructuredJsonGenerator createWriter(String contentType) {
     }
 
     @Override
-    public <T> JsonResponseHandler<T> createResponseHandler(
+    public <T extends SdkResponse> JsonResponseHandler<T> createResponseHandler(
             JsonOperationMetadata operationMetadata,
             Unmarshaller<T, JsonUnmarshallerContext> responseUnmarshaller) {
         return new JsonResponseHandler(responseUnmarshaller, unmarshallers, jsonFactory,