Skip to content

Commit f12648a

Browse files
committed
Adapt to API changes regarding object creation metadata.
1 parent e812f89 commit f12648a

File tree

4 files changed

+12
-129
lines changed

4 files changed

+12
-129
lines changed

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

+4-22
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@
1717

1818
import java.lang.reflect.Constructor;
1919
import java.lang.reflect.Method;
20-
import java.util.ArrayList;
21-
import java.util.Arrays;
22-
import java.util.Collection;
23-
import java.util.Collections;
24-
import java.util.HashSet;
25-
import java.util.LinkedHashMap;
26-
import java.util.List;
27-
import java.util.Map;
28-
import java.util.Optional;
29-
import java.util.Set;
20+
import java.util.*;
3021
import java.util.function.Predicate;
3122
import java.util.stream.Collectors;
3223

@@ -38,7 +29,6 @@
3829
import org.bson.conversions.Bson;
3930
import org.bson.json.JsonReader;
4031
import org.bson.types.ObjectId;
41-
4232
import org.springframework.beans.BeansException;
4333
import org.springframework.beans.factory.BeanClassLoaderAware;
4434
import org.springframework.context.ApplicationContext;
@@ -49,16 +39,7 @@
4939
import org.springframework.data.annotation.Reference;
5040
import org.springframework.data.convert.CustomConversions;
5141
import org.springframework.data.convert.TypeMapper;
52-
import org.springframework.data.mapping.AccessOptions;
53-
import org.springframework.data.mapping.Association;
54-
import org.springframework.data.mapping.MappingException;
55-
import org.springframework.data.mapping.PersistentEntity;
56-
import org.springframework.data.mapping.PersistentProperty;
57-
import org.springframework.data.mapping.PersistentPropertyAccessor;
58-
import org.springframework.data.mapping.PersistentPropertyPath;
59-
import org.springframework.data.mapping.PersistentPropertyPathAccessor;
60-
import org.springframework.data.mapping.PreferredConstructor;
61-
import org.springframework.data.mapping.PreferredConstructor.Parameter;
42+
import org.springframework.data.mapping.*;
6243
import org.springframework.data.mapping.callback.EntityCallbacks;
6344
import org.springframework.data.mapping.context.MappingContext;
6445
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
@@ -687,7 +668,7 @@ private void readAssociation(Association<MongoPersistentProperty> association, P
687668
Object value = documentAccessor.get(property);
688669

689670
if (property.isDocumentReference()
690-
|| (!property.isDbReference() && property.findAnnotation(Reference.class) != null)) {
671+
|| !property.isDbReference() && property.findAnnotation(Reference.class) != null) {
691672

692673
// quite unusual but sounds like worth having?
693674

@@ -1952,6 +1933,7 @@ class AssociationAwareMongoDbPropertyValueProvider extends MongoDbPropertyValueP
19521933
super(context, source, evaluator);
19531934
}
19541935

1936+
@Override
19551937
@Nullable
19561938
@SuppressWarnings("unchecked")
19571939
public <T> T getPropertyValue(MongoPersistentProperty property) {

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,12 @@ public PreferredConstructor<T, MongoPersistentProperty> getPersistenceConstructo
104104
}
105105

106106
@Override
107-
public boolean isConstructorArgument(PersistentProperty<?> property) {
107+
public InstanceCreatorMetadata<MongoPersistentProperty> getInstanceCreatorMetadata() {
108+
return delegate.getInstanceCreatorMetadata();
109+
}
110+
111+
@Override
112+
public boolean isCreatorArgument(PersistentProperty<?> property) {
108113
return delegate.isConstructorArgument(property);
109114
}
110115

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

-105
This file was deleted.

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.reactivestreams.Publisher;
2222
import org.springframework.core.convert.converter.Converter;
23+
import org.springframework.data.convert.DtoInstantiatingConverter;
2324
import org.springframework.data.domain.Pageable;
2425
import org.springframework.data.domain.Range;
2526
import org.springframework.data.geo.Distance;
@@ -104,7 +105,7 @@ private boolean isStreamOfGeoResult() {
104105
}
105106

106107
TypeInformation<?> componentType = returnType.getComponentType();
107-
return componentType != null && GeoResult.class.equals(componentType.getType());
108+
return (componentType != null) && GeoResult.class.equals(componentType.getType());
108109
}
109110
}
110111

0 commit comments

Comments
 (0)