Skip to content

Commit 5e8ad57

Browse files
aaronandersonaaronanderson
committed
Updated to latest AWS version
1 parent 89003c8 commit 5e8ad57

File tree

6 files changed

+62
-242
lines changed

6 files changed

+62
-242
lines changed

‎pom.xml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
53
<groupId>aws-java-sdk-v2-utils</groupId>
64
<artifactId>aws-java-sdk-v2-utils</artifactId>
@@ -11,15 +9,15 @@
119
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1210
<maven.compiler.source>1.8</maven.compiler.source>
1311
<maven.compiler.target>1.8</maven.compiler.target>
14-
<aws.version>2.1.0</aws.version>
12+
<aws.version>2.10.45</aws.version>
1513
</properties>
1614

1715
<dependencies>
1816
<!-- Java JSON-P core dependency -->
1917
<dependency>
2018
<groupId>org.apache.geronimo.specs</groupId>
2119
<artifactId>geronimo-json_1.1_spec</artifactId>
22-
<version>1.0</version>
20+
<version>1.3</version>
2321
<scope>provided</scope>
2422
</dependency>
2523

@@ -62,7 +60,7 @@
6260
<dependency>
6361
<groupId>org.apache.johnzon</groupId>
6462
<artifactId>johnzon-jaxrs</artifactId>
65-
<version>1.1.7</version>
63+
<version>1.2.2</version>
6664
<scope>test</scope>
6765
</dependency>
6866

@@ -71,30 +69,17 @@
7169
<dependency>
7270
<groupId>org.apache.cxf</groupId>
7371
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
74-
<version>3.2.2</version>
72+
<version>3.3.4</version>
7573
<scope>test</scope>
7674
</dependency>
7775

7876
<dependency>
7977
<groupId>org.apache.cxf</groupId>
8078
<artifactId>cxf-rt-rs-client</artifactId>
81-
<version>3.2.2</version>
79+
<version>3.3.4</version>
8280
<scope>test</scope>
8381
</dependency>
8482

85-
<dependency>
86-
<groupId>org.glassfish.jaxb</groupId>
87-
<artifactId>jaxb-runtime</artifactId>
88-
<version>2.3.0.1</version>
89-
<scope>test</scope>
90-
</dependency>
91-
92-
<dependency>
93-
<groupId>javax.activation</groupId>
94-
<artifactId>activation</artifactId>
95-
<version>1.1.1</version>
96-
<scope>test</scope>
97-
</dependency>
9883

9984

10085
<!-- AWS HTTP Client Test Dependencies -->
@@ -117,11 +102,21 @@
117102
<!-- Base JUnit Dependency -->
118103

119104
<dependency>
120-
<groupId>junit</groupId>
121-
<artifactId>junit</artifactId>
122-
<version>4.12</version>
105+
<groupId>org.junit.jupiter</groupId>
106+
<artifactId>junit-jupiter-engine</artifactId>
107+
<version>5.5.1</version>
123108
<scope>test</scope>
124109
</dependency>
125110

126111
</dependencies>
127-
</project>
112+
113+
<build>
114+
<plugins>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-surefire-plugin</artifactId>
118+
<version>2.22.2</version>
119+
</plugin>
120+
</plugins>
121+
</build>
122+
</project>

‎src/main/java/AWSSignerHttpClient.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
2323
import software.amazon.awssdk.core.interceptor.InterceptorContext;
2424
import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
25+
import software.amazon.awssdk.core.internal.http.CombinedResponseHandler;
2526
import software.amazon.awssdk.core.internal.http.loader.DefaultSdkHttpClientBuilder;
2627
import software.amazon.awssdk.core.retry.RetryPolicy;
2728
import software.amazon.awssdk.http.SdkHttpClient;
@@ -32,7 +33,7 @@
3233
import software.amazon.awssdk.utils.AttributeMap;
3334
import software.amazon.awssdk.utils.IoUtils;
3435

