Adapt to API changes regarding object creation metadata.

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

@@ -17,16 +17,7 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -38,7 +29,6 @@ import org.bson.codecs.DecoderContext;
 import org.bson.conversions.Bson;
 import org.bson.json.JsonReader;
 import org.bson.types.ObjectId;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.ApplicationContext;
@@ -49,16 +39,7 @@ import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.TypeMapper;
-import org.springframework.data.mapping.AccessOptions;
-import org.springframework.data.mapping.Association;
-import org.springframework.data.mapping.MappingException;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.mapping.PersistentPropertyPathAccessor;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.*;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
@@ -687,7 +668,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		Object value = documentAccessor.get(property);
 
 		if (property.isDocumentReference()
-				|| (!property.isDbReference() && property.findAnnotation(Reference.class) != null)) {
+				|| !property.isDbReference() && property.findAnnotation(Reference.class) != null) {
 
 			// quite unusual but sounds like worth having?
 
@@ -1952,6 +1933,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			super(context, source, evaluator);
 		}
 
+		@Override
 		@Nullable
 		@SuppressWarnings("unchecked")
 		public <T> T getPropertyValue(MongoPersistentProperty property) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentEntity.java

@@ -104,7 +104,12 @@ class UnwrappedMongoPersistentEntity<T> implements MongoPersistentEntity<T> {
 	}
 
 	@Override
-	public boolean isConstructorArgument(PersistentProperty<?> property) {
+	public InstanceCreatorMetadata<MongoPersistentProperty> getInstanceCreatorMetadata() {
+		return delegate.getInstanceCreatorMetadata();
+	}
+
+	@Override
+	public boolean isCreatorArgument(PersistentProperty<?> property) {
 		return delegate.isConstructorArgument(property);
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java

@@ -1,105 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.repository.query;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
-import org.springframework.data.mapping.SimplePropertyHandler;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.EntityInstantiator;
-import org.springframework.data.mapping.model.EntityInstantiators;
-import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-
-/**
- * {@link Converter} to instantiate DTOs from fully equipped domain objects.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-class DtoInstantiatingConverter implements Converter<Object, Object> {
-
-	private final Class<?> targetType;
-	private final MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> context;
-	private final EntityInstantiator instantiator;
-
-	/**
-	 * Creates a new {@link Converter} to instantiate DTOs.
-	 *
-	 * @param dtoType must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @param entityInstantiators must not be {@literal null}.
-	 */
-	public DtoInstantiatingConverter(Class<?> dtoType,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
-			EntityInstantiators entityInstantiators) {
-
-		Assert.notNull(dtoType, "DTO type must not be null!");
-		Assert.notNull(context, "MappingContext must not be null!");
-		Assert.notNull(entityInstantiators, "EntityInstantiators must not be null!");
-
-		this.targetType = dtoType;
-		this.context = context;
-		this.instantiator = entityInstantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
-	}
-
-	@Override
-	public Object convert(Object source) {
-
-		if (targetType.isInterface()) {
-			return source;
-		}
-
-		final PersistentEntity<?, ?> sourceEntity = context.getRequiredPersistentEntity(source.getClass());
-		final PersistentPropertyAccessor sourceAccessor = sourceEntity.getPropertyAccessor(source);
-		final PersistentEntity<?, ?> targetEntity = context.getRequiredPersistentEntity(targetType);
-		final PreferredConstructor<?, ? extends PersistentProperty<?>> constructor = targetEntity
-				.getPersistenceConstructor();
-
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		Object dto = instantiator.createInstance(targetEntity, new ParameterValueProvider() {
-
-			@Override
-			public Object getParameterValue(Parameter parameter) {
-				return sourceAccessor.getProperty(sourceEntity.getPersistentProperty(parameter.getName().toString()));
-			}
-		});
-
-		final PersistentPropertyAccessor dtoAccessor = targetEntity.getPropertyAccessor(dto);
-
-		targetEntity.doWithProperties(new SimplePropertyHandler() {
-
-			@Override
-			public void doWithPersistentProperty(PersistentProperty<?> property) {
-
-				if (constructor.isConstructorParameter(property)) {
-					return;
-				}
-
-				dtoAccessor.setProperty(property,
-						sourceAccessor.getProperty(sourceEntity.getPersistentProperty(property.getName())));
-			}
-		});
-
-		return dto;
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java

@@ -20,6 +20,7 @@ import reactor.core.publisher.Mono;
 
 import org.reactivestreams.Publisher;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.DtoInstantiatingConverter;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
 import org.springframework.data.geo.Distance;
@@ -104,7 +105,7 @@ interface ReactiveMongoQueryExecution {
 			}
 
 			TypeInformation<?> componentType = returnType.getComponentType();
-			return componentType != null && GeoResult.class.equals(componentType.getType());
+			return (componentType != null) && GeoResult.class.equals(componentType.getType());
 		}
 	}