fix test utils after merge

Author: L-Applin

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java

@@ -147,10 +147,6 @@ public void onResponse(ResponseT response) {
         this.response = response;
     }
 
-    public FileTransformerConfiguration getConfiguration() {
-        return this.configuration;
-    }
-
     @Override
     public void onStream(SdkPublisher<ByteBuffer> publisher) {
         try {

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/NonLinearMultipartDownloaderSubscriberWiremockTest.java

@@ -39,6 +39,7 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 
@@ -49,7 +50,7 @@ class NonLinearMultipartDownloaderSubscriberWiremockTest {
     private final String testKey = "test-key";
 
     private S3AsyncClient s3AsyncClient;
-    private MultipartDownloadTestUtil util;
+    private MultipartDownloadTestUtils utils;
     private FileSystem fileSystem;
     private Path testFile;
 
@@ -64,7 +65,7 @@ public void init(WireMockRuntimeInfo wiremock) throws Exception {
                                                                           .pathStyleAccessEnabled(true)
                                                                           .build())
                                      .build();
-        util = new MultipartDownloadTestUtil(testBucket, testKey, "test-etag");
+        utils = new MultipartDownloadTestUtils(testBucket, testKey, "test-etag");
         fileSystem = Jimfs.newFileSystem(Configuration.unix());
         testFile = fileSystem.getPath("/test-file.txt");
     }
@@ -78,7 +79,7 @@ void tearDown() throws Exception {
     @ValueSource(ints = {2, 3, 4, 5, 6, 7, 8, 9, 10})
     void happyPath_multipartDownload(int numParts) throws Exception {
         int partSize = 1024;
-        byte[] expectedBody = util.stubAllParts(testBucket, testKey, numParts, partSize);
+        byte[] expectedBody = utils.stubAllParts(testBucket, testKey, numParts, partSize);
 
         AsyncResponseTransformer<GetObjectResponse, GetObjectResponse> transformer = AsyncResponseTransformer.toFile(testFile);
         AsyncResponseTransformer.SplitResult<GetObjectResponse, GetObjectResponse> split = transformer.split(
@@ -103,13 +104,13 @@ void happyPath_multipartDownload(int numParts) throws Exception {
         byte[] actualBody = Files.readAllBytes(testFile);
         assertThat(actualBody).isEqualTo(expectedBody);
         assertThat(getObjectResponse).isNotNull();
-        util.verifyCorrectAmountOfRequestsMade(numParts);
+        utils.verifyCorrectAmountOfRequestsMade(numParts);
     }
 
     @Test
     void singlePartObject_shouldCompleteWithoutMultipart() throws Exception {
         int partSize = 1024;
-        byte[] expectedBody = util.stubSinglePart(testBucket, testKey, partSize);
+        byte[] expectedBody = utils.stubSinglePart(testBucket, testKey, partSize);
 
         AsyncResponseTransformer<GetObjectResponse, GetObjectResponse> transformer = AsyncResponseTransformer.toFile(testFile);
         AsyncResponseTransformer.SplitResult<GetObjectResponse, GetObjectResponse> split = transformer.split(
@@ -134,7 +135,7 @@ void singlePartObject_shouldCompleteWithoutMultipart() throws Exception {
         byte[] actualBody = Files.readAllBytes(testFile);
         assertThat(actualBody).isEqualTo(expectedBody);
         assertThat(getObjectResponse).isNotNull();
-        util.verifyCorrectAmountOfRequestsMade(1);
+        utils.verifyCorrectAmountOfRequestsMade(1);
     }
 
 }

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartFileDownloadWiremockTest.java

@@ -23,7 +23,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static org.assertj.core.api.Assertions.assertThat;
-import static software.amazon.awssdk.services.s3.internal.multipart.MultipartDownloadTestUtil.contentRangeHeader;
+import static software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils.contentRangeHeader;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
@@ -48,6 +48,7 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.S3Exception;
 
@@ -58,7 +59,7 @@ class S3MultipartFileDownloadWiremockTest {
     private final String testKey = "test-key";
 
     private S3AsyncClient s3AsyncClient;
-    private MultipartDownloadTestUtil util;
+    private MultipartDownloadTestUtils util;
     private FileSystem fileSystem;
     private Path testFile;
 
@@ -81,7 +82,7 @@ public void init(WireMockRuntimeInfo wiremock) throws Exception {
                                                                         .build())
                                      // .httpClient(AwsCrtAsyncHttpClient.create())
                                      .build();
-        util = new MultipartDownloadTestUtil(testBucket, testKey, "test-etag");
+        util = new MultipartDownloadTestUtils(testBucket, testKey, "test-etag");
         fileSystem = Jimfs.newFileSystem(Configuration.unix());
         testFile = fileSystem.getPath("/test-file.txt");
     }

utils/src/main/java/software/amazon/awssdk/utils/ContentRangeParser.java

@@ -109,6 +109,7 @@ public static Optional<Pair<Long, Long>> range(String contentRange) {
             long endInt = Long.parseLong(end);
             return Optional.of(Pair.of(startInt, endInt));
         } catch (Exception e) {
+            log.warn(() -> "failed to parse content range", e);
             return Optional.empty();
         }
     }