Added support for DynamoDbAutoGeneratedKey annotation [Fix for #5497 - ConditionalCheckFailedException with version attribute and partition key using auto-generated UUID]

Author: anasatirbasa

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

@@ -39,12 +39,12 @@
  * Register this extension explicitly when building the {@link software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient}.
  * <p>
  * Example:
- * <pre>
+ * <pre>{@code
  * DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
  *     .dynamoDbClient(lowLevelClient)
- *     .extensions(AutoGeneratedKeyExtension.create())
+ *     .extensions(AutoGeneratedKeyExtension.builder().build())
  *     .build();
- * </pre>
+ * }</pre>
  */
 @SdkPublicApi
 @ThreadSafe
@@ -59,10 +59,10 @@ private AutoGeneratedKeyExtension() {
     }
 
     /**
-     * @return an instance of {@link AutoGeneratedKeyExtension}
+     * Returns a new builder for {@link AutoGeneratedKeyExtension}.
      */
-    public static AutoGeneratedKeyExtension create() {
-        return new AutoGeneratedKeyExtension();
+    public static Builder builder() {
+        return new Builder();
     }
 
     /**
@@ -111,6 +111,21 @@ public static StaticAttributeTag autoGeneratedKeyAttribute() {
         }
     }
 
+    /**
+     * Builder for {@link AutoGeneratedKeyExtension}.
+     * <p>
+     * Currently stateless, but provided to keep the extension creation consistent with other extensions and to allow future
+     * configuration without breaking the API.
+     */
+    public static final class Builder {
+        private Builder() {
+        }
+
+        public AutoGeneratedKeyExtension build() {
+            return new AutoGeneratedKeyExtension();
+        }
+    }
+
     /**
      * Validates the Java type and writes table metadata so {@link #beforeWrite} can find the tagged attributes at runtime.
      */

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/AutoGeneratedKeyExtensionTest.java

@@ -40,7 +40,7 @@ public class AutoGeneratedKeyExtensionTest {
     private static final OperationContext PRIMARY_CONTEXT =
         DefaultOperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
 
-    private final AutoGeneratedKeyExtension extension = AutoGeneratedKeyExtension.create();
+    private final AutoGeneratedKeyExtension extension = AutoGeneratedKeyExtension.builder().build();
 
     private static final StaticTableSchema<ItemWithKey> ITEM_WITH_KEY_SCHEMA =
         StaticTableSchema.builder(ItemWithKey.class)

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

@@ -64,7 +64,7 @@ public AutoGeneratedKeyRecordTest(String testName,
         this.mappedTable =
             DynamoDbEnhancedClient.builder()
                                   .dynamoDbClient(getDynamoDbClient())
-                                  .extensions(AutoGeneratedKeyExtension.create())
+                                  .extensions(AutoGeneratedKeyExtension.builder().build())
                                   .build()
                                   .table(RecordWithMixedUpdateBehavioursTableName, RecordWithMixedUpdateBehavioursTableSchema);
     }
@@ -264,7 +264,7 @@ public void regression_issue5497_autoGeneratedPartitionKey_withVersionAttribute_
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
                                                               .extensions(
-                                                                  AutoGeneratedKeyExtension.create(),
+                                                                  AutoGeneratedKeyExtension.builder().build(),
                                                                   VersionedRecordExtension.builder().build()
                                                               )
                                                               .build();
@@ -309,7 +309,7 @@ public void fieldLevel_autoGeneratedKeys_generatedOnPut_andBehaviorsOnUpdate() {
         String tableName = getConcreteTableName("autogen-field-ann");
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
-                                                              .extensions(AutoGeneratedKeyExtension.create())
+                                                              .extensions(AutoGeneratedKeyExtension.builder().build())
                                                               .build();
 
         TableSchema<RecordWithMixedUpdateBehavioursWithFieldAnnotations> schema =
@@ -356,7 +356,7 @@ public void getterLevel_createdKey_WRITE_ALWAYS_manualValue_isWritten() {
         String tableName = getConcreteTableName("getter-created-writealways-manual");
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
-                                                              .extensions(AutoGeneratedKeyExtension.create())
+                                                              .extensions(AutoGeneratedKeyExtension.builder().build())
                                                               .build();
 
         TableSchema<RecordWithMixedUpdateBehavioursWithGetterCreatedKeyWriteAlways> schema =
@@ -396,7 +396,7 @@ public void getterLevel_createdKey_WRITE_ALWAYS_regenerates_onUpdate() {
         String tableName = getConcreteTableName("getter-created-writealways");
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
-                                                              .extensions(AutoGeneratedKeyExtension.create())
+                                                              .extensions(AutoGeneratedKeyExtension.builder().build())
                                                               .build();
 
         TableSchema<RecordWithMixedUpdateBehavioursWithGetterCreatedKeyWriteAlways> schema =
@@ -437,7 +437,7 @@ public void getterLevel_lastUpdatedKey_WRITE_IF_NOT_EXISTS_isPreserved_onUpdate(
         String tableName = getConcreteTableName("getter-lastupdated-writeifnotexists");
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
-                                                              .extensions(AutoGeneratedKeyExtension.create())
+                                                              .extensions(AutoGeneratedKeyExtension.builder().build())
                                                               .build();
 
         TableSchema<RecordWithMixedUpdateBehavioursWithGetterLastUpdatedKeyWriteIfNotExists> schema =