Merge remote-tracking branch 'origin/feature/support-to-flatten-a-map' into feature/support-to-flatten-a-map

# Conflicts:
#	services-custom/dynamodb-enhanced/src/it/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedIntegrationTestBase.java
#	services-custom/dynamodb-enhanced/src/it/java/software/amazon/awssdk/enhanced/dynamodb/ScanQueryWithFlattenMapIntegrationTest.java
#	services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenMapTest.java
#	services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/flattenmap/FlattenMapValidBean.java

Author: anasatirbasa

services-custom/dynamodb-enhanced/src/it/java/software/amazon/awssdk/enhanced/dynamodb/model/RecordWithFlattenMap.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.Map;
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbFlattenMap;
+
+public class RecordWithFlattenMap {
+
+    private String id;
+    private Integer sort;
+    private Integer value;
+    private String gsiId;
+    private Integer gsiSort;
+
+    private String stringAttribute;
+
+    private Map<String, String> attributesMap;
+
+    public String getId() {
+        return id;
+    }
+
+    public RecordWithFlattenMap setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public RecordWithFlattenMap setSort(Integer sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public RecordWithFlattenMap setValue(Integer value) {
+        this.value = value;
+        return this;
+    }
+
+    public String getGsiId() {
+        return gsiId;
+    }
+
+    public RecordWithFlattenMap setGsiId(String gsiId) {
+        this.gsiId = gsiId;
+        return this;
+    }
+
+    public Integer getGsiSort() {
+        return gsiSort;
+    }
+
+    public RecordWithFlattenMap setGsiSort(Integer gsiSort) {
+        this.gsiSort = gsiSort;
+        return this;
+    }
+
+    public String getStringAttribute() {
+        return stringAttribute;
+    }
+
+    public RecordWithFlattenMap setStringAttribute(String stringAttribute) {
+        this.stringAttribute = stringAttribute;
+        return this;
+    }
+
+    @DynamoDbFlattenMap
+    public Map<String, String> getAttributesMap() {
+        return attributesMap;
+    }
+
+    public RecordWithFlattenMap setAttributesMap(Map<String, String> attributesMap) {
+        this.attributesMap = attributesMap;
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        RecordWithFlattenMap record = (RecordWithFlattenMap) o;
+        return Objects.equals(id, record.id) &&
+               Objects.equals(sort, record.sort) &&
+               Objects.equals(value, record.value) &&
+               Objects.equals(gsiId, record.gsiId) &&
+               Objects.equals(stringAttribute, record.stringAttribute) &&
+               Objects.equals(gsiSort, record.gsiSort);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, sort, value, gsiId, gsiSort, stringAttribute);
+    }
+}

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

@@ -18,6 +18,7 @@
 import static software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension.AttributeTags.versionAttribute;
 import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
 
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
@@ -31,6 +32,9 @@ public class FakeItem extends FakeItemAbstractSubclass {
                          .flatten(FakeItemComposedClass.getTableSchema(),
                                   FakeItem::getComposedObject,
                                   FakeItem::setComposedObject)
+                         .flatten("attributesMap",
+                                  FakeItem::getAttributesMap,
+                                  FakeItem::setAttributesMap)
                          .extend(getSubclassTableSchema())
                          .addAttribute(String.class, a -> a.name("id")
                                                            .getter(FakeItem::getId)
@@ -46,13 +50,16 @@ public class FakeItem extends FakeItemAbstractSubclass {
     private Integer version;
     private FakeItemComposedClass composedObject;
 
+    private Map<String, String> attributesMap;
+
     public FakeItem() {
     }
 
-    public FakeItem(String id, Integer version, FakeItemComposedClass composedObject) {
+    public FakeItem(String id, Integer version, FakeItemComposedClass composedObject, Map<String, String> attributesMap) {
         this.id = id;
         this.version = version;
         this.composedObject = composedObject;
+        this.attributesMap = attributesMap;
     }
 
     public static Builder builder() {
@@ -97,6 +104,14 @@ public void setComposedObject(FakeItemComposedClass composedObject) {
         this.composedObject = composedObject;
     }
 
+    public Map<String, String> getAttributesMap() {
+        return attributesMap;
+    }
+
+    public void setAttributesMap(Map<String, String> attributesMap) {
+        this.attributesMap = attributesMap;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -117,6 +132,7 @@ public static class Builder {
         private String id;
         private Integer version;
         private FakeItemComposedClass composedObject;
+        private Map<String, String> attributesMap;
 
         public Builder id(String id) {
             this.id = id;
@@ -133,8 +149,13 @@ public Builder composedObject(FakeItemComposedClass composedObject) {
             return this;
         }
 
+        public Builder testMap(Map<String, String> attributesMap) {
+            this.attributesMap = attributesMap;
+            return this;
+        }
+
         public FakeItem build() {
-            return new FakeItem(id, version, composedObject);
+            return new FakeItem(id, version, composedObject, attributesMap);
         }
     }
 }

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

@@ -16,13 +16,15 @@
 package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
 
 import java.time.Instant;
+import java.util.Map;
 import software.amazon.awssdk.enhanced.dynamodb.converters.EpochMillisFormatTestConverter;
 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.mapper.annotations.DynamoDbAttribute;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbFlattenMap;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbUpdateBehavior;
 
@@ -40,6 +42,7 @@ public class RecordWithUpdateBehaviors {
     private Instant formattedLastAutoUpdatedOn;
     private NestedRecordWithUpdateBehavior nestedRecord;
     private String key;
+    private Map<String, String> attributesMap;
 
     @DynamoDbPartitionKey
     public String getId() {
@@ -133,4 +136,13 @@ public NestedRecordWithUpdateBehavior getNestedRecord() {
     public void setNestedRecord(NestedRecordWithUpdateBehavior nestedRecord) {
         this.nestedRecord = nestedRecord;
     }
+
+    @DynamoDbFlattenMap
+    public Map<String, String> getAttributesMap() {
+        return attributesMap;
+    }
+
+    public void setAttributesMap(Map<String, String> attributesMap) {
+        this.attributesMap = attributesMap;
+    }
 }

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaTest.java

@@ -1322,7 +1322,7 @@ public void mapToItem_nestedBeanPreserveEmptyBean_shouldInitializeEmptyBean() {
                              .build();
 
         FakeItemComposedClass nestedBean = new FakeItemComposedClass();
-        FakeItem fakeItem = new FakeItem("1", 1, nestedBean);
+        FakeItem fakeItem = new FakeItem("1", 1, nestedBean, new HashMap<>());
 
         Map<String, AttributeValue> itemMap = staticTableSchema.itemToMap(fakeItem, false);
 
@@ -1347,7 +1347,7 @@ public void itemToMap_nestedBeanIgnoreNulls_shouldOmitNullFields() {
                              .build();
 
         FakeItemComposedClass nestedBean = new FakeItemComposedClass();
-        FakeItem fakeItem = new FakeItem("1", 1, nestedBean);
+        FakeItem fakeItem = new FakeItem("1", 1, nestedBean, new HashMap<>());
 
         Map<String, AttributeValue> itemMap = staticTableSchema.itemToMap(fakeItem, true);
         AttributeValue expectedAttributeValue = AttributeValue.builder().m(new HashMap<>()).build();