Updated Null check in the conveter itself while iterating Arrays of AttributeValue

Author: joviegas

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/document/DocumentUnmarshaller.java

@@ -50,7 +50,7 @@ public Document visitString(String string) {
     @Override
     public Document visitArray(List<JsonNode> array) {
         return Document.fromList(array.stream()
-                                      .map(node -> node == null ? Document.fromNull() : node.visit(this))
+                                      .map(node -> node.visit(this))
                                       .collect(Collectors.toList()));
     }
 

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/document/EnhancedDocument.java

@@ -449,7 +449,7 @@ interface Builder {
         Builder addJson(String attributeName, String json);
 
         /**
-         * Appends an attribute of name attributeName with specified value of the give EnhancedDocument.
+         * Appends an attribute of name attributeName with specified value of the given EnhancedDocument.
          * @param attributeName Name of the attribute that needs to be added in the Document.
          * @param enhancedDocument that needs to be added as a value to a key attribute.
          * @return Builder instance to construct a {@link EnhancedDocument}

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonItemAttributeConverter.java

@@ -67,8 +67,8 @@ public AttributeValueType attributeValueType() {
 
     @Override
     public AttributeValue transformFrom(JsonNode input) {
-        JsonNodeToAttributeValueMapConvertor jsonNodeToAttributeValueMapConvertor = new JsonNodeToAttributeValueMapConvertor();
-        return input.visit(jsonNodeToAttributeValueMapConvertor);
+        JsonNodeToAttributeValueMapConverter attributeValueMapConverter = JsonNodeToAttributeValueMapConverter.instance();
+        return input.visit(attributeValueMapConverter);
     }
 
     @Override
@@ -132,8 +132,10 @@ public JsonNode convertSetOfBytes(List<SdkBytes> value) {
         @Override
         public JsonNode convertListOfAttributeValues(List<AttributeValue> value) {
             return new ArrayJsonNode(value.stream().map(
-                attributeValue -> EnhancedAttributeValue.fromAttributeValue(
-                    attributeValue).convert(VISITOR)).collect(Collectors.toList()));
+                attributeValue -> {
+                    EnhancedAttributeValue enhancedAttributeValue = EnhancedAttributeValue.fromAttributeValue(attributeValue);
+                    return enhancedAttributeValue.isNull() ? NullJsonNode.instance() : enhancedAttributeValue.convert(VISITOR);
+                }).collect(Collectors.toList()));
 
         }
     }

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonNodeToAttributeValueMapConvertor.java renamed to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/JsonNodeToAttributeValueMapConverter.java

@@ -25,7 +25,19 @@
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
 @SdkInternalApi
-public class JsonNodeToAttributeValueMapConvertor implements JsonNodeVisitor<AttributeValue> {
+public class JsonNodeToAttributeValueMapConverter implements JsonNodeVisitor<AttributeValue> {
+
+    private JsonNodeToAttributeValueMapConverter(){
+    }
+
+    private static JsonNodeToAttributeValueMapConverter INSTANCE = new JsonNodeToAttributeValueMapConverter();
+
+    public static JsonNodeToAttributeValueMapConverter instance(){
+        return INSTANCE;
+    }
+
+
+
     @Override
     public AttributeValue visitNull() {
         return AttributeValue.builder().build();