Feature/dynamodb enhanced increase functional tests coverage

.changes/next-release/feature-AmazonDynamoDBEnhancedClient-a423163.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon DynamoDB Enhanced Client",
+    "contributor": "",
+    "description": "Increase functional tests coverage on dynamodb-enhanced module"
+}

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/AutoGeneratedTimestampRecordExtension.java

@@ -318,7 +318,14 @@ private void processFlattenedNestedAttributes(
             }
 
             for (String attrName : customMetadataObject) {
-                AttributeConverter<?> converter = schema.converterForAttribute(attrName);
+                AttributeConverter<?> converter;
+                try {
+                    converter = schema.converterForAttribute(attrName);
+                } catch (UnsupportedOperationException e) {
+                    // Some custom/third-party TableSchema implementations don't support converterForAttribute.
+                    // In that case, skip timestamp insertion for this attribute instead of failing the write.
+                    continue;
+                }
                 if (converter != null) {
                     insertTimestampInItemToTransform(updatedItems,
                                                      reconstructCompositeKey(path, attrName),
@@ -390,7 +397,13 @@ private Map<String, AttributeValue> applyAutoGeneratedTimestampsToMap(
         boolean mapCopied = false;
 
         for (String key : customMetadataObject) {
-            AttributeConverter<?> converter = nestedSchema.converterForAttribute(key);
+            AttributeConverter<?> converter;
+            try {
+                converter = nestedSchema.converterForAttribute(key);
+            } catch (UnsupportedOperationException e) {
+                // Nested schema can't resolve converters: skip timestamp insertion for this attribute.
+                continue;
+            }
             if (converter != null) {
                 if (!mapCopied) {
                     updatedNestedMap = new HashMap<>(nestedMap);

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncAtomicCounterTest.java

@@ -0,0 +1,46 @@
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.AtomicCounterRecord;
+
+public class AsyncAtomicCounterTest extends LocalDynamoDbAsyncTestBase {
+    private static final TableSchema<AtomicCounterRecord> TABLE_SCHEMA = TableSchema.fromClass(AtomicCounterRecord.class);
+
+    private final DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DynamoDbEnhancedAsyncClient.builder().dynamoDbClient(getDynamoDbAsyncClient()).build();
+
+    private final DynamoDbAsyncTable<AtomicCounterRecord> mappedTable =
+        enhancedAsyncClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(r -> r.tableName(getConcreteTableName("table-name"))).join();
+    }
+
+    @Test
+    public void repeatedUpdate_shouldIncrementCountersOnEachUpdate() {
+        AtomicCounterRecord record = new AtomicCounterRecord();
+        record.setId("id1");
+        record.setAttribute1("value");
+        mappedTable.updateItem(record).join();
+        mappedTable.updateItem(record).join();
+        mappedTable.updateItem(record).join();
+
+        AtomicCounterRecord persisted = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id1"))).join();
+        assertThat(persisted.getDefaultCounter()).isEqualTo(2L);
+        assertThat(persisted.getCustomCounter()).isEqualTo(20L);
+        assertThat(persisted.getDecreasingCounter()).isEqualTo(-22L);
+    }
+}

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncAutoGeneratedUuidRecordTest.java

@@ -0,0 +1,86 @@
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedUuidExtension.AttributeTags.autoGeneratedUuidAttribute;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.updateBehavior;
+
+import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedUuidExtension;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.UpdateBehavior;
+
+public class AsyncAutoGeneratedUuidRecordTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private String writeAlwaysUuid;
+        private String writeIfNotExistsUuid;
+        public String getId() { return id; }
+        public void setId(String id) { this.id = id; }
+        public String getWriteAlwaysUuid() { return writeAlwaysUuid; }
+        public void setWriteAlwaysUuid(String writeAlwaysUuid) { this.writeAlwaysUuid = writeAlwaysUuid; }
+        public String getWriteIfNotExistsUuid() { return writeIfNotExistsUuid; }
+        public void setWriteIfNotExistsUuid(String writeIfNotExistsUuid) { this.writeIfNotExistsUuid = writeIfNotExistsUuid; }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id").getter(Record::getId).setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("writeAlwaysUuid")
+                                                           .getter(Record::getWriteAlwaysUuid)
+                                                           .setter(Record::setWriteAlwaysUuid)
+                                                           .tags(autoGeneratedUuidAttribute()))
+                         .addAttribute(String.class, a -> a.name("writeIfNotExistsUuid")
+                                                           .getter(Record::getWriteIfNotExistsUuid)
+                                                           .setter(Record::setWriteIfNotExistsUuid)
+                                                           .tags(autoGeneratedUuidAttribute(),
+                                                                 updateBehavior(UpdateBehavior.WRITE_IF_NOT_EXISTS)))
+                         .build();
+
+    private final DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DynamoDbEnhancedAsyncClient.builder()
+                                   .dynamoDbClient(getDynamoDbAsyncClient())
+                                   .extensions(AutoGeneratedUuidExtension.create())
+                                   .build();
+
+    private final DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"),
+                                                                                      TABLE_SCHEMA);
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(r -> r.tableName(getConcreteTableName("table-name"))).join();
+    }
+
+    @Test
+    public void putOverwrite_withExplicitUuidValues_shouldRegenerateWriteAlwaysAndNotPreserveWriteIfNotExists() {
+        Record seed = new Record();
+        seed.setId("id1");
+        mappedTable.putItem(seed).join();
+
+        Record overwrite = new Record();
+        overwrite.setId("id1");
+        overwrite.setWriteAlwaysUuid("manual-a");
+        overwrite.setWriteIfNotExistsUuid("manual-b");
+        mappedTable.putItem(overwrite).join();
+        Record persisted = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id1"))).join();
+
+        assertThat(persisted.getWriteAlwaysUuid()).isNotEqualTo("manual-a");
+        UUID.fromString(persisted.getWriteAlwaysUuid());
+        assertThat(persisted.getWriteIfNotExistsUuid()).isNotEqualTo("manual-b");
+        assertThat(persisted.getWriteIfNotExistsUuid()).isNotNull();
+        UUID.fromString(persisted.getWriteIfNotExistsUuid());
+    }
+}

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java

@@ -18,14 +18,18 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
 import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
 import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
 import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
 import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
 
+import java.util.Collections;
 import java.util.Objects;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CompletionException;
 import org.junit.After;
 import org.junit.Before;
@@ -37,13 +41,16 @@
 import software.amazon.awssdk.enhanced.dynamodb.Expression;
 import software.amazon.awssdk.enhanced.dynamodb.Key;
 import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedTimestampRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.UnsupportedConverterTableSchema;
 import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
 import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
 import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
 import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
 import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
 import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
 import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
 
@@ -677,4 +684,29 @@ public void getAShortRecordWithNewModelledFields() {
         Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
         assertThat(result, is(expectedRecord));
     }
+
+    @Test
+    public void extensionEnabledClient_withUnsupportedCustomSchema_putAndUpdateDoNotThrow() {
+        DynamoDbEnhancedAsyncClient extensionClient = DynamoDbEnhancedAsyncClient.builder()
+                                                                                 .dynamoDbClient(getDynamoDbAsyncClient())
+                                                                                 .extensions(AutoGeneratedTimestampRecordExtension.create())
+                                                                                 .build();
+        DynamoDbAsyncTable<Map<String, AttributeValue>> customTable =
+            extensionClient.table(getConcreteTableName("crud-custom-table"), new UnsupportedConverterTableSchema());
+        customTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+
+        Map<String, AttributeValue> item = new HashMap<>();
+        item.put("pk", AttributeValue.builder().s("custom-1").build());
+        item.put("nested",
+                 AttributeValue.builder()
+                               .m(Collections.singletonMap("k", AttributeValue.builder().s("v").build()))
+                               .build());
+
+        customTable.putItem(item).join();
+        customTable.updateItem(item).join();
+
+        Map<String, AttributeValue> persisted = customTable.getItem(r -> r.key(k -> k.partitionValue("custom-1"))).join();
+        assertThat(persisted, is(notNullValue()));
+        getDynamoDbAsyncClient().deleteTable(r -> r.tableName(getConcreteTableName("crud-custom-table"))).join();
+    }
 }