Skip to content

Commit 496694c

Browse files
dagnirjoviegas
dagnir
authored and
joviegas
committed
Fix S3 tests
1 parent 5b95ceb commit 496694c

9 files changed

Lines changed: 36 additions & 42 deletions

File tree

‎services/s3/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
</dependency>
206206
<dependency>
207207
<groupId>software.amazon.awssdk</groupId>
208-
<artifactId>apache-client</artifactId>
208+
<artifactId>apache5-client</artifactId>
209209
<version>${awsjavasdk.version}</version>
210210
<scope>test</scope>
211211
</dependency>

‎services/s3/src/it/java/software/amazon/awssdk/services/s3/ResponseInputStreamTimeoutIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import software.amazon.awssdk.core.ResponseInputStream;
3030
import software.amazon.awssdk.core.sync.RequestBody;
3131
import software.amazon.awssdk.core.sync.ResponseTransformer;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
3434
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
3535
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
@@ -48,7 +48,7 @@ public class ResponseInputStreamTimeoutIntegrationTest extends S3IntegrationTest
4848
@Before
4949
public void init() {
5050
s3Client = s3ClientBuilder()
51-
.httpClientBuilder(ApacheHttpClient.builder().maxConnections(1))
51+
.httpClientBuilder(Apache5HttpClient.builder().maxConnections(1))
5252
.overrideConfiguration(o -> o.retryStrategy(r -> r.maxAttempts(1)))
5353
.build();
5454
}

‎services/s3/src/it/java/software/amazon/awssdk/services/s3/S3PresignerIntegrationTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import software.amazon.awssdk.http.HttpExecuteRequest;
3838
import software.amazon.awssdk.http.HttpExecuteResponse;
3939
import software.amazon.awssdk.http.SdkHttpClient;
40-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
40+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
4141
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
4242
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
4343
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
@@ -192,7 +192,7 @@ public void getObject_PresignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOE
192192

193193
assertThat(presigned.isBrowserExecutable()).isFalse();
194194

195-
SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
195+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
196196

197197
ContentStreamProvider requestPayload = presigned.signedPayload()
198198
.map(SdkBytes::asContentStreamProvider)
@@ -226,7 +226,7 @@ public void deleteObject_PresignedHttpRequestCanBeInvokedDirectlyBySdk() throws
226226

227227
assertThat(presigned.isBrowserExecutable()).isFalse();
228228

229-
SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
229+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
230230

231231
ContentStreamProvider requestPayload = presigned.signedPayload()
232232
.map(SdkBytes::asContentStreamProvider)
@@ -255,7 +255,7 @@ public void putObject_PresignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOE
255255

256256
assertThat(presigned.isBrowserExecutable()).isFalse();
257257

258-
SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
258+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
259259

260260
ContentStreamProvider requestPayload = () -> new StringInputStream(testObjectContent);
261261

