Skip to content

Commit 914f62b

Browse files
committed
rebased and added CRT in Integ test
1 parent c99a8f4 commit 914f62b

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import software.amazon.awssdk.services.s3.S3AsyncClient;
2424

25-
public class S3CrtCrossRegionIntegrationTest extends S3AsyncCrossRegionIntegrationTestBase {
26-
private static final String BUCKET = temporaryBucketName(S3CrtCrossRegionIntegrationTest.class);
25+
public class S3CrossRegionAsyncIntegrationTest extends S3CrossRegionAsyncIntegrationTestBase {
26+
private static final String BUCKET = temporaryBucketName(S3CrossRegionAsyncIntegrationTest.class);
2727

2828
@BeforeAll
2929
static void setUpClass() {
@@ -38,12 +38,12 @@ static void clearClass() {
3838

3939
@BeforeEach
4040
public void initialize() {
41-
// TODO : Update this with crtBuilder ones CRT related PR is merged
4241
crossRegionS3Client = S3AsyncClient.builder()
4342
.region(CROSS_REGION)
4443
.serviceConfiguration(s -> s.crossRegionAccessEnabled(true))
4544
.build();
4645
}
46+
4747
@Override
4848
protected String bucketName() {
4949
return BUCKET;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import software.amazon.awssdk.services.s3.model.S3Object;
3737
import software.amazon.awssdk.services.s3.paginators.ListObjectsV2Publisher;
3838

39-
public abstract class S3AsyncCrossRegionIntegrationTestBase extends S3CrossRegionIntegrationTestBase{
39+
public abstract class S3CrossRegionAsyncIntegrationTestBase extends S3CrossRegionIntegrationTestBase{
4040
protected S3AsyncClient crossRegionS3Client;
4141

4242
@Override
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import software.amazon.awssdk.services.s3.S3AsyncClient;
2424

25-
public class S3AsyncCrossRegionIntegrationTest extends S3AsyncCrossRegionIntegrationTestBase {
26-
private static final String BUCKET = temporaryBucketName(S3AsyncCrossRegionIntegrationTest.class);
25+
public class S3CrossRegionCrtIntegrationTest extends S3CrossRegionAsyncIntegrationTestBase {
26+
private static final String BUCKET = temporaryBucketName(S3CrossRegionCrtIntegrationTest.class);
2727

2828
@BeforeAll
2929
static void setUpClass() {
@@ -38,12 +38,11 @@ static void clearClass() {
3838

3939
@BeforeEach
4040
public void initialize() {
41-
crossRegionS3Client = S3AsyncClient.builder()
41+
crossRegionS3Client = S3AsyncClient.crtBuilder()
4242
.region(CROSS_REGION)
43-
.serviceConfiguration(s -> s.crossRegionAccessEnabled(true))
43+
.crossRegionAccessEnabled(true)
4444
.build();
4545
}
46-
4746
@Override
4847
protected String bucketName() {
4948
return BUCKET;

services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionIntegrationTestBase.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ void deleteApi_CrossRegionCall() {
7373
"TEST_STRING"));
7474
DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucketName()).key(KEY).build();
7575
DeleteObjectResponse response = deleteObjectAPICall(deleteObjectRequest);
76-
System.out.println(response);
7776
assertThat(response).isNotNull();
7877
}
7978

@@ -87,7 +86,6 @@ void postApi_CrossRegionCall() {
8786
DeleteObjectsRequest.builder().bucket(bucketName()).delete(d -> d.objects(o -> o.key(KEY), o -> o.key(KEY + "_1"))).build();
8887
DeleteObjectsResponse response = postObjectAPICall(deleteObjectsRequest);
8988
assertThat(response).isNotNull();
90-
System.out.println(response);
9189
}
9290

9391
@Test
@@ -124,7 +122,6 @@ void headApi_CrossRegionCall() {
124122
HeadBucketRequest headBucketRequest = HeadBucketRequest.builder().bucket(bucketName()).build();
125123
HeadBucketResponse response = headAPICall(headBucketRequest);
126124
assertThat(response).isNotNull();
127-
System.out.println(response);
128125
}
129126

130127
protected abstract List<S3Object> paginatedAPICall(ListObjectsV2Request listObjectsV2Request);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
4242
import software.amazon.awssdk.services.s3.model.S3Object;
4343

44-
public class S3SyncCrossRegionIntegrationTest extends S3CrossRegionIntegrationTestBase {
45-
private static final String BUCKET = temporaryBucketName(S3SyncCrossRegionIntegrationTest.class);
44+
public class S3CrossRegionSyncIntegrationTest extends S3CrossRegionIntegrationTestBase {
45+
private static final String BUCKET = temporaryBucketName(S3CrossRegionSyncIntegrationTest.class);
4646
private S3Client crossRegionS3Client;
4747

4848
@BeforeAll

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import software.amazon.awssdk.utils.AttributeMap;
5050
import software.amazon.awssdk.utils.Logger;
5151
import software.amazon.awssdk.utils.NumericUtils;
52-
import software.amazon.awssdk.utils.StringUtils;
5352
import software.amazon.awssdk.utils.http.SdkHttpUtils;
5453

5554
/**

0 commit comments

Comments
 (0)