35-
public class AWSSignerHttpClient {
36+
public class AWSSignerHttpClient implements AutoCloseable {
3637

3738
private String serviceName;
3839
private Region region;
@@ -72,7 +73,7 @@ public <T> T execute(SdkHttpFullRequest httpRequest, HttpResponseHandler<T> resp
7273
execContextBuilder.executionAttributes(executionAttributes);
7374
execContextBuilder.interceptorContext(incerceptorContext).build();
7475
ExecutionContext execContext = execContextBuilder.build();
75-
return awsClient.requestExecutionBuilder().executionContext(execContext).originalRequest(sdkRequest).errorResponseHandler(errorHandler).request(httpRequest).execute(responseHandler);
76+
return awsClient.requestExecutionBuilder().executionContext(execContext).originalRequest(sdkRequest).request(httpRequest).execute(new CombinedResponseHandler<T>(responseHandler, errorHandler));
7677
}
7778

7879
public static class Builder {
@@ -94,8 +95,7 @@ public AWSSignerHttpClient build() {
9495
// signer.setRegionName(client.region.value());
9596
// signer.setServiceName(client.serviceName);
9697
// client.signingProvider = StaticSignerProvider.create(signer);
97-
SdkClientConfiguration clientConfiguration = SdkClientConfiguration.builder().option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, new LinkedHashMap<>()).option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, true).option(SdkClientOption.SYNC_HTTP_CLIENT, client.sdkClient)
98-
.option(SdkClientOption.RETRY_POLICY, RetryPolicy.none()).build();
98+
SdkClientConfiguration clientConfiguration = SdkClientConfiguration.builder().option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, new LinkedHashMap<>()).option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, true).option(SdkClientOption.SYNC_HTTP_CLIENT, client.sdkClient).option(SdkClientOption.RETRY_POLICY, RetryPolicy.none()).build();
9999
client.awsClient = new AmazonSyncHttpClient(clientConfiguration);
100100
return client;
101101
}
@@ -170,4 +170,10 @@ public T handle(SdkHttpFullResponse response, ExecutionAttributes executionAttri
170170
}
171171

172172
}
173+
174+
@Override
175+
public void close() {
176+
awsClient.close();
177+
178+
}
173179
}

‎src/main/java/S3Presigner.java

Lines changed: 0 additions & 183 deletions
This file was deleted.

‎src/test/java/DynamoDBTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import static org.junit.Assert.assertEquals;
2-
import static org.junit.Assert.assertNotNull;
1+
import static org.junit.jupiter.api.Assertions.assertEquals;
2+
import static org.junit.jupiter.api.Assertions.assertNotNull;
33

44
import java.math.BigInteger;
55
import java.util.HashMap;
@@ -13,7 +13,7 @@
1313
import javax.json.JsonObject;
1414
import javax.json.JsonObjectBuilder;
1515

16-
import org.junit.Test;
16+
import org.junit.jupiter.api.Test;
1717

1818
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
1919

‎src/test/java/ElasticSearchTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import static org.junit.Assert.assertNotNull;
1+
import static org.junit.jupiter.api.Assertions.assertNotNull;
22

33
import javax.json.JsonObject;
44

5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain;
88
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
@@ -12,9 +12,10 @@
1212

1313
public class ElasticSearchTest {
1414

15-
public static final String ELASTIC_SEARCH_HOST = "XXXXXXXXX.es.amazonaws.com";
15+
public static final String ELASTIC_SEARCH_HOST = "XXXXXXXXXXXXXX.us-west-1.es.amazonaws.com";
1616

17-
@Test
17+
18+
//@Test
1819
public void searchTest() throws Exception {
1920
AWSSignerHttpClient client = AWSSignerHttpClient.builder().serviceName("es").awsCredentials(AwsCredentialsProviderChain.of(InstanceProfileCredentialsProvider.builder().build(), DefaultCredentialsProvider.create())).build();
2021
SdkHttpFullRequest httpRequest = SdkHttpFullRequest.builder().method(SdkHttpMethod.GET).protocol("https").host(ELASTIC_SEARCH_HOST).build();

0 commit comments

Comments
 (0)