improvements in ProvisionedThroughput

Signed-off-by: Breno Pessoa <[email protected]>

Author: brenopessoa

dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoDBConfiguration.java

@@ -15,6 +15,8 @@
 
 package org.jnosql.diana.dynamodb;
 
+import static java.util.Objects.requireNonNull;
+
 import java.net.URI;
 
 import org.jnosql.diana.api.Settings;
@@ -23,6 +25,7 @@
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClientBuilder;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
 
 
 public class DynamoDBConfiguration {
@@ -32,12 +35,12 @@ public class DynamoDBConfiguration {
 
 
 	 public void syncBuilder(DynamoDbClientBuilder builder) throws NullPointerException {
-		 //requireNonNull(builder, "builder is required");
+		 requireNonNull(builder, "builder is required");
 		 this.builder = builder;
 	 }
 
 	 public void asyncBuilder(DynamoDbAsyncClientBuilder builderAsync) throws NullPointerException{
-//	        requireNonNull(builderAsync, "asyncBuilder is required");
+	        requireNonNull(builderAsync, "asyncBuilder is required");
 	        this.builderAsync = builderAsync;
 	 }
 
@@ -57,4 +60,4 @@ protected DynamoDbAsyncClient getDynamoDBAsync(Settings settings) {
 		 DynamoDBBuilders.load(settings, dynamoDB);
 		 return dynamoDB.build();
 	 }
-}
+}

dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/DynamoTableUtils.java

@@ -50,7 +50,7 @@ public static AttributeDefinition createAttributeDefinition(Map<String,ScalarAtt
 		return attributeDefinitionBuilder.build();
 	}
 
-	public static ProvisionedThroughput createProvisionedThroughput(Long readCapacityUnits , Long writeCapacityUnit  ) {
+	public static ProvisionedThroughput createProvisionedThroughput(Long readCapacityUnits , Long writeCapacityUnit) {
 
 		ProvisionedThroughput.Builder provisionedThroughputBuilder = ProvisionedThroughput.builder();
 
@@ -76,7 +76,7 @@ public static Map<String, ScalarAttributeType> createAttributesType(){
 		return Collections.singletonMap(KEY, ScalarAttributeType.S);
 	}
 
-	public static void manageTables(String tableName, DynamoDbClient client) {
+	public static void manageTables(String tableName, DynamoDbClient client, Long readCapacityUnits , Long writeCapacityUnit) {
 
 		boolean more_tables = true;
 		String last_name = null;
@@ -95,7 +95,7 @@ public static void manageTables(String tableName, DynamoDbClient client) {
 				List<String> table_names = response.tableNames();
 
 				if (table_names.size() == 0) {
-					createTable(tableName, client);
+					createTable(tableName, client,readCapacityUnits ,writeCapacityUnit);
 				} else {
 					last_name = response.lastEvaluatedTableName();
 					if (last_name == null) {
@@ -108,14 +108,11 @@ public static void manageTables(String tableName, DynamoDbClient client) {
 		}
 	}
 
-	private static void createTable(String tableName, DynamoDbClient client) {
+	private static void createTable(String tableName, DynamoDbClient client , Long readCapacityUnits , Long writeCapacityUnit) {
 
 		Map<String, KeyType> keyDefinition = createKeyDefinition();
 		Map<String, ScalarAttributeType> attributeDefinition = createAttributesType();
 
-		Long readCapacityUnits = null;
-		Long writeCapacityUnit = null;
-		
 		client.createTable(CreateTableRequest.builder()
 				.tableName(tableName)
 				.provisionedThroughput(createProvisionedThroughput(readCapacityUnits, writeCapacityUnit))

dynamodb-driver/src/main/java/org/jnosql/diana/dynamodb/key/DynamoDBBucketManagerFactory.java

@@ -38,12 +38,12 @@ public DynamoDBBucketManager getBucketManager(String bucketName) {
 		return getBucketManager(bucketName, null, null);
 	}
 
-	public DynamoDBBucketManager getBucketManager(String bucketName, Long readCapacityUnits , Long writeCapacityUnit) {
+	public DynamoDBBucketManager getBucketManager(String bucketName,Long readCapacityUnits , Long writeCapacityUnit) {
 
-		DynamoTableUtils.manageTables(bucketName, client);
+		DynamoTableUtils.manageTables(bucketName, client,readCapacityUnits,writeCapacityUnit);
 		return new DynamoDBBucketManager(client, bucketName);
 	}
-
+	
 	@Override
 	public <T> List<T> getList(String bucketName, Class<T> clazz) {
 		throw new UnsupportedOperationException("The DynamoDB does not support getMap method");

dynamodb-driver/src/test/java/org/jnosql/diana/dynamodb/key/DynamoDBKeyValueEntityManagerTest.java

@@ -68,7 +68,6 @@ public void shouldPutKeyValue() {
     @Test
     public void shouldPutIterableKeyValue() {
 
-
         keyValueEntityManager.put(asList(keyValueSoro, keyValueOtavio));
         Optional<Value> otavio = keyValueEntityManager.get("otavio");
         assertTrue(otavio.isPresent());
@@ -85,13 +84,10 @@ public void shouldMultiGet() {
         KeyValueEntity keyValue = KeyValueEntity.of("otavio", Value.of(user));
         keyValueEntityManager.put(keyValue);
         assertNotNull(keyValueEntityManager.get("otavio"));
-
-
     }
 
     @Test
     public void shouldRemoveKey() {
-
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
         keyValueEntityManager.remove("otavio");
@@ -100,7 +96,6 @@ public void shouldRemoveKey() {
 
     @Test
     public void shouldRemoveMultiKey() {
-
         keyValueEntityManager.put(asList(keyValueSoro, keyValueOtavio));
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);