switch conversion from property to type information

Author: christophstrobl

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

@@ -63,9 +63,9 @@
 import org.springframework.data.mapping.model.SpELExpressionParameterValueProvider;
 import org.springframework.data.mongodb.CodecRegistryProvider;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.mapping.DocumentPointer;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.mapping.DocumentPointer;
 import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.mapping.Unwrapped.OnEmpty;
 import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
@@ -364,7 +364,7 @@ private <S extends Object> S read(ConversionContext context, MongoPersistentEnti
 		SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(bson, spELContext);
 		DocumentAccessor documentAccessor = new DocumentAccessor(bson);
 
-		if(bson.get("_id") != null) {
+		if (bson.get("_id") != null) {
 
 			Object existing = context.getPath().getPathItem(bson.get("_id"), entity.getCollection(), entity.getType());
 			if (existing != null) {
@@ -458,7 +458,8 @@ private void readProperties(ConversionContext context, MongoPersistentEntity<?>
 					callback = getDbRefResolverCallback(context, documentAccessor, evaluator);
 				}
 
-				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback, context, evaluator);
+				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback, context,
+						evaluator);
 				continue;
 			}
 
@@ -485,7 +486,8 @@ private void readProperties(ConversionContext context, MongoPersistentEntity<?>
 					callback = getDbRefResolverCallback(context, documentAccessor, evaluator);
 				}
 
-				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback, context, evaluator);
+				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback, context,
+						evaluator);
 				continue;
 			}
 
@@ -501,7 +503,8 @@ private DbRefResolverCallback getDbRefResolverCallback(ConversionContext context
 	}
 
 	private void readAssociation(Association<MongoPersistentProperty> association, PersistentPropertyAccessor<?> accessor,
-			DocumentAccessor documentAccessor, DbRefProxyHandler handler, DbRefResolverCallback callback, ConversionContext context, SpELExpressionEvaluator evaluator) {
+			DocumentAccessor documentAccessor, DbRefProxyHandler handler, DbRefResolverCallback callback,
+			ConversionContext context, SpELExpressionEvaluator evaluator) {
 
 		MongoPersistentProperty property = association.getInverse();
 		final Object value = documentAccessor.get(property);
@@ -524,13 +527,16 @@ public Object getPointer() {
 					}
 				}, property.getActualType()));
 			} else {
-				accessor.setProperty(property, dbRefResolver.resolveReference(property, value, referenceReader,
-						(document, prop) -> context.convert(document, prop.getTypeInformation())));
+				accessor.setProperty(property,
+						dbRefResolver.resolveReference(property, value, referenceReader, context::convert));
 			}
 			return;
 		}
 
 		DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
+
+		// TODO: accessor.setProperty(property, dbRefResolver.resolveReference(property, value, referenceReader,
+		// context::convert));
 		accessor.setProperty(property, dbRefResolver.resolveDbRef(property, dbref, callback, handler));
 	}
 
@@ -863,15 +869,15 @@ protected Bson createMap(Map<Object, Object> map, MongoPersistentProperty proper
 			if (conversions.isSimpleType(key.getClass())) {
 
 				String simpleKey = prepareMapKey(key.toString());
-				if(property.isDbReference()) {
+				if (property.isDbReference()) {
 					document.put(simpleKey, value != null ? createDBRef(value, property) : null);
 				} else {
 					if (conversionService.canConvert(value.getClass(), DocumentPointer.class)) {
 						document.put(simpleKey, conversionService.convert(value, DocumentPointer.class).getPointer());
 					} else {
 						// just take the id as a reference
-						document.put(simpleKey, mappingContext.getPersistentEntity(property.getAssociationTargetType()).getIdentifierAccessor(value)
-								.getIdentifier());
+						document.put(simpleKey, mappingContext.getPersistentEntity(property.getAssociationTargetType())
+								.getIdentifierAccessor(value).getIdentifier());
 					}
 				}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceReader.java

@@ -90,10 +90,10 @@ Object readReference(MongoPersistentProperty property, Object value, LookupFunct
 		}
 
 		if (property.isCollectionLike()) {
-			return resultConversionFunction.apply(result, property);
+			return resultConversionFunction.apply(result, property.getTypeInformation());
 		}
 
-		return resultConversionFunction.apply(result.iterator().next(), property);
+		return resultConversionFunction.apply(result.iterator().next(), property.getTypeInformation());
 	}
 
 	private ReferenceCollection computeReferenceContext(MongoPersistentProperty property, Object value,

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceResolver.java

@@ -20,6 +20,7 @@
 import org.bson.Document;
 import org.springframework.data.mongodb.core.convert.ReferenceLoader.DocumentReferenceQuery;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 
 import com.mongodb.DBRef;
@@ -82,6 +83,6 @@ interface LookupFunction {
 
 	@FunctionalInterface
 	interface ResultConversionFunction {
-		Object apply(Object source, MongoPersistentProperty property);
+		Object apply(Object source, TypeInformation property);
 	}
 }