mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1916 - Fix potential ClassCastException in MappingMongoConverter#writeInternal when writing collections.

Browse Source 
Original pull request: #547.
This commit is contained in:
Christoph Strobl
2018-04-03 10:06:54 +02:00
committed by Mark Paluch
parent f6ca0049b6
commit cbc923c727
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
View File

@@ -428,7 +428,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
} }
if (Collection.class.isAssignableFrom(entityType)) { if (Collection.class.isAssignableFrom(entityType)) {
writeCollectionInternal((Collection<?>) obj, ClassTypeInformation.LIST, (BasicDBList) bson); writeCollectionInternal((Collection<?>) obj, ClassTypeInformation.LIST, (Collection) bson);
return; return;
} }
@@ -654,17 +654,19 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
} }
/** /**
* Populates the given {@link BasicDBList} with values from the given {@link Collection}. * Populates the given {@link Collection sink} with converted values from the given {@link Collection source}.
* *
* @param source the collection to create a {@link BasicDBList} for, must not be {@literal null}. * @param source the collection to create a {@link Collection} for, must not be {@literal null}.
* @param type the {@link TypeInformation} to consider or {@literal null} if unknown. * @param type the {@link TypeInformation} to consider or {@literal null} if unknown.
* @param sink the {@link BasicDBList} to write to. * @param sink the {@link Collection} to write to.
* @return * @return
*/ */
private BasicDBList writeCollectionInternal(Collection<?> source, TypeInformation<?> type, BasicDBList sink) { private List<Object> writeCollectionInternal(Collection<?> source, TypeInformation<?> type, Collection sink) {
TypeInformation<?> componentType = null; TypeInformation<?> componentType = null;
List<Object> collection = sink instanceof List ? (List) sink : new ArrayList<>(sink);
if (type != null) { if (type != null) {
componentType = type.getComponentType(); componentType = type.getComponentType();
} }
@@ -674,17 +676,17 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
Class<?> elementType = element == null ? null : element.getClass(); Class<?> elementType = element == null ? null : element.getClass();
if (elementType == null || conversions.isSimpleType(elementType)) { if (elementType == null || conversions.isSimpleType(elementType)) {
sink.add(getPotentiallyConvertedSimpleWrite(element)); collection.add(getPotentiallyConvertedSimpleWrite(element));
} else if (element instanceof Collection || elementType.isArray()) { } else if (element instanceof Collection || elementType.isArray()) {
sink.add(writeCollectionInternal(asCollection(element), componentType, new BasicDBList())); collection.add(writeCollectionInternal(asCollection(element), componentType, new BasicDBList()));
} else { } else {
Document document = new Document(); Document document = new Document();
writeInternal(element, document, componentType); writeInternal(element, document, componentType);
sink.add(document); collection.add(document);
} }
} }
return sink; return collection;
} }
/** /**