fix: convert to a blocking input stream instead of going through a by… (#96)

* fix: convert to a blocking input stream instead of going through a byte array

Author: kessplas

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

@@ -3,7 +3,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.ResponseBytes;
+import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -139,8 +139,8 @@ public <T> T getObject(GetObjectRequest getObjectRequest,
                 .build();
 
         try {
-            ResponseBytes<GetObjectResponse> joinFutureGet = pipeline.getObject(getObjectRequest, AsyncResponseTransformer.toBytes()).join();
-            return responseTransformer.transform(joinFutureGet.response(), AbortableInputStream.create(joinFutureGet.asInputStream()));
+            ResponseInputStream<GetObjectResponse> joinFutureGet = pipeline.getObject(getObjectRequest, AsyncResponseTransformer.toBlockingInputStream()).join();
+            return responseTransformer.transform(joinFutureGet.response(), AbortableInputStream.create(joinFutureGet));
         } catch (CompletionException e) {
             throw new S3EncryptionClientException(e.getCause().getMessage(), e.getCause());
         } catch (Exception e) {

src/test/java/software/amazon/encryption/s3/S3EncryptionClientStreamTest.java

@@ -155,42 +155,6 @@ public void ordinaryInputStreamV3Decrypt() throws IOException {
         v3Client.close();
     }
 
-    @Test
-    public void markResetInputStreamV3DecryptGcm() throws IOException {
-        final String objectKey = appendTestSuffix("markResetInputStreamV3DecryptGcm");
-
-        // V3 Client
-        S3Client v3Client = S3EncryptionClient.builder()
-                .aesKey(AES_KEY)
-                .build();
-
-        final int inputLength = DEFAULT_TEST_STREAM_LENGTH;
-        // Create a second stream of zeros because reset is not supported
-        // and reading into the byte string will consume the stream.
-        final InputStream inputStream = new BoundedZerosInputStream(inputLength);
-        final InputStream inputStreamForString = new BoundedZerosInputStream(inputLength);
-        final String inputStreamAsUtf8String = IoUtils.toUtf8String(inputStreamForString);
-
-        v3Client.putObject(PutObjectRequest.builder()
-                .bucket(BUCKET)
-                .key(objectKey)
-                .build(), RequestBody.fromInputStream(inputStream, inputLength));
-        inputStream.close();
-
-        final ResponseInputStream<GetObjectResponse> responseInputStream = v3Client.getObject(builder -> builder
-                .bucket(BUCKET)
-                .key(objectKey)
-                .build());
-        final String actualObject = new String(BoundedStreamBufferer.toByteArrayWithMarkReset(responseInputStream, inputLength / 8),
-                StandardCharsets.UTF_8);
-
-        assertEquals(inputStreamAsUtf8String, actualObject);
-
-        // Cleanup
-        deleteObject(BUCKET, objectKey, v3Client);
-        v3Client.close();
-    }
-
     @Test
     public void ordinaryInputStreamV3DecryptCbc() throws IOException {
         final String objectKey = appendTestSuffix("markResetInputStreamV3DecryptCbc");