Merge pull request #167 from amoscatelli/master

fix configuration via microprofile and table initialization

Author: otaviojava

dynamodb-driver/src/main/java/org/eclipse/jnosql/communication/dynamodb/DynamoDBBuilders.java

@@ -17,8 +17,6 @@
 
 import jakarta.nosql.Settings;
 
-import static java.util.Optional.ofNullable;
-
 final class DynamoDBBuilders {
 
 
@@ -27,11 +25,11 @@ private DynamoDBBuilders() {
     }
 
     static void load(Settings settings, DynamoDBBuilder dynamoDB) {
-        ofNullable(settings.get(DynamoDBConfigurations.ENDPOINT.get())).map(Object::toString).ifPresent(dynamoDB::endpoint);
-        ofNullable(settings.get(DynamoDBConfigurations.REGION.get())).map(Object::toString).ifPresent(dynamoDB::region);
-        ofNullable(settings.get(DynamoDBConfigurations.PROFILE.get())).map(Object::toString).ifPresent(dynamoDB::profile);
-        ofNullable(settings.get(DynamoDBConfigurations.AWS_ACCESSKEY.get())).map(Object::toString).ifPresent(dynamoDB::awsAccessKey);
-        ofNullable(settings.get(DynamoDBConfigurations.AWS_SECRET_ACCESS.get())).map(Object::toString).ifPresent(dynamoDB::awsSecretAccess);
+        settings.get(DynamoDBConfigurations.ENDPOINT.get()).map(Object::toString).ifPresent(dynamoDB::endpoint);
+        settings.get(DynamoDBConfigurations.REGION.get()).map(Object::toString).ifPresent(dynamoDB::region);
+        settings.get(DynamoDBConfigurations.PROFILE.get()).map(Object::toString).ifPresent(dynamoDB::profile);
+        settings.get(DynamoDBConfigurations.AWS_ACCESSKEY.get()).map(Object::toString).ifPresent(dynamoDB::awsAccessKey);
+        settings.get(DynamoDBConfigurations.AWS_SECRET_ACCESS.get()).map(Object::toString).ifPresent(dynamoDB::awsSecretAccess);
     }
 
 }

dynamodb-driver/src/main/java/org/eclipse/jnosql/communication/dynamodb/DynamoTableUtils.java

@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public final class DynamoTableUtils {
 
@@ -71,20 +72,18 @@ public static ProvisionedThroughput createProvisionedThroughput(Long readCapacit
 
         ProvisionedThroughput.Builder provisionedThroughputBuilder = ProvisionedThroughput.builder();
 
-        if (readCapacityUnits != null && readCapacityUnits.longValue() > 0)
+        if (readCapacityUnits != null && readCapacityUnits.longValue() > 0) {
             provisionedThroughputBuilder.readCapacityUnits(readCapacityUnits);
-        else {
+        } else {
             provisionedThroughputBuilder.readCapacityUnits(READ_CAPACITY_UNITS);
         }
 
-
-        if (writeCapacityUnit != null && writeCapacityUnit.longValue() > 0)
+        if (writeCapacityUnit != null && writeCapacityUnit.longValue() > 0) {
             provisionedThroughputBuilder.writeCapacityUnits(writeCapacityUnit);
-        else {
+        } else {
             provisionedThroughputBuilder.writeCapacityUnits(READ_CAPACITY_UNITS);
         }
 
-
         return provisionedThroughputBuilder.build();
     }
 
@@ -98,34 +97,37 @@ public static Map<String, ScalarAttributeType> createAttributesType() {
 
     public static void manageTables(String tableName, DynamoDbClient client, Long readCapacityUnits, Long writeCapacityUnit) {
 
-        boolean hasTable = true;
+        boolean hasTable = false;
         String lastName = null;
 
-        while (hasTable) {
+        while (!hasTable) {
             try {
-                ListTablesResponse response = null;
-                if (lastName == null) {
-                    ListTablesRequest request = ListTablesRequest.builder().build();
-                    response = client.listTables(request);
-                } else {
-                    ListTablesRequest request = ListTablesRequest.builder().exclusiveStartTableName(lastName).build();
-                    response = client.listTables(request);
+                ListTablesRequest.Builder builder = ListTablesRequest.builder();
+                if (Objects.nonNull(lastName)) {
+                    builder.exclusiveStartTableName(lastName);
                 }
+                ListTablesRequest request = builder.build();
+                ListTablesResponse response = client.listTables(request);
 
                 List<String> tableNames = response.tableNames();
 
-                if (tableNames.size() == 0) {
-                    createTable(tableName, client, readCapacityUnits, writeCapacityUnit);
+                if (tableNames.isEmpty()) {
+                    break;
                 } else {
-                    lastName = response.lastEvaluatedTableName();
-                    if (lastName == null) {
-                        hasTable = false;
+                    if (tableNames.contains(tableName)) {
+                        hasTable = true;
+                        break;
                     }
+                    Collections.reverse(tableNames);
+                    lastName = tableNames.stream().findFirst().get();
                 }
             } catch (DynamoDbException e) {
                 throw new RuntimeException(e);
             }
         }
+        if (!hasTable) {
+            createTable(tableName, client, readCapacityUnits, writeCapacityUnit);
+        }
     }
 
     private static void createTable(String tableName, DynamoDbClient client, Long readCapacityUnits, Long writeCapacityUnit) {