Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when traversing map.

Browse Source 
We now use regular iteration instead of the Stream API.

Closes: #4567
Original pull request: #4568
This commit is contained in:
Christoph Strobl
2023-11-24 14:48:39 +01:00
committed by Mark Paluch
parent e20d12fe34
commit 3dccdd2bc2
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
View File

@@ -617,15 +617,20 @@ public class QueryMapper {
if (source instanceof Map<?,?> sourceMap) {
return sourceMap.entrySet().stream().collect(Collectors.toMap(
entry -> ObjectUtils.nullSafeToString(converter.convertToMongoType(entry.getKey())),
entry -> {
if (entry.getValue() instanceof Document document) {
return getMappedObject(document, entity);
}
return delegateConvertToMongoType(entry.getValue(), entity);
}
));
Map<String, Object> map = new LinkedHashMap<>(sourceMap.size(), 1F);
sourceMap.entrySet().forEach(it -> {
String key = ObjectUtils.nullSafeToString(converter.convertToMongoType(it.getKey()));
if (it.getValue() instanceof Document document) {
map.put(key, getMappedObject(document, entity));
} else {
map.put(key, delegateConvertToMongoType(it.getValue(), entity));
}
});
return map;
}
return delegateConvertToMongoType(source, entity);

12
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
View File

@@ -762,6 +762,18 @@ class UpdateMapperUnitTests {
assertThat(mappedUpdate).doesNotContainKey("$set.concreteMap.jasnah._class");
}
@Test // GH-4567
void updateShouldAllowNullValuesInMap() {
Map<Object, NestedDocument> map = Collections.singletonMap("jasnah", new NestedDocument("kholin"));
Update update = new Update().set("concreteMap", Collections.singletonMap("jasnah", null));
Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
context.getPersistentEntity(EntityWithObjectMap.class));
assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("concreteMap", Collections.singletonMap("jasnah", null))));
}
@Test // DATAMONGO-1250
@SuppressWarnings("unchecked")
void mapsUpdateWithBothReadingAndWritingConverterRegistered() {