Fix SyncChecksumValidationInterceptor and AsyncChecksumValidationInterceptor to use long instead of int for contentLength

Author: zoewangg

.changes/next-release/bugfix-AmazonS3-98da78b.json

@@ -0,0 +1,5 @@
+{
+    "category": "Amazon S3", 
+    "type": "bugfix", 
+    "description": "Fix `SyncChecksumValidationInterceptor` and `AsyncChecksumValidationInterceptor` to use `long` instead of `int` for contentLength`. See [#963](https://github.com/aws/aws-sdk-java-v2/issues/963)"
+}

services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java

@@ -43,7 +43,7 @@ public class ChecksumValidatingInputStream extends InputStream implements Aborta
      * @param cksum the Checksum implementation
      * @param streamLength the total length of the expected stream (including the extra 4 bytes on the end).
      */
-    public ChecksumValidatingInputStream(final InputStream in, final SdkChecksum cksum, long streamLength) {
+    public ChecksumValidatingInputStream(InputStream in, SdkChecksum cksum, long streamLength) {
         inputStream = in;
         checkSum = cksum;
         this.strippedLength = streamLength - CHECKSUM_SIZE;

services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java

@@ -29,15 +29,15 @@
 import software.amazon.awssdk.utils.BinaryUtils;
 
 @SdkInternalApi
-public class ChecksumValidatingPublisher implements SdkPublisher<ByteBuffer> {
+public final class ChecksumValidatingPublisher implements SdkPublisher<ByteBuffer> {
 
     private final Publisher<ByteBuffer> publisher;
     private final SdkChecksum sdkChecksum;
-    private final int contentLength;
+    private final long contentLength;
 
     public ChecksumValidatingPublisher(Publisher<ByteBuffer> publisher,
                                        SdkChecksum sdkChecksum,
-                                       int contentLength) {
+                                       long contentLength) {
         this.publisher = publisher;
         this.sdkChecksum = sdkChecksum;
         this.contentLength = contentLength;
@@ -59,11 +59,9 @@ private static class ChecksumValidatingSubscriber implements Subscriber<ByteBuff
         private byte[] streamChecksum = new byte[CHECKSUM_SIZE];
         private long lengthRead = 0;
 
-        private Subscription subscription;
-
         ChecksumValidatingSubscriber(Subscriber<? super ByteBuffer> wrapped,
                                      SdkChecksum sdkChecksum,
-                                     int contentLength) {
+                                     long contentLength) {
             this.wrapped = wrapped;
             this.sdkChecksum = sdkChecksum;
             this.strippedLength = contentLength - CHECKSUM_SIZE;

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.services.s3.internal.handlers;
 
 import static software.amazon.awssdk.core.ClientType.ASYNC;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.CONTENT_LENGTH_HEADER;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -71,7 +72,11 @@ public Optional<Publisher<ByteBuffer>> modifyAsyncHttpResponseContent(Context.Mo
                                                                                                context.httpRequest().headers());
 
         if (context.request() instanceof GetObjectRequest && checksumValidationEnabled) {
-            int contentLength = Integer.parseInt(context.httpResponse().firstMatchingHeader("Content-Length").orElse("0"));
+            long contentLength = context.httpResponse()
+                                        .firstMatchingHeader(CONTENT_LENGTH_HEADER)
+                                        .map(Long::parseLong)
+                                        .orElse(0L);
+
             SdkChecksum checksum = new Md5Checksum();
             executionAttributes.putAttribute(CHECKSUM, checksum);
             return Optional.of(new ChecksumValidatingPublisher(context.responsePublisher().get(), checksum, contentLength));

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptor.java

@@ -81,7 +81,10 @@ public Optional<InputStream> modifyHttpResponseContent(Context.ModifyHttpRespons
         if (context.request() instanceof GetObjectRequest && checksumValidationEnabled) {
             SdkChecksum checksum = new Md5Checksum();
 
-            int contentLength = Integer.valueOf(context.httpResponse().firstMatchingHeader(CONTENT_LENGTH_HEADER).orElse("0"));
+            long contentLength = context.httpResponse()
+                                        .firstMatchingHeader(CONTENT_LENGTH_HEADER)
+                                        .map(Long::parseLong)
+                                        .orElse(0L);
 
             if (contentLength > 0) {
                 return Optional.of(new ChecksumValidatingInputStream(context.responseBody().get(), checksum, contentLength));