Skip to content

Commit 9a8d918

Browse files
committed
Add S3CrtAsyncClient skeleton
1 parent e0f7c0e commit 9a8d918

File tree

57 files changed

+531
-3820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+531
-3820
lines changed

.changes/next-release/bugfix-AWSSDKforJavav2-f0e1099.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,26 +119,6 @@ static <ResponseT> AsyncResponseTransformer<ResponseT, ResponseT> toFile(Path pa
119119
return new FileAsyncResponseTransformer<>(path);
120120
}
121121

122-
/**
123-
* Creates an {@link AsyncResponseTransformer} that writes all the content to the given file.
124-
*
125-
* @param path Path to file to write to.
126-
* @param position The value for the data between the current end of the file and the starting position is
127-
* undefined.
128-
* @param isNewFile Whether this is a new file. If this is {@code true} and the file already exists, the
129-
* transformer will complete with an exception.
130-
* @param deleteOnFailure Whether the file on disk should be deleted in the event of a failure when writing the
131-
* stream.
132-
* @param <ResponseT> Pojo Response type.
133-
* @return AsyncResponseTransformer instance.
134-
*/
135-
static <ResponseT> AsyncResponseTransformer<ResponseT, ResponseT> toFile(Path path,
136-
long position,
137-
boolean isNewFile,
138-
boolean deleteOnFailure) {
139-
return new FileAsyncResponseTransformer<>(path, position, isNewFile, deleteOnFailure);
140-
}
141-
142122
/**
143123
* Creates an {@link AsyncResponseTransformer} that writes all the content to the given file. In the event of an error,
144124
* the SDK will attempt to delete the file (whatever has been written to it so far). If the file already exists, an

docs/design/services/s3/transfermanager/prototype.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,6 @@ interface Builder {
221221
*/
222222
Builder maxDownloadBytesPerSecond(Long maxDownloadBytesPerSecond);
223223

224-
/**
225-
* The multipart download configuration.
226-
*/
227-
Builder multipartDownloadConfiguration(MultipartDownloadConfiguration multipartDownloadConfiguration);
228-
229-
/**
230-
* The multipart upload configuration.
231-
*/
232-
Builder multipartUploadConfiguration(MultipartUploadConfiguration multipartUploadConfiguration);
233-
234224
/**
235225
* Add a progress listener to the currently configured list of
236226
* listeners.
@@ -455,6 +445,11 @@ public interface SinglePartDownloadContext {
455445
* The original download request given to the Transfer Manager.
456446
*/
457447
DownloadObjectRequest downloadRequest();
448+
449+
/**
450+
* The request sent to S3 for this object. This is empty if downloading a presigned URL.
451+
*/
452+
GetObjectRequest objectRequest();
458453
}
459454

460455
/**

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<rxjava.version>2.1.9</rxjava.version>
113113
<commons-codec.verion>1.10</commons-codec.verion>
114114
<jmh.version>1.21</jmh.version>
115-
<awscrt.version>0.9.3</awscrt.version>
115+
<awscrt.version>0.10.9</awscrt.version>
116116

117117
<!-- Test dependencies -->
118118
<junit.version>4.12</junit.version>
@@ -532,6 +532,7 @@
532532
<excludeModule>bundle</excludeModule>
533533
<!-- ignore crt because it's in preview TODO: remove this when CRT is GA -->
534534
<excludModeule>aws-crt-client</excludModeule>
535+
<excludModeule>s3-transfermanager</excludModeule>
535536
</excludeModules>
536537
<ignoreMissingOldVersion>true</ignoreMissingOldVersion>
537538
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>

services-custom/s3-transfermanager/pom.xml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.32-SNAPSHOT</version>
24+
<version>2.16.10-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727
<artifactId>s3-transfermanager</artifactId>
28-
<version>preview-SNAPSHOT</version>
28+
<version>${awsjavasdk.version}-PREVIEW</version>
2929
<name>AWS Java SDK :: S3 :: Transfer Manager</name>
3030
<description>
3131
The S3 Transfer Manager allows customers to easily and optimally
@@ -35,14 +35,15 @@
3535

3636
<properties>
3737
<jre.version>1.8</jre.version>
38+
<awsjavasdk.version>${project.parent.version}</awsjavasdk.version>
3839
</properties>
3940

4041
<dependencyManagement>
4142
<dependencies>
4243
<dependency>
4344
<groupId>software.amazon.awssdk</groupId>
4445
<artifactId>bom-internal</artifactId>
45-
<version>2.5.32-SNAPSHOT</version>
46+
<version>${awsjavasdk.version}</version>
4647
<type>pom</type>
4748
<scope>import</scope>
4849
</dependency>
@@ -53,44 +54,29 @@
5354
<dependency>
5455
<groupId>software.amazon.awssdk</groupId>
5556
<artifactId>s3</artifactId>
56-
<version>2.5.32-SNAPSHOT</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>software.amazon.awssdk</groupId>
60-
<artifactId>sdk-core</artifactId>
61-
<version>2.5.32-SNAPSHOT</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>software.amazon.awssdk</groupId>
65-
<artifactId>aws-core</artifactId>
66-
<version>2.5.32-SNAPSHOT</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>software.amazon.awssdk</groupId>
70-
<artifactId>regions</artifactId>
71-
<version>2.5.32-SNAPSHOT</version>
57+
<version>${awsjavasdk.version}</version>
7258
</dependency>
7359
<dependency>
7460
<groupId>software.amazon.awssdk</groupId>
7561
<artifactId>utils</artifactId>
76-
<version>2.5.32-SNAPSHOT</version>
62+
<version>${awsjavasdk.version}</version>
7763
</dependency>
7864
<dependency>
7965
<groupId>software.amazon.awssdk</groupId>
8066
<artifactId>annotations</artifactId>
81-
<version>2.5.32-SNAPSHOT</version>
67+
<version>${awsjavasdk.version}</version>
8268
</dependency>
8369

8470
<dependency>
8571
<groupId>software.amazon.awssdk</groupId>
8672
<artifactId>service-test-utils</artifactId>
87-
<version>2.5.32-SNAPSHOT</version>
73+
<version>${awsjavasdk.version}</version>
8874
<scope>test</scope>
8975
</dependency>
9076
<dependency>
9177
<groupId>software.amazon.awssdk</groupId>
9278
<artifactId>test-utils</artifactId>
93-
<version>2.5.32-SNAPSHOT</version>
79+
<version>${awsjavasdk.version}</version>
9480
<scope>test</scope>
9581
</dependency>
9682
<dependency>

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/DownloadIntegrationTest.java

Lines changed: 0 additions & 143 deletions
This file was deleted.

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3TransferManagerIntegrationTestBase.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)