Merge pull request #3843 from aws/joviegas/stagging_revert-flatten-fix

Revert "Fixed DynamoDbEnhancedClient TableSchema::itemToMap to handle  flattened members when ignoreNulls is false (#5832)

Author: joviegas

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java

@@ -126,7 +126,7 @@ private B mapToItem(B thisBuilder,
         private Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
             T1 otherItem = this.otherItemGetter.apply(item);
 
-            if (otherItem == null && ignoreNulls) {
+            if (otherItem == null) {
                 return Collections.emptyMap();
             }
 
@@ -515,9 +515,7 @@ public Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
 
         attributeMappers.forEach(attributeMapper -> {
             String attributeKey = attributeMapper.attributeName();
-            AttributeValue attributeValue = item == null ?
-                                            AttributeValue.fromNul(true) :
-                                            attributeMapper.attributeGetterMethod().apply(item);
+            AttributeValue attributeValue = attributeMapper.attributeGetterMethod().apply(item);
 
             if (!ignoreNulls || !isNullAttributeValue(attributeValue)) {
                 attributeValueMap.put(attributeKey, attributeValue);

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

@@ -45,7 +45,6 @@
 import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractImmutable;
-import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractNestedImmutable;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AttributeConverterBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AttributeConverterNoConstructorBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.CommonTypesBean;
@@ -56,7 +55,6 @@
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.ExtendedBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.FlattenedBeanBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.FlattenedImmutableBean;
-import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.FlattenedNestedImmutableBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.FluentSetterBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.IgnoredAttributeBean;
 import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.InvalidBean;
@@ -259,67 +257,6 @@ public void dynamoDbFlatten_correctlyFlattensImmutableAttributes() {
         assertThat(itemMap, hasEntry("attribute2", stringValue("two")));
     }
 
-    @Test
-    public void dynamoDbFlatten_correctlyFlattensNullImmutableAttributes() {
-        BeanTableSchema<FlattenedImmutableBean> beanTableSchema = BeanTableSchema.create(FlattenedImmutableBean.class);
-        AbstractImmutable abstractImmutable = AbstractImmutable.builder().build();
-        FlattenedImmutableBean flattenedImmutableBean = new FlattenedImmutableBean();
-        flattenedImmutableBean.setId("id-value");
-        flattenedImmutableBean.setAbstractImmutable(abstractImmutable);
-
-        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(flattenedImmutableBean, false);
-        assertThat(itemMap.size(), is(3));
-        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
-        assertThat(itemMap, hasEntry("attribute1", AttributeValue.fromNul(true)));
-        assertThat(itemMap, hasEntry("attribute2", AttributeValue.fromNul(true)));
-    }
-
-    @Test
-    public void dynamoDbFlatten_correctlyFlattensNestedImmutableAttributes() {
-        BeanTableSchema<FlattenedNestedImmutableBean> beanTableSchema =
-            BeanTableSchema.create(FlattenedNestedImmutableBean.class);
-        AbstractNestedImmutable abstractNestedImmutable2 =
-            AbstractNestedImmutable.builder().attribute2("nested-two").build();
-        AbstractNestedImmutable abstractNestedImmutable1 =
-            AbstractNestedImmutable.builder().attribute2("two").abstractNestedImmutableOne(abstractNestedImmutable2).build();
-        FlattenedNestedImmutableBean flattenedNestedImmutableBean = new FlattenedNestedImmutableBean();
-        flattenedNestedImmutableBean.setId("id-value");
-        flattenedNestedImmutableBean.setAttribute1("one");
-        flattenedNestedImmutableBean.setAbstractNestedImmutable(abstractNestedImmutable1);
-
-        Map<String, AttributeValue> nestedAttributesMap = new HashMap<>();
-        nestedAttributesMap.put("abstractNestedImmutableOne", AttributeValue.fromNul(true));
-        nestedAttributesMap.put("attribute2", stringValue("nested-two"));
-
-        AttributeValue expectedNestedAttribute =
-            AttributeValue.builder().m(Collections.unmodifiableMap(nestedAttributesMap)).build();
-
-        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(flattenedNestedImmutableBean, false);
-        assertThat(itemMap.size(), is(4));
-        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
-        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
-        assertThat(itemMap, hasEntry("attribute2", stringValue("two")));
-        assertThat(itemMap, hasEntry("abstractNestedImmutableOne", expectedNestedAttribute));
-    }
-
-    @Test
-    public void dynamoDbFlatten_correctlyFlattensNullNestedImmutableAttributes() {
-        BeanTableSchema<FlattenedNestedImmutableBean> beanTableSchema =
-            BeanTableSchema.create(FlattenedNestedImmutableBean.class);
-        AbstractNestedImmutable abstractNestedImmutable = AbstractNestedImmutable.builder().build();
-        FlattenedNestedImmutableBean flattenedNestedImmutableBean = new FlattenedNestedImmutableBean();
-        flattenedNestedImmutableBean.setId("id-value");
-        flattenedNestedImmutableBean.setAttribute1("one");
-        flattenedNestedImmutableBean.setAbstractNestedImmutable(abstractNestedImmutable);
-
-        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(flattenedNestedImmutableBean, false);
-        assertThat(itemMap.size(), is(4));
-        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
-        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
-        assertThat(itemMap, hasEntry("attribute2", AttributeValue.fromNul(true)));
-        assertThat(itemMap, hasEntry("abstractNestedImmutableOne", AttributeValue.fromNul(true)));
-    }
-
     @Test
     public void documentBean_correctlyMapsBeanAttributes() {
         BeanTableSchema<DocumentBean> beanTableSchema = BeanTableSchema.create(DocumentBean.class);

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

@@ -1388,24 +1388,6 @@ public void buildAbstractWithFlatten() {
                    is(singletonMap("documentString", AttributeValue.builder().s("test-string").build())));
     }
 
-    @Test
-    public void buildAbstractWithFlattenAndIgnoreNullAsFalse() {
-        StaticTableSchema<FakeMappedItem> tableSchema =
-            StaticTableSchema.builder(FakeMappedItem.class)
-                             .flatten(FAKE_DOCUMENT_TABLE_SCHEMA,
-                                      FakeMappedItem::getAFakeDocument,
-                                      FakeMappedItem::setAFakeDocument)
-                             .build();
-
-        FakeDocument document = FakeDocument.of("test-string", null);
-        FakeMappedItem item = FakeMappedItem.builder().aFakeDocument(document).build();
-
-        Map<String, AttributeValue> attributeMapWithNulls = tableSchema.itemToMap(item, false);
-        assertThat(attributeMapWithNulls.size(), is(2));
-        assertThat(attributeMapWithNulls, hasEntry("documentString", AttributeValue.builder().s("test-string").build()));
-        assertThat(attributeMapWithNulls, hasEntry("documentInteger", AttributeValue.fromNul(true)));
-    }
-
     @Test
     public void buildAbstractExtends() {
         StaticTableSchema<FakeAbstractSuperclass> superclassTableSchema =