15
15
16
16
package com .amazon .sqs .javamessaging ;
17
17
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 ;
22
21
import software .amazon .payloadoffloading .PayloadStorageConfiguration ;
22
+ import software .amazon .payloadoffloading .ServerSideEncryptionStrategy ;
23
23
24
24
25
25
/**
@@ -61,7 +61,7 @@ public ExtendedClientConfiguration(ExtendedClientConfiguration other) {
61
61
* objects its the responsibility to the message producer to handle
62
62
* the clean up appropriately.
63
63
*/
64
- public void setPayloadSupportEnabled (AmazonS3 s3 , String s3BucketName , boolean cleanupS3Payload ) {
64
+ public void setPayloadSupportEnabled (S3Client s3 , String s3BucketName , boolean cleanupS3Payload ) {
65
65
setPayloadSupportEnabled (s3 , s3BucketName );
66
66
this .cleanupS3Payload = cleanupS3Payload ;
67
67
}
@@ -82,7 +82,7 @@ public void setPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean c
82
82
* objects its the responsibility to the message producer to handle
83
83
* the clean up appropriately.
84
84
*/
85
- public ExtendedClientConfiguration withPayloadSupportEnabled (AmazonS3 s3 , String s3BucketName , boolean cleanupS3Payload ) {
85
+ public ExtendedClientConfiguration withPayloadSupportEnabled (S3Client s3 , String s3BucketName , boolean cleanupS3Payload ) {
86
86
setPayloadSupportEnabled (s3 , s3BucketName , cleanupS3Payload );
87
87
return this ;
88
88
}
@@ -167,14 +167,14 @@ public ExtendedClientConfiguration withAlwaysThroughS3(boolean alwaysThroughS3)
167
167
}
168
168
169
169
@ Override
170
- public ExtendedClientConfiguration withPayloadSupportEnabled (AmazonS3 s3 , String s3BucketName ) {
170
+ public ExtendedClientConfiguration withPayloadSupportEnabled (S3Client s3 , String s3BucketName ) {
171
171
this .setPayloadSupportEnabled (s3 , s3BucketName );
172
172
return this ;
173
173
}
174
174
175
175
@ Override
176
- public ExtendedClientConfiguration withSSEAwsKeyManagementParams ( SSEAwsKeyManagementParams sseAwsKeyManagementParams ) {
177
- this .setSSEAwsKeyManagementParams ( sseAwsKeyManagementParams );
176
+ public ExtendedClientConfiguration withObjectCannedACL ( ObjectCannedACL objectCannedACL ) {
177
+ this .setObjectCannedACL ( objectCannedACL );
178
178
return this ;
179
179
}
180
180
@@ -191,8 +191,8 @@ public ExtendedClientConfiguration withPayloadSupportDisabled() {
191
191
}
192
192
193
193
@ Override
194
- public ExtendedClientConfiguration withCannedAccessControlList ( CannedAccessControlList cannedAccessControlList ) {
195
- this .setCannedAccessControlList ( cannedAccessControlList );
194
+ public ExtendedClientConfiguration withServerSideEncryption ( ServerSideEncryptionStrategy serverSideEncryption ) {
195
+ this .setServerSideEncryptionStrategy ( serverSideEncryption );
196
196
return this ;
197
197
}
198
198
@@ -207,10 +207,10 @@ public ExtendedClientConfiguration withCannedAccessControlList(CannedAccessContr
207
207
* large-payload messages. The bucket must be already created and
208
208
* configured in s3.
209
209
*
210
- * @deprecated Instead use {@link #setPayloadSupportEnabled(AmazonS3 , String, boolean)}
210
+ * @deprecated Instead use {@link #setPayloadSupportEnabled(S3Client , String, boolean)}
211
211
*/
212
212
@ Deprecated
213
- public void setLargePayloadSupportEnabled (AmazonS3 s3 , String s3BucketName ) {
213
+ public void setLargePayloadSupportEnabled (S3Client s3 , String s3BucketName ) {
214
214
this .setPayloadSupportEnabled (s3 , s3BucketName );
215
215
}
216
216
@@ -226,10 +226,10 @@ public void setLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
226
226
* configured in s3.
227
227
* @return the updated ExtendedClientConfiguration object.
228
228
*
229
- * @deprecated Instead use {@link #withPayloadSupportEnabled(AmazonS3 , String)}
229
+ * @deprecated Instead use {@link #withPayloadSupportEnabled(S3Client , String)}
230
230
*/
231
231
@ Deprecated
232
- public ExtendedClientConfiguration withLargePayloadSupportEnabled (AmazonS3 s3 , String s3BucketName ) {
232
+ public ExtendedClientConfiguration withLargePayloadSupportEnabled (S3Client s3 , String s3BucketName ) {
233
233
setLargePayloadSupportEnabled (s3 , s3BucketName );
234
234
return this ;
235
235
}
0 commit comments