Skip to content

Commit cf36aa0

Browse files
S-Saranya1S-Saranya1
committed
Fix NPE for null values in Map and List attribute converters
1 parent cafa719 commit cf36aa0

4 files changed

Lines changed: 112 additions & 2 deletions

File tree

‎.changes/next-release/bugfix-AmazonDynamoDBEnhancedClient-f887fc6.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "bugfix",
3+
"category": "Amazon DynamoDB Enhanced Client",
4+
"contributor": "",
5+
"description": "Fix NullPointerException when converting null values in `Map` and `List` attributes by handling nulls in `MapAttributeConverter` and `ListAttributeConverter` before delegating to element converters. Fixes [#6639](https://github.com/aws/aws-sdk-java-v2/issues/6639)"
6+
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
3131
import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
3232
import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
33+
import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
3334
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
3435
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
3536

@@ -145,7 +146,9 @@ public AttributeValueType attributeValueType() {
145146
@Override
146147
public AttributeValue transformFrom(T input) {
147148
return EnhancedAttributeValue.fromListOfAttributeValues(input.stream()
148-
.map(elementConverter::transformFrom)
149+
.map(e -> e == null
150+
? AttributeValues.nullAttributeValue()
151+
: elementConverter.transformFrom(e))
149152
.collect(toList()))
150153
.toAttributeValue();
151154
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
3131
import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
3232
import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
33+
import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
3334
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
3435
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
3536
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
@@ -163,7 +164,9 @@ public EnhancedType<T> type() {
163164

164165
public EnhancedAttributeValue toAttributeValue(T input) {
165166
Map<String, AttributeValue> result = new LinkedHashMap<>();
166-
input.forEach((k, v) -> result.put(keyConverter.toString(k), valueConverter.transformFrom(v)));
167+
input.forEach((k, v) -> result.put(keyConverter.toString(k),
168+
v == null ? AttributeValues.nullAttributeValue()
169+
: valueConverter.transformFrom(v)));
167170
return EnhancedAttributeValue.fromMap(result);
168171
}
169172

‎services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/CollectionNullValueConverterTest.java‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
17+
18+
import static org.assertj.core.api.Assertions.assertThat;
19+
20+
import java.math.BigDecimal;
21+
import java.time.Instant;
22+
import java.util.Arrays;
23+
import java.util.HashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.stream.Stream;
27+
import org.junit.jupiter.params.ParameterizedTest;
28+
import org.junit.jupiter.params.provider.Arguments;
29+
import org.junit.jupiter.params.provider.MethodSource;
30+
import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
31+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BigDecimalAttributeConverter;
32+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BooleanAttributeConverter;
33+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DoubleAttributeConverter;
34+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.FloatAttributeConverter;
35+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter;
36+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.IntegerAttributeConverter;
37+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ListAttributeConverter;
38+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LongAttributeConverter;
39+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MapAttributeConverter;
40+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
41+
import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.StringStringConverter;
42+
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
43+
44+
/**
45+
* Verifies that {@link MapAttributeConverter} and {@link ListAttributeConverter} correctly handle null
46+
* values/elements by converting them to DynamoDB NULL type, regardless of the element converter type.
47+
*/
48+
public class CollectionNullValueConverterTest {
49+
50+
private static final AttributeValue NULL_ATTR = AttributeValue.builder().nul(true).build();
51+
52+
private static Stream<Arguments> elementConverters() {
53+
return Stream.of(
54+
Arguments.of("String", StringAttributeConverter.create()),
55+
Arguments.of("Boolean", BooleanAttributeConverter.create()),
56+
Arguments.of("Integer", IntegerAttributeConverter.create()),
57+
Arguments.of("Long", LongAttributeConverter.create()),
58+
Arguments.of("Float", FloatAttributeConverter.create()),
59+
Arguments.of("Double", DoubleAttributeConverter.create()),
60+
Arguments.of("BigDecimal", BigDecimalAttributeConverter.create()),
61+
Arguments.of("Instant", InstantAsStringAttributeConverter.create())
62+
);
63+
}
64+
65+
@ParameterizedTest(name = "Map with null {0} value produces DynamoDB NULL")
66+
@MethodSource("elementConverters")
67+
void mapConverter_nullValue_producesNullAttributeValue(String name, AttributeConverter<?> elementConverter) {
68+
@SuppressWarnings("unchecked")
69+
AttributeConverter<Object> converter = (AttributeConverter<Object>) elementConverter;
70+
MapAttributeConverter<Map<String, Object>> mapConverter =
71+
MapAttributeConverter.mapConverter(StringStringConverter.create(), converter);
72+
73+
Map<String, Object> input = new HashMap<>();
74+
input.put("key1", null);
75+
76+
AttributeValue result = mapConverter.transformFrom(input);
77+
78+
assertThat(result.hasM()).isTrue();
79+
assertThat(result.m().get("key1")).isEqualTo(NULL_ATTR);
80+
}
81+
82+
@ParameterizedTest(name = "List with null {0} element produces DynamoDB NULL")
83+
@MethodSource("elementConverters")
84+
void listConverter_nullElement_producesNullAttributeValue(String name, AttributeConverter<?> elementConverter) {
85+
@SuppressWarnings("unchecked")
86+
AttributeConverter<Object> converter = (AttributeConverter<Object>) elementConverter;
87+
ListAttributeConverter<List<Object>> listConverter = ListAttributeConverter.create(converter);
88+
89+
List<Object> input = Arrays.asList(null, null);
90+
91+
AttributeValue result = listConverter.transformFrom(input);
92+
93+
assertThat(result.hasL()).isTrue();
94+
assertThat(result.l()).hasSize(2);
95+
assertThat(result.l().get(0)).isEqualTo(NULL_ATTR);
96+
assertThat(result.l().get(1)).isEqualTo(NULL_ATTR);
97+
}
98+
}

0 commit comments

Comments
 (0)