Fixed DynamoDbEnhancedClient TableSchema::itemToMap to handle flatten…

…ed members when ignoreNulls is false
aws · Feb 25, 2025 · e74034a · e74034a
1 parent 76d3d0b
commit e74034a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.changes/next-release/bugfix-AmazonDynamoDBEnhancedClient-752432f.json b/.changes/next-release/bugfix-AmazonDynamoDBEnhancedClient-752432f.json
@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "Amazon DynamoDB Enhanced Client",
+    "contributor": "",
+    "description": "Fixed DynamoDbEnhancedClient TableSchema::itemToMap to return a map that contains a consistent representation of null top-level (non-flattened) attributes and flattened attributes when their enclosing member is null and ignoreNulls is set to false."
+}
diff --git a/...main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java b/...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) {
+            if (otherItem == null && ignoreNulls) {
                 return Collections.emptyMap();
             }
 
@@ -515,7 +515,9 @@ public Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
 
         attributeMappers.forEach(attributeMapper -> {
             String attributeKey = attributeMapper.attributeName();
-            AttributeValue attributeValue = attributeMapper.attributeGetterMethod().apply(item);
+            AttributeValue attributeValue = item == null ?
+                                            AttributeValue.fromNul(true) :
+                                            attributeMapper.attributeGetterMethod().apply(item);
 
             if (!ignoreNulls || !isNullAttributeValue(attributeValue)) {
                 attributeValueMap.put(attributeKey, attributeValue);

diff --git a/.../java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaTest.java b/.../java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaTest.java
@@ -1386,6 +1386,11 @@ public void buildAbstractWithFlatten() {
 
         assertThat(tableSchema.itemToMap(item, true),
                    is(singletonMap("documentString", AttributeValue.builder().s("test-string").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