Skip to content

Commit 06b630d

Browse files
otaviojavaotaviojava
authored
Merge pull request #114 from eclipse/fixes_dynamo_db
Fixes dynamo db
2 parents 4019f63 + 1be0ac1 commit 06b630d

11 files changed

+530
-517
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017 Otávio Santana and others
2+
* Copyright (c) 2019 Otávio Santana and others
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* and Apache License v2.0 which accompanies this distribution.
@@ -12,11 +12,13 @@
1212
*
1313
* Otavio Santana
1414
*/
15-
package org.jnosql.diana.driver;
15+
package org.jnosql.diana.dynamodb;
1616

17-
public class ConfigurationAmazonEntity {
18-
19-
public static final String KEY = "key";
20-
public static final String VALUE = "value";
17+
public final class ConfigurationAmazonEntity {
2118

19+
public static final String KEY = "key";
20+
public static final String VALUE = "value";
21+
22+
private ConfigurationAmazonEntity() {
23+
}
2224
}

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

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

1717
public interface DynamoDBBuilder {
18-
19-
void endpoint(String endpoint);
20-
void region(String region);
21-
void profile(String profile);
22-
void awsAccessKey(String awsAccessKey);
23-
void awsSecretAccess(String awsSecretAccess);
24-
18+
19+
void endpoint(String endpoint);
20+
21+
void region(String region);
22+
23+
void profile(String profile);
24+
25+
void awsAccessKey(String awsAccessKey);
26+
27+
void awsSecretAccess(String awsSecretAccess);
28+
2529
}

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

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,56 +24,56 @@
2424
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
2525
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClientBuilder;
2626

27-
public class DynamoDBBuilderASync implements DynamoDBBuilder{
28-
29-
30-
private final DynamoDbAsyncClientBuilder dynamoDB = DynamoDbAsyncClient.builder();
31-
32-
33-
private String awsAccessKey;
34-
private String awsSecretAccess;
35-
36-
@Override
37-
public void endpoint(String endpoint) {
38-
dynamoDB.endpointOverride(URI.create(endpoint));
39-
40-
}
41-
42-
@Override
43-
public void region(String region) {
44-
dynamoDB.region(Region.of(region));
45-
}
46-
47-
@Override
48-
public void profile(String profile) {
49-
dynamoDB.credentialsProvider(ProfileCredentialsProvider.builder()
27+
public class DynamoDBBuilderASync implements DynamoDBBuilder {
28+
29+
30+
private final DynamoDbAsyncClientBuilder dynamoDB = DynamoDbAsyncClient.builder();
31+
32+
33+
private String awsAccessKey;
34+
private String awsSecretAccess;
35+
36+
@Override
37+
public void endpoint(String endpoint) {
38+
dynamoDB.endpointOverride(URI.create(endpoint));
39+
40+
}
41+
42+
@Override
43+
public void region(String region) {
44+
dynamoDB.region(Region.of(region));
45+
}
46+
47+
@Override
48+
public void profile(String profile) {
49+
dynamoDB.credentialsProvider(ProfileCredentialsProvider.builder()
5050
.profileName(profile)
5151
.build());
52-
53-
}
54-
55-
public DynamoDbAsyncClient build() {
56-
57-
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
58-
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
59-
60-
if(accessKey && secretAccess){
61-
62-
AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create(awsAccessKey,awsSecretAccess);
63-
AwsCredentialsProvider staticCredentialsProvider = StaticCredentialsProvider.create(awsBasicCredentials);
64-
dynamoDB.credentialsProvider(staticCredentialsProvider);
65-
}
66-
67-
return dynamoDB.build();
68-
}
69-
70-
@Override
71-
public void awsAccessKey(String awsAccessKey) {
72-
this.awsAccessKey = awsAccessKey;
73-
}
74-
75-
@Override
76-
public void awsSecretAccess(String awsSecretAccess) {
77-
this.awsSecretAccess = awsSecretAccess;
78-
}
52+
53+
}
54+
55+
public DynamoDbAsyncClient build() {
56+
57+
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
58+
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
59+
60+
if (accessKey && secretAccess) {
61+
62+
AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create(awsAccessKey, awsSecretAccess);
63+
AwsCredentialsProvider staticCredentialsProvider = StaticCredentialsProvider.create(awsBasicCredentials);
64+
dynamoDB.credentialsProvider(staticCredentialsProvider);
65+
}
66+
67+
return dynamoDB.build();
68+
}
69+
70+
@Override
71+
public void awsAccessKey(String awsAccessKey) {
72+
this.awsAccessKey = awsAccessKey;
73+
}
74+
75+
@Override
76+
public void awsSecretAccess(String awsSecretAccess) {
77+
this.awsSecretAccess = awsSecretAccess;
78+
}
7979
}

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

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

17-
import java.net.URI;
18-
1917
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2018
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
2119
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
@@ -24,56 +22,58 @@
2422
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
2523
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
2624

27-
public class DynamoDBBuilderSync implements DynamoDBBuilder{
28-
29-
30-
private final DynamoDbClientBuilder dynamoDB = DynamoDbClient.builder();
31-
32-
private String awsAccessKey;
33-
private String awsSecretAccess;
34-
35-
36-
@Override
37-
public void endpoint(String endpoint) {
38-
dynamoDB.endpointOverride(URI.create(endpoint));
39-
}
40-
41-
@Override
42-
public void region(String region) {
43-
dynamoDB.region(Region.of(region));
44-
}
45-
46-
@Override
47-
public void profile(String profile) {
48-
dynamoDB.credentialsProvider(ProfileCredentialsProvider.builder()
25+
import java.net.URI;
26+
27+
public class DynamoDBBuilderSync implements DynamoDBBuilder {
28+
29+
30+
private final DynamoDbClientBuilder dynamoDB = DynamoDbClient.builder();
31+
32+
private String awsAccessKey;
33+
private String awsSecretAccess;
34+
35+
36+
@Override
37+
public void endpoint(String endpoint) {
38+
dynamoDB.endpointOverride(URI.create(endpoint));
39+
}
40+
41+
@Override
42+
public void region(String region) {
43+
dynamoDB.region(Region.of(region));
44+
}
45+
46+
@Override
47+
public void profile(String profile) {
48+
dynamoDB.credentialsProvider(ProfileCredentialsProvider.builder()
4949
.profileName(profile)
5050
.build());
51-
52-
}
53-
54-
public DynamoDbClient build() {
55-
56-
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
57-
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
58-
59-
60-
if(accessKey && secretAccess){
61-
62-
AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create(awsAccessKey,awsSecretAccess);
63-
AwsCredentialsProvider staticCredentialsProvider = StaticCredentialsProvider.create(awsBasicCredentials);
64-
dynamoDB.credentialsProvider(staticCredentialsProvider);
65-
}
66-
67-
return dynamoDB.build();
68-
}
69-
70-
@Override
71-
public void awsAccessKey(String awsAccessKey) {
72-
this.awsAccessKey = awsAccessKey;
73-
}
74-
75-
@Override
76-
public void awsSecretAccess(String awsSecretAccess) {
77-
this.awsSecretAccess = awsSecretAccess;
78-
}
51+
52+
}
53+
54+
public DynamoDbClient build() {
55+
56+
boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
57+
boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
58+
59+
60+
if (accessKey && secretAccess) {
61+
62+
AwsBasicCredentials awsBasicCredentials = AwsBasicCredentials.create(awsAccessKey, awsSecretAccess);
63+
AwsCredentialsProvider staticCredentialsProvider = StaticCredentialsProvider.create(awsBasicCredentials);
64+
dynamoDB.credentialsProvider(staticCredentialsProvider);
65+
}
66+
67+
return dynamoDB.build();
68+
}
69+
70+
@Override
71+
public void awsAccessKey(String awsAccessKey) {
72+
this.awsAccessKey = awsAccessKey;
73+
}
74+
75+
@Override
76+
public void awsSecretAccess(String awsSecretAccess) {
77+
this.awsSecretAccess = awsSecretAccess;
78+
}
7979
}

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515

1616
package org.jnosql.diana.dynamodb;
1717

18-
import static java.util.Optional.ofNullable;
19-
2018
import org.jnosql.diana.api.Settings;
2119

20+
import static java.util.Optional.ofNullable;
21+
2222
final class DynamoDBBuilders {
23-
24-
25-
private static final String ENDPOINT = "dynamodb.endpoint";
26-
private static final String REGION = "dynamodb.region";
27-
private static final String PROFILE = "dynamodb.profile";
28-
private static final String AWS_ACCESSKEY = "dynamodb.awsaccesskey";
29-
private static final String AWS_SECRETACCESS = "dynamodb.secretaccess";
30-
31-
private DynamoDBBuilders() {
32-
}
33-
34-
static void load(Settings settings , DynamoDBBuilder dynamoDB) {
35-
ofNullable(settings.get(ENDPOINT)).map(Object::toString).ifPresent(dynamoDB::endpoint);
36-
ofNullable(settings.get(REGION)).map(Object::toString).ifPresent(dynamoDB::region);
37-
ofNullable(settings.get(PROFILE)).map(Object::toString).ifPresent(dynamoDB::profile);
38-
ofNullable(settings.get(AWS_ACCESSKEY)).map(Object::toString).ifPresent(dynamoDB::awsAccessKey);
39-
ofNullable(settings.get(AWS_SECRETACCESS)).map(Object::toString).ifPresent(dynamoDB::awsSecretAccess);
40-
}
41-
23+
24+
25+
private static final String ENDPOINT = "dynamodb.endpoint";
26+
private static final String REGION = "dynamodb.region";
27+
private static final String PROFILE = "dynamodb.profile";
28+
private static final String AWS_ACCESSKEY = "dynamodb.awsaccesskey";
29+
private static final String AWS_SECRET_ACCESS = "dynamodb.secretaccess";
30+
31+
private DynamoDBBuilders() {
32+
}
33+
34+
static void load(Settings settings, DynamoDBBuilder dynamoDB) {
35+
ofNullable(settings.get(ENDPOINT)).map(Object::toString).ifPresent(dynamoDB::endpoint);
36+
ofNullable(settings.get(REGION)).map(Object::toString).ifPresent(dynamoDB::region);
37+
ofNullable(settings.get(PROFILE)).map(Object::toString).ifPresent(dynamoDB::profile);
38+
ofNullable(settings.get(AWS_ACCESSKEY)).map(Object::toString).ifPresent(dynamoDB::awsAccessKey);
39+
ofNullable(settings.get(AWS_SECRET_ACCESS)).map(Object::toString).ifPresent(dynamoDB::awsSecretAccess);
40+
}
41+
4242
}

0 commit comments

Comments
 (0)