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

DATAMONGO-2011 - Relax type check when mapping collections.

Browse Source 
Original pull request: #587.
This commit is contained in:
Christoph Strobl
2018-07-13 11:01:21 +02:00
committed by Oliver Gierke
parent 6f011b0fa1
commit 4d309bd7f0
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -980,13 +980,12 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
items.add(read(componentType, (BasicDBObject) element, path));
} else {
if (element instanceof Collection) {
if (!Object.class.equals(rawComponentType) && element instanceof Collection) {
if (!rawComponentType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawComponentType)) {
throw new MappingException(
String.format(INCOMPATIBLE_TYPES, element, element.getClass(), rawComponentType, path));
}
}
if (element instanceof List) {
items.add(readCollectionOrArray(componentType, (Collection<Object>) element, path));
} else {

9
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
View File

@@ -1886,6 +1886,15 @@ public class MappingMongoConverterUnitTests {
assertThat(result.nestedFloats).isEqualTo(new float[][][] { { { 1.0f, 2.0f } } });
}
@Test // DATAMONGO-2011
public void readsNestedListsToObjectCorrectly() {
List<String> values = Arrays.asList("ONE", "TWO");
org.bson.Document source = new org.bson.Document("value", Collections.singletonList(values));
assertThat(converter.read(Attribute.class, source).value).isInstanceOf(List.class);
}
static class GenericType<T> {
T content;
}