Make DynamodbAttributeValueTransformer v1 and v2 return empty list instead of null for empty list attribute. (#309)

cayua · web-flow · commit 01b728698c46 · 2022-02-03T11:43:28.000Z
diff --git a/aws-lambda-java-events-sdk-transformer/src/main/java/com/amazonaws/services/lambda/runtime/events/transformers/v1/dynamodb/DynamodbAttributeValueTransformer.java b/aws-lambda-java-events-sdk-transformer/src/main/java/com/amazonaws/services/lambda/runtime/events/transformers/v1/dynamodb/DynamodbAttributeValueTransformer.java
@@ -2,6 +2,7 @@
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -40,7 +41,7 @@ public static AttributeValue toAttributeValueV1(final com.amazonaws.services.lam
         } else if (Objects.nonNull(value.getL())) {
             return new AttributeValue()
                     .withL(value.getL().isEmpty()
-                            ? null
+                            ? Collections.emptyList()
                             : value.getL().stream()
                                 .map(DynamodbAttributeValueTransformer::toAttributeValueV1)
                                 .collect(Collectors.toList()));
diff --git a/aws-lambda-java-events-sdk-transformer/src/main/java/com/amazonaws/services/lambda/runtime/events/transformers/v2/dynamodb/DynamodbAttributeValueTransformer.java b/aws-lambda-java-events-sdk-transformer/src/main/java/com/amazonaws/services/lambda/runtime/events/transformers/v2/dynamodb/DynamodbAttributeValueTransformer.java
@@ -3,6 +3,7 @@
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -52,7 +53,7 @@ public static AttributeValue toAttributeValueV2(final com.amazonaws.services.lam
         } else if (Objects.nonNull(value.getL())) {
             return AttributeValue.builder()
                     .l(value.getL().isEmpty()
-                            ? null
+                            ? Collections.emptyList()
                             : value.getL().stream()
                                 .map(DynamodbAttributeValueTransformer::toAttributeValueV2)
                                 .collect(Collectors.toList()))
diff --git a/aws-lambda-java-events-sdk-transformer/src/test/java/com/amazonaws/services/lambda/runtime/events/transformers/v1/dynamodb/DynamodbAttributeValueTransformerTest.java b/aws-lambda-java-events-sdk-transformer/src/test/java/com/amazonaws/services/lambda/runtime/events/transformers/v1/dynamodb/DynamodbAttributeValueTransformerTest.java
@@ -303,7 +303,7 @@ public void testToAttributeValueV1_EmptyV1ObjectWhenEmpty_BS() {
     @Test
     public void testToAttributeValueV1_EmptyV1ObjectWhenEmpty_L() {
         com.amazonaws.services.dynamodbv2.model.AttributeValue expectedAttributeValue_v1 =
-                new com.amazonaws.services.dynamodbv2.model.AttributeValue();
+                new com.amazonaws.services.dynamodbv2.model.AttributeValue().withL(Collections.emptyList());
         Assertions.assertEquals(expectedAttributeValue_v1,
                 DynamodbAttributeValueTransformer.toAttributeValueV1(new AttributeValue().withL()));
         Assertions.assertEquals(expectedAttributeValue_v1,
diff --git a/aws-lambda-java-events-sdk-transformer/src/test/java/com/amazonaws/services/lambda/runtime/events/transformers/v2/dynamodb/DynamodbAttributeValueTransformerTest.java b/aws-lambda-java-events-sdk-transformer/src/test/java/com/amazonaws/services/lambda/runtime/events/transformers/v2/dynamodb/DynamodbAttributeValueTransformerTest.java
@@ -307,7 +307,7 @@ public void testToAttributeValueV2_EmptyV2ObjectWhenEmpty_BS() {
     @Test
     public void testToAttributeValueV2_EmptyV2ObjectWhenEmpty_L() {
         software.amazon.awssdk.services.dynamodb.model.AttributeValue expectedAttributeValue_v2 =
-                software.amazon.awssdk.services.dynamodb.model.AttributeValue.builder().build();
+                software.amazon.awssdk.services.dynamodb.model.AttributeValue.builder().l(Collections.emptyList()).build();
         Assertions.assertEquals(expectedAttributeValue_v2,
                 DynamodbAttributeValueTransformer.toAttributeValueV2(new AttributeValue().withL()));
         Assertions.assertEquals(expectedAttributeValue_v2,
