Skip to content

Commit 75f7d14

Browse files
authored
Bump CRT veresion to 0.16.8, which contains fix for #3172 (#3190)
1 parent cfeef82 commit 75f7d14

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"contributor": "",
4+
"type": "feature",
5+
"description": "Bump CRT version to 0.16.8"
6+
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<rxjava.version>2.2.21</rxjava.version>
115115
<commons-codec.verion>1.10</commons-codec.verion>
116116
<jmh.version>1.29</jmh.version>
117-
<awscrt.version>0.16.7</awscrt.version>
117+
<awscrt.version>0.16.8</awscrt.version>
118118

119119
<!--Test dependencies -->
120120
<junit5.version>5.8.1</junit5.version>

services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerCopyIntegrationTest.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public class S3TransferManagerCopyIntegrationTest extends S3IntegrationTestBase
3434
private static final String BUCKET = temporaryBucketName(S3TransferManagerCopyIntegrationTest.class);
3535
private static final String ORIGINAL_OBJ = "test_file.dat";
3636
private static final String COPIED_OBJ = "test_file_copy.dat";
37+
private static final String ORIGINAL_OBJ_SPECIAL_CHARACTER = "original-special-chars-@$%";
38+
private static final String COPIED_OBJ_SPECIAL_CHARACTER= "special-special-chars-@$%";
3739
private static final long OBJ_SIZE = ThreadLocalRandom.current().nextLong(8 * MB, 16 * MB + 1);
3840

3941
private static S3TransferManager tm;
@@ -60,34 +62,42 @@ public static void teardown() throws Exception {
6062
@Test
6163
void copy_copiedObject_hasSameContent() {
6264
byte[] originalContent = randomBytes(OBJ_SIZE);
63-
createOriginalObject(originalContent);
64-
copyObject();
65-
validateCopiedObject(originalContent);
65+
createOriginalObject(originalContent, ORIGINAL_OBJ);
66+
copyObject(ORIGINAL_OBJ, COPIED_OBJ);
67+
validateCopiedObject(originalContent, ORIGINAL_OBJ);
6668
}
6769

68-
private void createOriginalObject(byte[] originalContent) {
70+
@Test
71+
void copy_specialCharacters_hasSameContent() {
72+
byte[] originalContent = randomBytes(OBJ_SIZE);
73+
createOriginalObject(originalContent, ORIGINAL_OBJ_SPECIAL_CHARACTER);
74+
copyObject(ORIGINAL_OBJ_SPECIAL_CHARACTER, COPIED_OBJ_SPECIAL_CHARACTER);
75+
validateCopiedObject(originalContent, COPIED_OBJ_SPECIAL_CHARACTER);
76+
}
77+
78+
private void createOriginalObject(byte[] originalContent, String originalKey) {
6979
s3.putObject(r -> r.bucket(BUCKET)
70-
.key(ORIGINAL_OBJ),
80+
.key(originalKey),
7181
RequestBody.fromBytes(originalContent));
7282
}
7383

74-
private void copyObject() {
84+
private void copyObject(String original, String destination) {
7585
Copy copy = tm.copy(c -> c
7686
.copyObjectRequest(r -> r
7787
.sourceBucket(BUCKET)
78-
.sourceKey(ORIGINAL_OBJ)
88+
.sourceKey(original)
7989
.destinationBucket(BUCKET)
80-
.destinationKey(COPIED_OBJ))
90+
.destinationKey(destination))
8191
.overrideConfiguration(o -> o.addListener(LoggingTransferListener.create())));
8292

8393
CompletedCopy completedCopy = copy.completionFuture().join();
8494
assertThat(completedCopy.response().responseMetadata().requestId()).isNotNull();
8595
assertThat(completedCopy.response().sdkHttpResponse()).isNotNull();
8696
}
8797

88-
private void validateCopiedObject(byte[] originalContent) {
98+
private void validateCopiedObject(byte[] originalContent, String originalKey) {
8999
ResponseBytes<GetObjectResponse> copiedObject = s3.getObject(r -> r.bucket(BUCKET)
90-
.key(COPIED_OBJ),
100+
.key(originalKey),
91101
ResponseTransformer.toBytes());
92102
assertThat(computeCheckSum(copiedObject.asByteArrayUnsafe())).isEqualTo(computeCheckSum(originalContent));
93103
}

0 commit comments

Comments
 (0)