Skip to content

Commit 4019f63

Browse files
otaviojavaotaviojava
authored
Merge pull request #113 from brenopessoa/issue_112
fix the build of dynamo driver.
2 parents dda4b53 + 039bb4a commit 4019f63

File tree

8 files changed

+28
-63
lines changed

8 files changed

+28
-63
lines changed

‎diana-driver-commons/src/main/java/org/jnosql/diana/driver/ConfigurationAmazonEntity.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2017 Otávio Santana and others
3+
* All rights reserved. This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License v1.0
5+
* and Apache License v2.0 which accompanies this distribution.
6+
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7+
* and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
8+
*
9+
* You may elect to redistribute this code under either of these licenses.
10+
*
11+
* Contributors:
12+
*
13+
* Otavio Santana
14+
*/
15+
package org.jnosql.diana.driver;
16+
17+
public class ConfigurationAmazonEntity {
18+
19+
public static final String KEY = "key";
20+
public static final String VALUE = "value";
21+
22+
}

‎dynamodb-driver/pom.xml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,8 @@
7373
</dependency>
7474
<dependency>
7575
<groupId>software.amazon.awssdk</groupId>
76-
<artifactId>dynamodb</artifactId>
77-
<version>2.0.0-preview-12</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>software.amazon.awssdk</groupId>
81-
<artifactId>apache-client</artifactId>
82-
<version>2.0.0-preview-12</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>software.amazon.awssdk</groupId>
86-
<artifactId>aws-http-client-apache</artifactId>
87-
<version>2.0.0-preview-1</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>software.amazon.awssdk</groupId>
91-
<artifactId>aws-http-nio-client-netty</artifactId>
92-
<version>2.0.0-preview-1</version>
76+
<artifactId>dynamodb</artifactId>
77+
<version>2.4.3</version>
9378
</dependency>
9479
<dependency>
9580
<groupId>org.testcontainers</groupId>

‎dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBBuilder.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,5 @@ public interface DynamoDBBuilder {
2121
void profile(String profile);
2222
void awsAccessKey(String awsAccessKey);
2323
void awsSecretAccess(String awsSecretAccess);
24-
void maxConnections(int maxConnections);
25-
void timeout(int timeout);
26-
27-
2824

2925
}

‎dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBBuilderASync.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
package org.jnosql.diana.dynamodb;
1616

1717
import java.net.URI;
18-
import java.time.Duration;
1918

