Skip to content

Commit e025fb3

Browse files
committed
PR comments - keep transformerCount in FileAsyncResponseTransformerPublisher
1 parent 289554e commit e025fb3

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,7 @@ public String toString() {
303303
@Override
304304
public SplitResult<ResponseT, ResponseT> split(SplittingTransformerConfiguration splitConfig) {
305305
if (configuration.fileWriteOption() == CREATE_OR_APPEND_TO_EXISTING) {
306-
return AsyncResponseTransformer.super
307-
.split(splitConfig)
308-
.copy(res -> res.supportsNonSerial(false));
306+
return AsyncResponseTransformer.super.split(splitConfig);
309307
}
310308
CompletableFuture<ResponseT> future = new CompletableFuture<>();
311309
return (SplitResult<ResponseT, ResponseT>) SplitResult.<ResponseT, ResponseT>builder()

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public void init(WireMockRuntimeInfo wiremock) throws Exception {
6868
utils = new MultipartDownloadTestUtils(testBucket, testKey, "test-etag");
6969
fileSystem = Jimfs.newFileSystem(Configuration.unix());
7070
testFile = fileSystem.getPath("/test-file.txt");
71+
Files.createDirectories(testFile.getParent());
72+
Files.createFile(testFile);
7173
}
7274

7375
@AfterEach

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,9 @@ public <T> void errorOnThirdPart_shouldCompleteExceptionallyOnlyPartsGreaterThan
147147
}
148148
}
149149

150-
@ParameterizedTest
151-
@MethodSource("partSizeAndTransformerParams")
150+
// todo temporary, remove when support for resume is added to multipart file download
151+
// @ParameterizedTest
152+
// @MethodSource("partSizeAndTransformerParams")
152153
public <T> void partCountValidationFailure_shouldThrowException(
153154
AsyncResponseTransformerTestSupplier<T> supplier,
154155
int partSize) {
@@ -302,8 +303,7 @@ private static Stream<Arguments> partSizeAndTransformerParams() {
302303
*/
303304
private static Stream<AsyncResponseTransformerTestSupplier<?>> nonRetryableResponseTransformers() {
304305
return Stream.of(new AsyncResponseTransformerTestSupplier.InputStreamArtSupplier(),
305-
new AsyncResponseTransformerTestSupplier.PublisherArtSupplier(),
306-
new AsyncResponseTransformerTestSupplier.FileArtSupplier());
306+
new AsyncResponseTransformerTestSupplier.PublisherArtSupplier());
307307
}
308308

309309
private CompletableFuture<?> mock200Response(S3AsyncClient s3Client, int runNumber,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ public void init(WireMockRuntimeInfo wiremock) throws Exception {
7777
util = new MultipartDownloadTestUtils(testBucket, testKey, "test-etag");
7878
fileSystem = Jimfs.newFileSystem(Configuration.unix());
7979
testFile = fileSystem.getPath("/test-file.txt");
80+
Files.createDirectories(testFile.getParent());
81+
Files.createFile(testFile);
8082
}
8183

8284
@AfterEach

0 commit comments

Comments
 (0)