Bump CRT to 0.16.16 (#3264)

Author: zoewangg

pom.xml

@@ -113,7 +113,7 @@
         <rxjava.version>2.2.21</rxjava.version>
         <commons-codec.verion>1.10</commons-codec.verion>
         <jmh.version>1.29</jmh.version>
-        <awscrt.version>0.16.15</awscrt.version>
+        <awscrt.version>0.16.16</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.8.1</junit5.version>

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtResponseHandlerAdapter.java

@@ -22,6 +22,7 @@
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.http.HttpHeader;
+import software.amazon.awssdk.crt.s3.S3FinishedResponseContext;
 import software.amazon.awssdk.crt.s3.S3MetaRequestResponseHandler;
 import software.amazon.awssdk.http.SdkCancellationException;
 import software.amazon.awssdk.http.SdkHttpResponse;
@@ -68,7 +69,10 @@ public int onResponseBody(ByteBuffer bodyBytesIn, long objectRangeStart, long ob
     }
 
     @Override
-    public void onFinished(int crtCode, int responseStatus, byte[] errorPayload) {
+    public void onFinished(S3FinishedResponseContext context) {
+        int crtCode = context.getErrorCode();
+        int responseStatus = context.getResponseStatus();
+        byte[] errorPayload = context.getErrorPayload();
         if (crtCode != CRT.AWS_CRT_SUCCESS) {
             handleError(crtCode, responseStatus, errorPayload);
         } else {

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtResponseHandlerAdapterTest.java

@@ -18,6 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -27,9 +28,11 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.crt.http.HttpHeader;
+import software.amazon.awssdk.crt.s3.S3FinishedResponseContext;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
 
@@ -42,6 +45,9 @@ public class S3CrtResponseHandlerAdapterTest {
 
     @Mock
     private S3CrtDataPublisher crtDataPublisher;
+
+    @Mock
+    private S3FinishedResponseContext context;
     private CompletableFuture<Void> future;
 
     @Before
@@ -71,7 +77,7 @@ public void successfulResponse_shouldCompleteFutureSuccessfully() {
 
         verify(sdkResponseHandler).onStream(crtDataPublisher);
 
-        responseHandlerAdapter.onFinished(0, 0, null);
+        responseHandlerAdapter.onFinished(stubResponseContext(0, 0, null));
         assertThat(future).isCompleted();
     }
 
@@ -90,7 +96,8 @@ public void errorResponse_shouldCompleteFutureSuccessfully() {
         verify(sdkResponseHandler).onStream(crtDataPublisher);
 
         byte[] errorPayload = "errorResponse".getBytes(StandardCharsets.UTF_8);
-        responseHandlerAdapter.onFinished(1, statusCode, errorPayload);
+
+        responseHandlerAdapter.onFinished(stubResponseContext(1, statusCode, errorPayload));
 
         ArgumentCaptor<ByteBuffer> byteBufferArgumentCaptor = ArgumentCaptor.forClass(ByteBuffer.class);
         verify(crtDataPublisher).deliverData(byteBufferArgumentCaptor.capture());
@@ -105,7 +112,7 @@ public void errorResponse_shouldCompleteFutureSuccessfully() {
     @Test
     public void requestFailed_shouldCompleteFutureExceptionally() {
 
-        responseHandlerAdapter.onFinished(1, 0, null);
+        responseHandlerAdapter.onFinished(stubResponseContext(1, 0, null));
 
         ArgumentCaptor<Exception> exceptionArgumentCaptor = ArgumentCaptor.forClass(Exception.class);
         verify(crtDataPublisher).notifyError(exceptionArgumentCaptor.capture());
@@ -115,4 +122,12 @@ public void requestFailed_shouldCompleteFutureExceptionally() {
         assertThat(actualException).isInstanceOf(SdkClientException.class);
         assertThat(future).isCompletedExceptionally();
     }
+
+    private S3FinishedResponseContext stubResponseContext(int errorCode, int responseStatus, byte[] errorPayload) {
+        Mockito.reset(context);
+        when(context.getErrorCode()).thenReturn(errorCode);
+        when(context.getResponseStatus()).thenReturn(responseStatus);
+        when(context.getErrorPayload()).thenReturn(errorPayload);
+        return context;
+    }
 }