Merge pull request #166 from amoscatelli/master

fix multiple get, multiple delete operations

Author: otaviojava

dynamodb-driver/pom.xml

@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>software.amazon.awssdk</groupId>
     		<artifactId>dynamodb</artifactId>
-    		<version>2.4.3</version>
+    		<version>2.15.40</version>
 		</dependency>
 		<dependency>
             <groupId>org.testcontainers</groupId>

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

@@ -14,7 +14,6 @@
  */
 package org.eclipse.jnosql.communication.dynamodb;
 
-
 import jakarta.nosql.keyvalue.KeyValueEntity;
 import org.eclipse.jnosql.communication.driver.JsonbSupplier;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
@@ -25,7 +24,6 @@
 import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
 
 import javax.json.bind.Jsonb;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,23 +46,28 @@ private DynamoDBUtils() {
 
     public static <K, V> Map<String, AttributeValue> createAttributeValues(K key, V value) {
 
-        Map<String, AttributeValue> createAttributeValues = createAttributeValues(key);
+        Map<String, AttributeValue> createAttributeValues = createKeyAttributeValues(key);
         String valueAsJson = JSONB.toJson(value);
 
         AttributeValue valueAttributeValue = attributeValueBuilder.s(valueAsJson).build();
         createAttributeValues.put(VALUE, valueAttributeValue);
         return createAttributeValues;
     }
 
-    public static <K, V> Map<String, AttributeValue> createAttributeValues(K key) {
-
+    public static <K, V> Map<String, AttributeValue> createKeyAttributeValues(K key) {
         Map<String, AttributeValue> map = new HashMap<>();
         AttributeValue keyAttributeValue = attributeValueBuilder.s(key.toString()).build();
         map.put(KEY, keyAttributeValue);
 
         return map;
     }
 
+    public static <K, V> Collection<Map<String, AttributeValue>> createKeyAttributeValues(Iterable<K> keys) {
+        return StreamSupport.stream(keys.spliterator(), false).map(
+                k -> Collections.singletonMap(KEY, attributeValueBuilder.s(k.toString()).build())
+        ).collect(Collectors.toList());
+    }
+
     public static <K, V> Map<String, AttributeValue> createAttributeValues(KeyValueEntity entity) {
         return createAttributeValues(entity.getKey(), entity.getValue());
     }
@@ -76,27 +79,24 @@ public static <K> Collection<Map<String, AttributeValue>> createAttributeValues(
                 .collect(Collectors.toList());
     }
 
-    private static Map<String, List<WriteRequest>> createMapWriteRequest(Map<String, AttributeValue> map) {
-        return createMapWriteRequest(Arrays.asList(map));
-    }
-
-    private static Map<String, List<WriteRequest>> createMapWriteRequest(Collection<Map<String, AttributeValue>> map) {
+    private static Map<String, List<WriteRequest>> createMapWriteRequest(Collection<Map<String, AttributeValue>> map, String tableName) {
 
         PutRequest.Builder putRequestBuilder = PutRequest.builder();
         WriteRequest.Builder writeRequestBuilder = WriteRequest.builder();
 
-        return map
-                .stream()
-                .map(m -> putRequestBuilder.item(m).build())
-                .map(p -> writeRequestBuilder.putRequest(p).build())
-                .collect(Collectors.groupingBy(w -> w.toString(), Collectors.toList()));
+        return Collections.singletonMap(
+                tableName,
+                map
+                        .stream()
+                        .map(m -> putRequestBuilder.item(m).build())
+                        .map(p -> writeRequestBuilder.putRequest(p).build()).collect(Collectors.toList())
+        );
     }
 
-
-    public static <K> Map<String, List<WriteRequest>> createMapWriteRequest(Iterable<KeyValueEntity> entities) {
-
+    public static <K> Map<String, List<WriteRequest>> createMapWriteRequest(Iterable<KeyValueEntity> entities, String tableName) {
         Collection<Map<String, AttributeValue>> attributeValues = createAttributeValues(entities);
-        return createMapWriteRequest(attributeValues);
+        createMapWriteRequest(attributeValues, tableName);
+        return createMapWriteRequest(attributeValues, tableName);
     }
 
     public static <K> Map<String, AttributeValue> create(Iterable<K> keys) {
@@ -108,25 +108,23 @@ public static <K> Map<String, AttributeValue> create(Iterable<K> keys) {
         return Collections.unmodifiableMap(map);
     }
 
-    private static <K> Map<String, KeysAndAttributes> createKeysAndAttribute(Iterable<K> keys) {
+    private static <K> Map<String, KeysAndAttributes> createKeysAndAttribute(Iterable<K> keys, String tableName) {
 
         KeysAndAttributes.Builder keysAndAttributesBuilder = KeysAndAttributes.builder();
 
-        return StreamSupport.stream(keys.spliterator(), false)
-                .collect(Collectors.toMap
-                        (
-                                e -> e.toString(),
-                                k -> keysAndAttributesBuilder.projectionExpression(KEY).keys(createAttributeValues(k)).build())
-                );
+        return Collections.singletonMap(
+                tableName,
+                keysAndAttributesBuilder.keys(createKeyAttributeValues(keys)).build()
+        );
     }
 
-    public static <K> BatchGetItemRequest createBatchGetItemRequest(Iterable<K> keys) {
+    public static <K> BatchGetItemRequest createBatchGetItemRequest(Iterable<K> keys, String tableName) {
         BatchGetItemRequest.Builder batchGetItemRequestBuilder = BatchGetItemRequest.builder();
-        return batchGetItemRequestBuilder.requestItems(createKeysAndAttribute(keys)).build();
+        return batchGetItemRequestBuilder.requestItems(createKeysAndAttribute(keys, tableName)).build();
     }
 
     public static <K> GetItemRequest createGetItemRequest(K key, String tableName) {
         GetItemRequest.Builder getItemRequest = GetItemRequest.builder();
-        return getItemRequest.tableName(tableName).key(createAttributeValues(key)).build();
+        return getItemRequest.tableName(tableName).key(createKeyAttributeValues(key)).build();
     }
-}
+}

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

@@ -33,7 +33,6 @@
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
 
 public class DynamoDBBucketManager implements BucketManager {
 
@@ -65,7 +64,7 @@ public void put(KeyValueEntity entity, Duration ttl)
 
     @Override
     public void put(Iterable<KeyValueEntity> entities) throws NullPointerException {
-        client.batchWriteItem(BatchWriteItemRequest.builder().requestItems(DynamoDBUtils.createMapWriteRequest(entities)).build());
+        client.batchWriteItem(BatchWriteItemRequest.builder().requestItems(DynamoDBUtils.createMapWriteRequest(entities, tableName)).build());
     }
 
     @Override
@@ -93,21 +92,21 @@ public <K> Optional<Value> get(K key) throws NullPointerException {
 
     @Override
     public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
-
-        return client.batchGetItem(DynamoDBUtils.createBatchGetItemRequest(keys))
+        
+        return client.batchGetItem(DynamoDBUtils.createBatchGetItemRequest(keys, tableName))
                 .responses()
                 .values()
                 .stream()
-                .flatMap(l -> StreamSupport.stream(l.spliterator(), false))
-                .flatMap(v -> v.values().stream())
+                .flatMap(l -> l.stream())
+                .map(v -> v.get(ConfigurationAmazonEntity.VALUE))
                 .map(TO_JSON)
                 .map(ValueJSON::of)
                 .collect(Collectors.toList());
     }
 
     @Override
     public <K> void delete(K key) throws NullPointerException {
-        client.deleteItem(DeleteItemRequest.builder().tableName(tableName).key(DynamoDBUtils.createAttributeValues(key)).build());
+        client.deleteItem(DeleteItemRequest.builder().tableName(tableName).key(DynamoDBUtils.createKeyAttributeValues(key)).build());
     }
 
     @Override