Added support for @DynamoDbUpdateBehavior on attributes within nested objects

Author: anasatirbasa

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

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.InvalidNestedAttributeBean.InvalidNestedAttributeChild;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.UpdateBehaviorTestModels.BeanWithInvalidNestedAttributeName.BeanWithInvalidNestedAttributeNameChild;
 
 import com.google.common.collect.ImmutableList;
 import java.time.Instant;
@@ -23,11 +23,11 @@
 import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedTimestampRecordExtension;
 import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.CompositeRecord;
 import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FlattenRecord;
-import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.InvalidNestedAttributeBean;
-import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.InvalidRootAttributeBean;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.UpdateBehaviorTestModels.BeanWithInvalidNestedAttributeName;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.UpdateBehaviorTestModels.BeanWithInvalidRootAttributeName;
 import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.NestedRecordWithUpdateBehavior;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.NestedRecordWithUpdateBehavior.TimestampListElement;
 import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecordWithUpdateBehaviors;
-import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.TimestampListElement;
 import software.amazon.awssdk.enhanced.dynamodb.internal.client.ExtensionResolver;
 import software.amazon.awssdk.enhanced.dynamodb.model.IgnoreNullsMode;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
@@ -48,11 +48,11 @@ public class UpdateBehaviorTest extends LocalDynamoDbSyncTestBase {
     private static final TableSchema<FlattenRecord> TABLE_SCHEMA_FLATTEN_RECORD =
         TableSchema.fromClass(FlattenRecord.class);
 
-    private static final TableSchema<InvalidRootAttributeBean> TABLE_SCHEMA_INVALID_ATTR_NAME_ON_ROOT =
-        TableSchema.fromClass(InvalidRootAttributeBean.class);
+    private static final TableSchema<BeanWithInvalidRootAttributeName> TABLE_SCHEMA_INVALID_ATTR_NAME_ON_ROOT =
+        TableSchema.fromClass(BeanWithInvalidRootAttributeName.class);
 
-    private static final TableSchema<InvalidNestedAttributeBean> TABLE_SCHEMA_INVALID_ATTR_NAME_ON_NESTED_LEVEL =
-        TableSchema.fromClass(InvalidNestedAttributeBean.class);
+    private static final TableSchema<BeanWithInvalidNestedAttributeName> TABLE_SCHEMA_INVALID_ATTR_NAME_ON_NESTED_LEVEL =
+        TableSchema.fromClass(BeanWithInvalidNestedAttributeName.class);
 
     private final DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
                                                                                 .dynamoDbClient(getDynamoDbClient()).extensions(
@@ -66,10 +66,10 @@ public class UpdateBehaviorTest extends LocalDynamoDbSyncTestBase {
     private final DynamoDbTable<FlattenRecord> flattenedMappedTable =
         enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA_FLATTEN_RECORD);
 
-    private final DynamoDbTable<InvalidRootAttributeBean> beanWithInvalidRootAttrNameMappedTable =
+    private final DynamoDbTable<BeanWithInvalidRootAttributeName> beanWithInvalidRootAttrNameMappedTable =
         enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA_INVALID_ATTR_NAME_ON_ROOT);
 
-    private final DynamoDbTable<InvalidNestedAttributeBean> beanWithInvalidNestedAttrNameMappedTable =
+    private final DynamoDbTable<BeanWithInvalidNestedAttributeName> beanWithInvalidNestedAttrNameMappedTable =
         enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA_INVALID_ATTR_NAME_ON_NESTED_LEVEL);
 
     @Rule
@@ -774,7 +774,7 @@ public void updateBehaviour_onItemWithRootAttributeNameContainingReservedMarker_
         thrown.expectMessage("Attribute name 'attr_NESTED_ATTR_UPDATE_' contains reserved marker "
                              + "'_NESTED_ATTR_UPDATE_' and is not allowed.");
 
-        InvalidRootAttributeBean record = new InvalidRootAttributeBean();
+        BeanWithInvalidRootAttributeName record = new BeanWithInvalidRootAttributeName();
         record.setId("1");
         record.setAttr_NESTED_ATTR_UPDATE_(INSTANT_1);
 
@@ -789,10 +789,10 @@ public void updateBehaviour_onItemWithNestedAttributeNameContainingReservedMarke
         thrown.expectMessage("Attribute name 'attr_NESTED_ATTR_UPDATE_' contains reserved marker "
                              + "'_NESTED_ATTR_UPDATE_' and is not allowed.");
 
-        InvalidNestedAttributeBean record = new InvalidNestedAttributeBean();
+        BeanWithInvalidNestedAttributeName record = new BeanWithInvalidNestedAttributeName();
         record.setId("1");
 
-        InvalidNestedAttributeChild childBean = new InvalidNestedAttributeChild();
+        BeanWithInvalidNestedAttributeNameChild childBean = new BeanWithInvalidNestedAttributeNameChild();
         childBean.setId("2");
         childBean.setAttr_NESTED_ATTR_UPDATE_(INSTANT_1);
         record.setNestedChildAttribute(childBean);

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

@@ -114,4 +114,37 @@ public void setAttribute(String attribute) {
     public void setNestedRecordList(List<TimestampListElement> nestedRecordList) {
         this.nestedRecordList = nestedRecordList;
     }
+
+    @DynamoDbBean
+    public static class TimestampListElement {
+        private String id;
+        private String attribute;
+        private Instant timeAttributeElement;
+
+        @DynamoDbPartitionKey
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getAttribute() {
+            return attribute;
+        }
+
+        public void setAttribute(String attribute) {
+            this.attribute = attribute;
+        }
+
+        @DynamoDbAutoGeneratedTimestampAttribute
+        public Instant getTimeAttributeElement() {
+            return timeAttributeElement;
+        }
+
+        public void setTimeAttributeElement(Instant timeAttributeElement) {
+            this.timeAttributeElement = timeAttributeElement;
+        }
+    }
 }

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

@@ -23,6 +23,7 @@
 import software.amazon.awssdk.enhanced.dynamodb.converters.TimeFormatUpdateTestConverter;
 import software.amazon.awssdk.enhanced.dynamodb.extensions.annotations.DynamoDbAutoGeneratedTimestampAttribute;
 import software.amazon.awssdk.enhanced.dynamodb.extensions.annotations.DynamoDbVersionAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.NestedRecordWithUpdateBehavior.TimestampListElement;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbAttribute;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;