Skip to content

Commit 129daf5

Browse files
mngo87adam-aws
andauthored
Upgrade to AWS SDK v2 (#58)
* Upgrade to AWS SDK v2 * Make use of the Payload Offloading library v2 * remove iml file * Update how we appendUserAgent Co-authored-by: Adam Bchouti <[email protected]> Co-authored-by: Adam Bchouti <[email protected]>
1 parent 83719ed commit 129daf5

File tree

7 files changed

+1566
-2735
lines changed

7 files changed

+1566
-2735
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target/
2-
.idea/
2+
.idea/
3+
*.iml

pom.xml

+15-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.amazonaws</groupId>
88
<artifactId>amazon-sqs-java-extended-client-lib</artifactId>
9-
<version>1.2.2</version>
9+
<version>2.0.0</version>
1010
<packaging>jar</packaging>
1111
<name>Amazon SQS Extended Client Library for Java</name>
1212
<description>An extension to the Amazon SQS client that enables sending and receiving messages up to 2GB via Amazon S3.
@@ -37,25 +37,32 @@
3737
</developers>
3838

3939
<properties>
40-
<aws-java-sdk.version>1.11.300</aws-java-sdk.version>
40+
<aws-java-sdk.version>2.14.19</aws-java-sdk.version>
4141
</properties>
4242

4343
<dependencies>
4444
<dependency>
45-
<groupId>com.amazonaws</groupId>
46-
<artifactId>aws-java-sdk-sqs</artifactId>
45+
<groupId>software.amazon.awssdk</groupId>
46+
<artifactId>sqs</artifactId>
4747
<version>${aws-java-sdk.version}</version>
4848
</dependency>
4949
<dependency>
50-
<groupId>com.amazonaws</groupId>
51-
<artifactId>aws-java-sdk-s3</artifactId>
50+
<groupId>software.amazon.awssdk</groupId>
51+
<artifactId>s3</artifactId>
5252
<version>${aws-java-sdk.version}</version>
5353
</dependency>
5454

5555
<dependency>
5656
<groupId>software.amazon.payloadoffloading</groupId>
5757
<artifactId>payloadoffloading-common</artifactId>
58-
<version>1.1.0</version>
58+
<version>2.1.2</version>
59+
</dependency>
60+
61+
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
62+
<dependency>
63+
<groupId>commons-logging</groupId>
64+
<artifactId>commons-logging</artifactId>
65+
<version>1.2</version>
5966
</dependency>
6067

6168
<dependency>
@@ -67,7 +74,7 @@
6774
<dependency>
6875
<groupId>org.mockito</groupId>
6976
<artifactId>mockito-core</artifactId>
70-
<version>1.10.19</version>
77+
<version>3.12.4</version>
7178
<scope>test</scope>
7279
</dependency>
7380
</dependencies>

src/main/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedClient.java

+506-786
Large diffs are not rendered by default.

src/main/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedClientBase.java

+767-1,697
Large diffs are not rendered by default.

src/main/java/com/amazon/sqs/javamessaging/ExtendedClientConfiguration.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
package com.amazon.sqs.javamessaging;
1717

18-
import com.amazonaws.services.s3.AmazonS3;
19-
import com.amazonaws.services.s3.model.CannedAccessControlList;
20-
import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
21-
import com.amazonaws.annotation.NotThreadSafe;
18+
import software.amazon.awssdk.annotations.NotThreadSafe;
19+
import software.amazon.awssdk.services.s3.S3Client;
20+
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
2221
import software.amazon.payloadoffloading.PayloadStorageConfiguration;
22+
import software.amazon.payloadoffloading.ServerSideEncryptionStrategy;
2323

2424

2525
/**
@@ -61,7 +61,7 @@ public ExtendedClientConfiguration(ExtendedClientConfiguration other) {
6161
* objects its the responsibility to the message producer to handle
6262
* the clean up appropriately.
6363
*/
64-
public void setPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean cleanupS3Payload) {
64+
public void setPayloadSupportEnabled(S3Client s3, String s3BucketName, boolean cleanupS3Payload) {
6565
setPayloadSupportEnabled(s3, s3BucketName);
6666
this.cleanupS3Payload = cleanupS3Payload;
6767
}
@@ -82,7 +82,7 @@ public void setPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean c
8282
* objects its the responsibility to the message producer to handle
8383
* the clean up appropriately.
8484
*/
85-
public ExtendedClientConfiguration withPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean cleanupS3Payload) {
85+
public ExtendedClientConfiguration withPayloadSupportEnabled(S3Client s3, String s3BucketName, boolean cleanupS3Payload) {
8686
setPayloadSupportEnabled(s3, s3BucketName, cleanupS3Payload);
8787
return this;
8888
}
@@ -167,14 +167,14 @@ public ExtendedClientConfiguration withAlwaysThroughS3(boolean alwaysThroughS3)
167167
}
168168

169169
@Override
170-
public ExtendedClientConfiguration withPayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
170+
public ExtendedClientConfiguration withPayloadSupportEnabled(S3Client s3, String s3BucketName) {
171171
this.setPayloadSupportEnabled(s3, s3BucketName);
172172
return this;
173173
}
174174

175175
@Override
176-
public ExtendedClientConfiguration withSSEAwsKeyManagementParams(SSEAwsKeyManagementParams sseAwsKeyManagementParams) {
177-
this.setSSEAwsKeyManagementParams(sseAwsKeyManagementParams);
176+
public ExtendedClientConfiguration withObjectCannedACL(ObjectCannedACL objectCannedACL) {
177+
this.setObjectCannedACL(objectCannedACL);
178178
return this;
179179
}
180180

@@ -191,8 +191,8 @@ public ExtendedClientConfiguration withPayloadSupportDisabled() {
191191
}
192192

193193
@Override
194-
public ExtendedClientConfiguration withCannedAccessControlList(CannedAccessControlList cannedAccessControlList) {
195-
this.setCannedAccessControlList(cannedAccessControlList);
194+
public ExtendedClientConfiguration withServerSideEncryption(ServerSideEncryptionStrategy serverSideEncryption) {
195+
this.setServerSideEncryptionStrategy(serverSideEncryption);
196196
return this;
197197
}
198198

@@ -207,10 +207,10 @@ public ExtendedClientConfiguration withCannedAccessControlList(CannedAccessContr
207207
* large-payload messages. The bucket must be already created and
208208
* configured in s3.
209209
*
210-
* @deprecated Instead use {@link #setPayloadSupportEnabled(AmazonS3, String, boolean)}
210+
* @deprecated Instead use {@link #setPayloadSupportEnabled(S3Client, String, boolean)}
211211
*/
212212
@Deprecated
213-
public void setLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
213+
public void setLargePayloadSupportEnabled(S3Client s3, String s3BucketName) {
214214
this.setPayloadSupportEnabled(s3, s3BucketName);
215215
}
216216

@@ -226,10 +226,10 @@ public void setLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
226226
* configured in s3.
227227
* @return the updated ExtendedClientConfiguration object.
228228
*
229-
* @deprecated Instead use {@link #withPayloadSupportEnabled(AmazonS3, String)}
229+
* @deprecated Instead use {@link #withPayloadSupportEnabled(S3Client, String)}
230230
*/
231231
@Deprecated
232-
public ExtendedClientConfiguration withLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
232+
public ExtendedClientConfiguration withLargePayloadSupportEnabled(S3Client s3, String s3BucketName) {
233233
setLargePayloadSupportEnabled(s3, s3BucketName);
234234
return this;
235235
}

0 commit comments

Comments
 (0)