Skip to content

Empty beans are now preserved through serialization and deserialization #2334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Empty beans are now preserved through serialization and deserialization #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6134722
Empty beans are now preserved through serialization and deserialization
Mar 15, 2021
34ef057
Merge branch 'master' into master
reed53 Mar 15, 2021
5c2834f
Merge branch 'master' into master
reed53 Mar 15, 2021
588ff7d
Merge branch 'master' into master
reed53 Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AmazonDynamoDBEnhanced-dbd1477.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"category": "Amazon DynamoDB Enhanced",
"contributor": "reed53",
"type": "bugfix",
"description": "Empty beans are now preserved through serialization and deserialization"
}
8 changes: 2 additions & 6 deletions ...main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,7 @@ public StaticTableMetadata tableMetadata() {

@Override
public T mapToItem(Map<String, AttributeValue> attributeMap) {
// Lazily instantiate the builder once we have an attribute to write
B builder = null;
B builder = constructNewBuilder();
Map<FlattenedMapper<T, B, ?>, Map<String, AttributeValue>> flattenedAttributeValuesMap = new LinkedHashMap<>();

for (Map.Entry<String, AttributeValue> entry : attributeMap.entrySet()) {
Expand All @@ -451,9 +450,6 @@ public T mapToItem(Map<String, AttributeValue> attributeMap) {
ResolvedImmutableAttribute<T, B> attributeMapper = indexedMappers.get(key);

if (attributeMapper != null) {
if (builder == null) {
builder = constructNewBuilder();
}

attributeMapper.updateItemMethod().accept(builder, value);
} else {
Expand All @@ -479,7 +475,7 @@ public T mapToItem(Map<String, AttributeValue> attributeMap) {
builder = entry.getKey().mapToItem(builder, this::constructNewBuilder, entry.getValue());
}

return builder == null ? null : buildItemFunction.apply(builder);
return buildItemFunction.apply(builder);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion .../java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,7 +1499,7 @@ private <R> void verifyNullAttribute(EnhancedType<R> attributeType,
assertThat(resultMap, is(expectedMap));

FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
assertThat(resultItem, is(nullValue()));
assertThat(resultItem, is(FakeMappedItem.builder().build()));
}

private <R> void verifyNullableAttribute(EnhancedType<R> attributeType,
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ private <R> void verifyNullAttribute(EnhancedType<R> attributeType,
assertThat(resultMap, is(expectedMap));

FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
assertThat(resultItem, is(nullValue()));
assertThat(resultItem, is(FakeMappedItem.builder().build()));
}

private <R> void verifyNullableAttribute(EnhancedType<R> attributeType,
Expand Down