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

DATAMONGO-1904 - Optimizations in MappingMongoConverter.readCollectionOrArray(…).

Browse Source 
Switched to ClassUtils.isAssignableValue(…) in getPotentiallyConvertedSimpleRead(…) as it transparently handles primitives and their wrapper types so that we can avoid the superfluous invocation of the converter infrastructure.
This commit is contained in:
Oliver Gierke
2018-03-15 15:03:37 +01:00
parent 35bbc604aa
commit 6b0b1cd97d
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -870,7 +870,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
private Object getPotentiallyConvertedSimpleRead(@Nullable Object value, Class<?> target) { private Object getPotentiallyConvertedSimpleRead(@Nullable Object value, Class<?> target) {
if (value == null || target == null || target.isAssignableFrom(value.getClass())) { if (value == null || target == null || ClassUtils.isAssignableValue(target, value)) {
return value; return value;
} }
@@ -933,58 +933,62 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
* Reads the given {@link BasicDBList} into a collection of the given {@link TypeInformation}. * Reads the given {@link BasicDBList} into a collection of the given {@link TypeInformation}.
* *
* @param targetType must not be {@literal null}. * @param targetType must not be {@literal null}.
* @param sourceValue must not be {@literal null}. * @param source must not be {@literal null}.
* @param path must not be {@literal null}. * @param path must not be {@literal null}.
* @return the converted {@link Collection} or array, will never be {@literal null}. * @return the converted {@link Collection} or array, will never be {@literal null}.
*/ */
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings("unchecked")
private Object readCollectionOrArray(TypeInformation<?> targetType, List sourceValue, ObjectPath path) { private Object readCollectionOrArray(TypeInformation<?> targetType, Collection<?> source, ObjectPath path) {
Assert.notNull(targetType, "Target type must not be null!"); Assert.notNull(targetType, "Target type must not be null!");
Assert.notNull(path, "Object path must not be null!"); Assert.notNull(path, "Object path must not be null!");
Class<?> collectionType = targetType.getType(); Class<?> collectionType = targetType.getType();
collectionType = Collection.class.isAssignableFrom(collectionType) //
? collectionType //
: List.class;
TypeInformation<?> componentType = targetType.getComponentType() != null ? targetType.getComponentType() TypeInformation<?> componentType = targetType.getComponentType() != null //
? targetType.getComponentType() //
: ClassTypeInformation.OBJECT; : ClassTypeInformation.OBJECT;
Class<?> rawComponentType = componentType.getType(); Class<?> rawComponentType = componentType.getType();
collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class; Collection<Object> items = targetType.getType().isArray() //
Collection<Object> items = targetType.getType().isArray() ? new ArrayList<>(sourceValue.size()) ? new ArrayList<>(source.size()) //
: CollectionFactory.createCollection(collectionType, rawComponentType, sourceValue.size()); : CollectionFactory.createCollection(collectionType, rawComponentType, source.size());
if (sourceValue.isEmpty()) { if (source.isEmpty()) {
return getPotentiallyConvertedSimpleRead(items, targetType.getType()); return getPotentiallyConvertedSimpleRead(items, targetType.getType());
} }
if (!DBRef.class.equals(rawComponentType) && isCollectionOfDbRefWhereBulkFetchIsPossible(sourceValue)) { if (!DBRef.class.equals(rawComponentType) && isCollectionOfDbRefWhereBulkFetchIsPossible(source)) {
List<Object> objects = bulkReadAndConvertDBRefs((List<DBRef>) sourceValue, componentType, path, rawComponentType); List<Object> objects = bulkReadAndConvertDBRefs((List<DBRef>) source, componentType, path, rawComponentType);
return getPotentiallyConvertedSimpleRead(objects, targetType.getType()); return getPotentiallyConvertedSimpleRead(objects, targetType.getType());
} }
for (Object dbObjItem : sourceValue) { for (Object element : source) {
if (dbObjItem instanceof DBRef) { if (element instanceof DBRef) {
items.add(DBRef.class.equals(rawComponentType) ? dbObjItem items.add(DBRef.class.equals(rawComponentType) ? element
: readAndConvertDBRef((DBRef) dbObjItem, componentType, path, rawComponentType)); : readAndConvertDBRef((DBRef) element, componentType, path, rawComponentType));
} else if (dbObjItem instanceof Document) { } else if (element instanceof Document) {
items.add(read(componentType, (Document) dbObjItem, path)); items.add(read(componentType, (Document) element, path));
} else if (dbObjItem instanceof BasicDBObject) { } else if (element instanceof BasicDBObject) {
items.add(read(componentType, (BasicDBObject) dbObjItem, path)); items.add(read(componentType, (BasicDBObject) element, path));
} else { } else {
if (dbObjItem instanceof Collection) { if (element instanceof Collection) {
if (!rawComponentType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawComponentType)) { if (!rawComponentType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawComponentType)) {
throw new MappingException( throw new MappingException(
String.format(INCOMPATIBLE_TYPES, dbObjItem, dbObjItem.getClass(), rawComponentType, path)); String.format(INCOMPATIBLE_TYPES, element, element.getClass(), rawComponentType, path));
} }
} }
if (dbObjItem instanceof List) { if (element instanceof List) {
items.add(readCollectionOrArray(componentType, (List) dbObjItem, path)); items.add(readCollectionOrArray(componentType, (Collection<Object>) element, path));
} else { } else {
items.add(getPotentiallyConvertedSimpleRead(dbObjItem, rawComponentType)); items.add(getPotentiallyConvertedSimpleRead(element, rawComponentType));
} }
} }
} }
@@ -1045,8 +1049,8 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
map.put(key, DBRef.class.equals(rawValueType) ? value map.put(key, DBRef.class.equals(rawValueType) ? value
: readAndConvertDBRef((DBRef) value, defaultedValueType, ObjectPath.ROOT, rawValueType)); : readAndConvertDBRef((DBRef) value, defaultedValueType, ObjectPath.ROOT, rawValueType));
} else if (value instanceof List) { } else if (value instanceof List) {
map.put(key, map.put(key, readCollectionOrArray(valueType != null ? valueType : ClassTypeInformation.LIST,
readCollectionOrArray(valueType != null ? valueType : ClassTypeInformation.LIST, (List) value, path)); (List<Object>) value, path));
} else { } else {
map.put(key, getPotentiallyConvertedSimpleRead(value, rawValueType)); map.put(key, getPotentiallyConvertedSimpleRead(value, rawValueType));
} }
@@ -1084,8 +1088,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
"Cannot add key/value pair to %s. as map. Given Bson must be a Document or DBObject!", bson.getClass())); "Cannot add key/value pair to %s. as map. Given Bson must be a Document or DBObject!", bson.getClass()));
} }
@SuppressWarnings("unchecked") private static void addAllToMap(Bson bson, Map<String, ?> value) {
private static void addAllToMap(Bson bson, Map value) {
if (bson instanceof Document) { if (bson instanceof Document) {
((Document) bson).putAll(value); ((Document) bson).putAll(value);
@@ -1219,6 +1222,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
* @param recursively whether to apply the removal recursively * @param recursively whether to apply the removal recursively
* @return * @return
*/ */
@SuppressWarnings("unchecked")
private Object removeTypeInfo(Object object, boolean recursively) { private Object removeTypeInfo(Object object, boolean recursively) {
if (!(object instanceof Document)) { if (!(object instanceof Document)) {
@@ -1239,7 +1243,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
removeTypeInfo(element, recursively); removeTypeInfo(element, recursively);
} }
} else if (value instanceof List) { } else if (value instanceof List) {
for (Object element : (List) value) { for (Object element : (List<Object>) value) {
removeTypeInfo(element, recursively); removeTypeInfo(element, recursively);
} }
} else { } else {
@@ -1379,7 +1383,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
} else if (value instanceof DBRef) { } else if (value instanceof DBRef) {
return potentiallyReadOrResolveDbRef((DBRef) value, type, path, rawType); return potentiallyReadOrResolveDbRef((DBRef) value, type, path, rawType);
} else if (value instanceof List) { } else if (value instanceof List) {
return (T) readCollectionOrArray(type, (List) value, path); return (T) readCollectionOrArray(type, (List<Object>) value, path);
} else if (value instanceof Document) { } else if (value instanceof Document) {
return (T) read(type, (Document) value, path); return (T) read(type, (Document) value, path);
} else if (value instanceof DBObject) { } else if (value instanceof DBObject) {
@@ -1495,7 +1499,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
* @param source must not be {@literal null}. * @param source must not be {@literal null}.
* @return * @return
*/ */
private static boolean isCollectionOfDbRefWhereBulkFetchIsPossible(Iterable<Object> source) { private static boolean isCollectionOfDbRefWhereBulkFetchIsPossible(Iterable<?> source) {
Assert.notNull(source, "Iterable of DBRefs must not be null!"); Assert.notNull(source, "Iterable of DBRefs must not be null!");