@@ -374,7 +374,7 @@ public void headObject_CanBePresigned() throws IOException {
374374

375375
assertThat(presigned.isBrowserExecutable()).isFalse();
376376

377-
SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
377+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
378378

379379
HttpExecuteRequest request = HttpExecuteRequest.builder()
380380
.request(presigned.httpRequest())
@@ -397,7 +397,7 @@ public void headBucket_CanBePresigned() throws IOException {
397397

398398
assertThat(presigned.isBrowserExecutable()).isFalse();
399399

400-
SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
400+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
401401

402402
HttpExecuteRequest request = HttpExecuteRequest.builder()
403403
.request(presigned.httpRequest())
@@ -442,7 +442,7 @@ private Optional<MultipartUpload> getMultipartUpload(String objectKey) {
442442
}
443443

444444
private HttpExecuteResponse execute(PresignedRequest presigned, String payload) throws IOException {
445-
SdkHttpClient httpClient = ApacheHttpClient.builder().build();
445+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
446446

447447
ContentStreamProvider requestPayload = payload == null ? null : () -> new StringInputStream(payload);
448448

‎services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionCrtIntegrationTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@
2020
import org.junit.jupiter.api.AfterAll;
2121
import org.junit.jupiter.api.BeforeAll;
2222
import org.junit.jupiter.api.BeforeEach;
23-
import org.junit.jupiter.api.Test;
24-
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
25-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
2623
import software.amazon.awssdk.regions.Region;
2724
import software.amazon.awssdk.services.s3.S3AsyncClient;
28-
import software.amazon.awssdk.services.s3.S3Client;
29-
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
30-
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
3125

3226
public class S3CrossRegionCrtIntegrationTest extends S3CrossRegionAsyncIntegrationTestBase {
3327
private static final String BUCKET = temporaryBucketName(S3CrossRegionCrtIntegrationTest.class);
@@ -49,7 +43,7 @@ public void initialize() {
4943
.region(Region.AWS_GLOBAL)
5044
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
5145
.crossRegionAccessEnabled(true)
52-
.build();
46+
.build();
5347
}
5448
@Override
5549
protected String bucketName() {

‎services/s3/src/it/java/software/amazon/awssdk/services/s3/signer/AwsS3V4SignerIntegrationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import software.amazon.awssdk.http.SdkHttpClient;
4545
import software.amazon.awssdk.http.SdkHttpFullRequest;
4646
import software.amazon.awssdk.http.SdkHttpMethod;
47-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
47+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
4848
import software.amazon.awssdk.services.s3.S3Client;
4949
import software.amazon.awssdk.services.s3.S3ClientBuilder;
5050
import software.amazon.awssdk.services.s3.S3IntegrationTestBase;
@@ -117,7 +117,7 @@ public void test_SignMethod_WithModeledParam_And_WithoutUsingSdkClient() throws
117117
// sign the request
118118
SdkHttpFullRequest signedRequest = signer.sign(httpFullRequest, constructSignerParams());
119119

120-
SdkHttpClient httpClient = ApacheHttpClient.builder().build();
120+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
121121

122122
HttpExecuteResponse response = httpClient.prepareRequest(HttpExecuteRequest.builder().request(signedRequest).build())
123123
.call();
@@ -136,7 +136,7 @@ public void test_SignMethod_WithExecutionAttributes_And_WithoutUsingSdkClient()
136136
// sign the request
137137
SdkHttpFullRequest signedRequest = signer.sign(httpFullRequest, constructExecutionAttributes());
138138

139-
SdkHttpClient httpClient = ApacheHttpClient.builder().build();
139+
SdkHttpClient httpClient = Apache5HttpClient.builder().build();
140140

141141
HttpExecuteResponse response = httpClient.prepareRequest(HttpExecuteRequest.builder().request(signedRequest).build())
142142
.call();

‎services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/Expect100ContinueHeaderTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import software.amazon.awssdk.http.ContentStreamProvider;
5151
import software.amazon.awssdk.http.SdkHttpClient;
5252
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
53-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
53+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5454
import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
5555
import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
5656
import software.amazon.awssdk.http.crt.AwsCrtHttpClient;
@@ -90,7 +90,7 @@ void setup(WireMockRuntimeInfo wmRuntimeInfo) {
9090
URI endpointOverride = URI.create(wmRuntimeInfo.getHttpsBaseUrl());
9191

9292
syncClient = S3Client.builder()
93-
.httpClient(ApacheHttpClient.builder().buildWithDefaults(trustAllCerts()))
93+
.httpClient(Apache5HttpClient.builder().buildWithDefaults(trustAllCerts()))
9494
.region(Region.US_EAST_1)
9595
.endpointOverride(endpointOverride)
9696
.requestChecksumCalculation(RequestChecksumCalculation.WHEN_REQUIRED)
@@ -359,17 +359,17 @@ private S3Client buildSyncClient(String clientType, WireMockRuntimeInfo wmInfo,
359359
SdkHttpClient httpClient;
360360
switch (clientType) {
361361
case "APACHE":
362-
httpClient = ApacheHttpClient.builder().buildWithDefaults(trustAllCerts());
362+
httpClient = Apache5HttpClient.builder().buildWithDefaults(trustAllCerts());
363363
break;
364364
case "APACHE_EC_ENABLED":
365-
httpClient = ApacheHttpClient.builder()
366-
.expectContinueEnabled(true)
367-
.buildWithDefaults(trustAllCerts());
365+
httpClient = Apache5HttpClient.builder()
366+
.expectContinueEnabled(true)
367+
.buildWithDefaults(trustAllCerts());
368368
break;
369369
case "APACHE_EC_DISABLED":
370-
httpClient = ApacheHttpClient.builder()
371-
.expectContinueEnabled(false)
372-
.buildWithDefaults(trustAllCerts());
370+
httpClient = Apache5HttpClient.builder()
371+
.expectContinueEnabled(false)
372+
.buildWithDefaults(trustAllCerts());
373373
break;
374374
case "URL_CONNECTION":
375375
httpClient = UrlConnectionHttpClient.builder().buildWithDefaults(trustAllCerts());

‎services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/S3ExpressCreateSessionTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
5454
import software.amazon.awssdk.core.rules.testing.BaseRuleSetClientTest;
5555
import software.amazon.awssdk.http.SdkHttpRequest;
56-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
56+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5757
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
5858
import software.amazon.awssdk.regions.Region;
5959
import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -298,10 +298,10 @@ private void setEndpointParametersSync(S3ClientBuilder clientBuilder, Protocol p
298298
clientBuilder.endpointOverride(WM_HTTP_ENDPOINT.apply(wm));
299299
} else {
300300
clientBuilder.endpointOverride(WM_HTTPS_ENDPOINT.apply(wm))
301-
.httpClient(ApacheHttpClient.builder()
302-
.buildWithDefaults(AttributeMap.builder()
303-
.put(TRUST_ALL_CERTIFICATES, TRUE)
304-
.build()));
301+
.httpClient(Apache5HttpClient.builder()
302+
.buildWithDefaults(AttributeMap.builder()
303+
.put(TRUST_ALL_CERTIFICATES, TRUE)
304+
.build()));
305305
}
306306
}
307307

‎services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/S3ExpressTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import software.amazon.awssdk.core.rules.testing.BaseRuleSetClientTest;
5555
import software.amazon.awssdk.core.sync.RequestBody;
5656
import software.amazon.awssdk.http.SdkHttpRequest;
57-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
57+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5858
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
5959
import software.amazon.awssdk.regions.Region;
6060
import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -356,10 +356,10 @@ private S3Client getSyncClient(Protocol protocol, WireMockRuntimeInfo wm, S3Expr
356356
s3ClientBuilder.endpointOverride(WM_HTTP_ENDPOINT.apply(wm));
357357
} else {
358358
s3ClientBuilder.endpointOverride(WM_HTTPS_ENDPOINT.apply(wm))
359-
.httpClient(ApacheHttpClient.builder()
360-
.buildWithDefaults(AttributeMap.builder()
361-
.put(TRUST_ALL_CERTIFICATES, TRUE)
362-
.build()));
359+
.httpClient(Apache5HttpClient.builder()
360+
.buildWithDefaults(AttributeMap.builder()
361+
.put(TRUST_ALL_CERTIFICATES, TRUE)
362+
.build()));
363363
}
364364
if (s3ExpressSessionAuth == S3ExpressSessionAuth.DISABLE_AUTH) {
365365
s3ClientBuilder.disableS3ExpressSessionAuth(true);

‎services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/s3express/S3ExpressCacheFunctionalTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
5353
import software.amazon.awssdk.core.sync.RequestBody;
5454
import software.amazon.awssdk.http.SdkHttpRequest;
55-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
55+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5656
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
5757
import software.amazon.awssdk.identity.spi.IdentityProvider;
5858
import software.amazon.awssdk.identity.spi.IdentityProviders;
@@ -245,8 +245,8 @@ private S3ClientBuilder getS3ClientBuilder(WireMockRuntimeInfo wm) {
245245
.addExecutionInterceptor(PATH_STYLE_INTERCEPTOR))
246246
.credentialsProvider(CLIENT_CREDENTIALS_PROVIDER)
247247
.endpointOverride(WM_HTTPS_ENDPOINT.apply(wm))
248-
.httpClient(ApacheHttpClient.builder()
249-
.buildWithDefaults(AttributeMap.builder()
248+
.httpClient(Apache5HttpClient.builder()
249+
.buildWithDefaults(AttributeMap.builder()
250250
.put(TRUST_ALL_CERTIFICATES, TRUE)
251251
.build()));
252252
}

0 commit comments

Comments
 (0)