2019
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2120
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
2221
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
2322
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
24-
import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
25-
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
2623
import software.amazon.awssdk.regions.Region;
2724
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
2825
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClientBuilder;
@@ -31,7 +28,7 @@ public class DynamoDBBuilderASync implements DynamoDBBuilder{
3128

3229

3330
private final DynamoDbAsyncClientBuilder dynamoDB = DynamoDbAsyncClient.builder();
34-
private final NettyNioAsyncHttpClient.Builder httpClient = NettyNioAsyncHttpClient.builder();
31+
3532

3633
private String awsAccessKey;
3734
private String awsSecretAccess;
@@ -57,9 +54,6 @@ public void profile(String profile) {
5754

5855
public DynamoDbAsyncClient build() {
5956

60-
SdkAsyncHttpClient asyncHttpClient = httpClient.build();
61-
dynamoDB.httpClient(asyncHttpClient);
62-
6357
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
6458
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
6559

@@ -73,15 +67,6 @@ public DynamoDbAsyncClient build() {
7367
return dynamoDB.build();
7468
}
7569

76-
@Override
77-
public void maxConnections(int maxConnections) {
78-
}
79-
80-
@Override
81-
public void timeout(int timeout) {
82-
httpClient.connectionTimeout(Duration.ofMillis(timeout));
83-
}
84-
8570
@Override
8671
public void awsAccessKey(String awsAccessKey) {
8772
this.awsAccessKey = awsAccessKey;

‎dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBBuilderSync.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
package org.jnosql.diana.dynamodb;
1616

1717
import java.net.URI;
18-
import java.time.Duration;
1918

2019
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2120
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
2221
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
2322
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
24-
import software.amazon.awssdk.http.SdkHttpClient;
25-
import software.amazon.awssdk.http.apache.ApacheSdkHttpClientFactory;
2623
import software.amazon.awssdk.regions.Region;
2724
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
2825
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
@@ -31,7 +28,6 @@ public class DynamoDBBuilderSync implements DynamoDBBuilder{
3128

3229

3330
private final DynamoDbClientBuilder dynamoDB = DynamoDbClient.builder();
34-
private final ApacheSdkHttpClientFactory.Builder apacheClientFactory = ApacheSdkHttpClientFactory.builder();
3531

3632
private String awsAccessKey;
3733
private String awsSecretAccess;
@@ -57,9 +53,6 @@ public void profile(String profile) {
5753

5854
public DynamoDbClient build() {
5955

60-
SdkHttpClient createHttpClient = apacheClientFactory.build().createHttpClient();
61-
dynamoDB.httpClient(createHttpClient);
62-
6356
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
6457
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
6558

@@ -74,17 +67,6 @@ public DynamoDbClient build() {
7467
return dynamoDB.build();
7568
}
7669

77-
@Override
78-
public void maxConnections(int maxConnections) {
79-
apacheClientFactory.maxConnections(maxConnections);
80-
81-
}
82-
83-
@Override
84-
public void timeout(int timeout) {
85-
apacheClientFactory.connectionTimeout(Duration.ofMillis(timeout));
86-
}
87-
8870
@Override
8971
public void awsAccessKey(String awsAccessKey) {
9072
this.awsAccessKey = awsAccessKey;

‎dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBBuilders.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ final class DynamoDBBuilders {
2525
private static final String ENDPOINT = "dynamodb.endpoint";
2626
private static final String REGION = "dynamodb.region";
2727
private static final String PROFILE = "dynamodb.profile";
28-
private static final String TIMEOUT = "dynamodb.timeout";
29-
private static final String MAXCONNECTIONS = "dynamodb.maxconnections";
3028
private static final String AWS_ACCESSKEY = "dynamodb.awsaccesskey";
3129
private static final String AWS_SECRETACCESS = "dynamodb.secretaccess";
3230

@@ -37,8 +35,6 @@ static void load(Settings settings , DynamoDBBuilder dynamoDB) {
3735
ofNullable(settings.get(ENDPOINT)).map(Object::toString).ifPresent(dynamoDB::endpoint);
3836
ofNullable(settings.get(REGION)).map(Object::toString).ifPresent(dynamoDB::region);
3937
ofNullable(settings.get(PROFILE)).map(Object::toString).ifPresent(dynamoDB::profile);
40-
ofNullable(settings.get(TIMEOUT)).map(Object::toString).map(Integer::valueOf).ifPresent(dynamoDB::maxConnections);
41-
ofNullable(settings.get(MAXCONNECTIONS)).map(Object::toString).map(Integer::valueOf).ifPresent(dynamoDB::maxConnections);
4238
ofNullable(settings.get(AWS_ACCESSKEY)).map(Object::toString).ifPresent(dynamoDB::awsAccessKey);
4339
ofNullable(settings.get(AWS_SECRETACCESS)).map(Object::toString).ifPresent(dynamoDB::awsSecretAccess);
4440
}

‎dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBUtils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
package org.jnosql.diana.dynamodb;
1616

17-
import static org.jnosql.diana.api.key.KeyValueEntity.KEY;
18-
import static org.jnosql.diana.api.key.KeyValueEntity.VALUE;
17+
import static org.jnosql.diana.driver.ConfigurationAmazonEntity.KEY;
18+
import static org.jnosql.diana.driver.ConfigurationAmazonEntity.VALUE;
1919

2020
import java.util.Arrays;
2121
import java.util.Collection;
@@ -31,7 +31,6 @@
3131

3232
import org.jnosql.diana.api.key.KeyValueEntity;
3333
import org.jnosql.diana.driver.JsonbSupplier;
34-
import org.jnosql.diana.driver.ValueJSON;
3534

3635
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
3736
import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<module>ravendb-driver</module>
8585
<module>redis-driver</module>
8686
<module>riak-driver</module>
87-
<!--module>dynamodb-driver</module-->
87+
<module>dynamodb-driver</module>
8888
</modules>
8989

9090
<dependencies>

0 commit comments

Comments
 (0)