Fix handling of UpdateBehavior.WRITE_IF_NOT_EXISTS on @DynamoDbAutoGeneratedUuid

Author: anasatirbasa

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

@@ -311,7 +311,7 @@ public void updateItemConditionTestFailure() {
     }
 
     // ======================================================================
-    // SCENARIO 1: UpdateItem → UpdateItem
+    // SCENARIO 1: PutItem → UpdateItem → UpdateItem
     // Case A:     UUIDs are not provided in request payload
     // createdUuid stays the same across updates    (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
     // lastUpdatedUuid changes on every update      (UpdateBehaviour.WRITE_ALWAYS)
@@ -339,7 +339,7 @@ public void updateItemTwice_withoutUuidsOnRequest_thenCreatedUuidPreservedAndLas
     }
 
     // ======================================================================
-    // SCENARIO 1:  UpdateItem → UpdateItem
+    // SCENARIO 1:  PutItem → UpdateItem → UpdateItem
     // Case B:      createdUuid provided in request payload (should be ignored)
     // createdUuid stays the same across updates    (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
     // lastUpdatedUuid changes on every update      (UpdateBehaviour.WRITE_ALWAYS)
@@ -385,7 +385,7 @@ public void putUpdatePut_withoutUuidsOnRequest_thenCreatedUuidPreservedOnUpdateA
         String lastUpdatedUuidAfterFirstPut = afterFirstPut.getLastUpdatedUuid();
         assertRecordHasValidUuid(afterFirstPut);
 
-        // UPDATE → created preserved, lastUpdated changes
+        // UPDATE → createdUuid preserved, lastUpdatedUuid changes
         mappedTable.updateItem(new Record().id("id1").attribute("id1"));
         Record afterUpdate = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id1")));
         Assertions.assertThat(afterUpdate.getCreatedUuid()).isEqualTo(createdUuidAfterFirstPut);
@@ -401,29 +401,29 @@ public void putUpdatePut_withoutUuidsOnRequest_thenCreatedUuidPreservedOnUpdateA
 
     // ======================================================================
     // SCENARIO 2: PutItem → UpdateItem → PutItem
-    // Case B:     createdUuid provided on first PUT request → is preserved on UPDATE, regenerated on the next PUT request
-    // createdUuid stays the same after update, regenerates on PUT   (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
-    // lastUpdatedUuid changes after every request                   (UpdateBehaviour.WRITE_ALWAYS)
+    // Case B:     createdUuid provided on first PUT request         → is preserved on UPDATE, regenerated on the next PUT request
+    // createdUuid stays the same after update, regenerates after PUT (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
+    // lastUpdatedUuid changes after every request                    (UpdateBehaviour.WRITE_ALWAYS)
     // ======================================================================
     @Test
     public void putUpdatePut_withoutUuidsOnRequest_thenCreatedUuidPreservedOnUpdateAndRegeneratedOnPut_AndLastUpdatedUuidChanged() {
         String manualCreated = "UUID-" + UUID.randomUUID();
 
-        // First PUT with createdUuid provided in request payload → created preserved, lastUpdated generated
+        // First PUT with createdUuid provided in request payload → createdUuid preserved, lastUpdatedUuid generated
         Record first = new Record().id("p1").attribute("p1");
         first.setCreatedUuid(manualCreated);
         mappedTable.putItem(first);
         Record afterFirstPut = mappedTable.getItem(r -> r.key(k -> k.partitionValue("p1")));
         Assertions.assertThat(afterFirstPut.getCreatedUuid()).isEqualTo(manualCreated);
         String lastUpdatedUuidAfterFirstPut = afterFirstPut.getLastUpdatedUuid();
 
-        // UPDATE → created preserved, lastUpdated changes
+        // UPDATE → createdUuid preserved, lastUpdatedUuid changes
         mappedTable.updateItem(new Record().id("p1").attribute("id1"));
         Record afterUpdate = mappedTable.getItem(r -> r.key(k -> k.partitionValue("p1")));
         Assertions.assertThat(afterUpdate.getCreatedUuid()).isEqualTo(manualCreated);
         Assertions.assertThat(afterUpdate.getLastUpdatedUuid()).isNotEqualTo(lastUpdatedUuidAfterFirstPut);
 
-        // Second PUT without manual createdUuid → both regenerated
+        // Second PUT without manual createdUuid → both uuids regenerated
         mappedTable.putItem(new Record().id("p1").attribute("p1"));
         Record afterSecondPut = mappedTable.getItem(r -> r.key(k -> k.partitionValue("p1")));
         Assertions.assertThat(afterSecondPut.getCreatedUuid()).isNotEqualTo(manualCreated);
@@ -434,8 +434,8 @@ public void putUpdatePut_withoutUuidsOnRequest_thenCreatedUuidPreservedOnUpdateA
     // ======================================================================
     // SCENARIO 3: transactWriteItems.addPutItem → addPutItem
     // Case A:     UUIDs not provided in request payload    (both regenerated on each PUT)
-    // createdUuid changes after every update           (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
-    // lastUpdatedUuid changes after every update       (UpdateBehaviour.WRITE_ALWAYS)
+    // createdUuid changes after every update               (UpdateBehaviour.WRITE_IF_NOT_EXISTS)
+    // lastUpdatedUuid changes after every update           (UpdateBehaviour.WRITE_ALWAYS)
     // ======================================================================
     @Test
     public void transactPutThenPut_withoutUuidsOnRequest_thenBothUuidsRegeneratedEachTime() {
@@ -470,7 +470,7 @@ public void transactPutThenPut_withoutUuidsOnRequest_thenBothUuidsRegeneratedEac
     // lastUpdatedUuid changes after every put       (UpdateBehaviour.WRITE_ALWAYS)
     // ======================================================================
     @Test
-    public void transactPutWithManualCreatedUuid_thenPutWithoutUuid_thenBothUuidsRegeneratedEachTime() {
+    public void transactPutWithManualCreatedUuid_thenPutWithoutUuid_thenBothUuidsRegeneratedOnSecondPut() {
         DynamoDbEnhancedClient client = DynamoDbEnhancedClient.builder()
                                                               .dynamoDbClient(getDynamoDbClient())
                                                               .extensions(AutoGeneratedUuidExtension.create())
@@ -489,9 +489,7 @@ public void transactPutWithManualCreatedUuid_thenPutWithoutUuid_thenBothUuidsReg
         String lastUpdatedUuidAfterFirstUpdateRecord = afterFirstUpdateRecord.getLastUpdatedUuid();
 
         // Transaction PUT #2 without uuids provided in request payload → both regenerated
-        client.transactWriteItems(TransactWriteItemsEnhancedRequest.builder()
-                                                                   .addPutItem(table, new Record().id("id2").attribute("p2"))
-                                                                   .build());
+        table.putItem(new Record().id("id2").attribute("p2"));
         Record afterSecondUpdateRecord = table.getItem(r -> r.key(k -> k.partitionValue("id2")));
         Assertions.assertThat(afterSecondUpdateRecord.getCreatedUuid()).isNotEqualTo(manualCreated);
         Assertions.assertThat(afterSecondUpdateRecord.getLastUpdatedUuid()).isNotEqualTo(lastUpdatedUuidAfterFirstUpdateRecord);