Move Commons PropertyPath and TypeInformation types to core package.

See spring-projects/spring-data-commons#3393

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotPredicates.java

@@ -18,9 +18,10 @@
 import java.util.function.Predicate;
 
 import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.core.ReactiveWrappers;
+import org.springframework.data.core.ReactiveWrappers.ReactiveLibrary;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
-import org.springframework.data.util.ReactiveWrappers;
-import org.springframework.data.util.ReactiveWrappers.ReactiveLibrary;
 import org.springframework.data.util.TypeUtils;
 import org.springframework.util.ClassUtils;
 

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

@@ -27,19 +27,20 @@
 import org.bson.BsonNull;
 import org.bson.Document;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.EnvironmentCapable;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.core.PropertyPath;
 import org.springframework.data.expression.ValueEvaluationContext;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.mongodb.core.CollectionOptions.EncryptedFieldsOptions;

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

@@ -25,6 +25,8 @@
 
 import org.bson.Document;
 import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -45,7 +47,6 @@
 import org.springframework.data.mongodb.core.schema.QueryCharacteristic;
 import org.springframework.data.mongodb.core.schema.QueryCharacteristics;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

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

@@ -32,8 +32,8 @@
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 import org.jspecify.annotations.Nullable;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.data.core.PropertyPath;
+import org.springframework.data.core.PropertyReferenceException;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.CodecRegistryProvider;
 import org.springframework.data.mongodb.MongoExpression;

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

@@ -24,15 +24,16 @@
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.DefaultTypeMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
 import org.springframework.data.convert.TypeAliasAccessor;
 import org.springframework.data.convert.TypeInformationMapper;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.Alias;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.BasicDBList;

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

@@ -24,13 +24,14 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Reference;
+import org.springframework.data.core.PropertyPath;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PersistentPropertyPathAccessor;
-import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapperPropertyAccessorFactory;
 import org.springframework.data.mongodb.core.mapping.DocumentPointer;

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

@@ -40,6 +40,7 @@
 import org.bson.json.JsonReader;
 import org.bson.types.ObjectId;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.ApplicationContext;
@@ -58,6 +59,7 @@
 import org.springframework.data.convert.PropertyValueConverter;
 import org.springframework.data.convert.TypeMapper;
 import org.springframework.data.convert.ValueConversionContext;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.InstanceCreatorMetadata;
 import org.springframework.data.mapping.MappingException;
@@ -94,7 +96,6 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.util.Predicates;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
@@ -2147,12 +2148,12 @@ public FieldTypeInformation(MongoPersistentProperty property) {
 		}
 
 		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(Constructor constructor) {
+		public List<TypeInformation<?>> getParameterTypes(Constructor constructor) {
 			return persistentProperty.getTypeInformation().getParameterTypes(constructor);
 		}
 
 		@Override
-		public org.springframework.data.util.@Nullable TypeInformation<?> getProperty(String property) {
+		public @Nullable TypeInformation<?> getProperty(String property) {
 			return delegate.getProperty(property);
 		}
 
@@ -2162,7 +2163,7 @@ public boolean isCollectionLike() {
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getComponentType() {
+		public TypeInformation<?> getComponentType() {
 			return TypeInformation.of(persistentProperty.getFieldType());
 		}
 
@@ -2172,7 +2173,7 @@ public boolean isMap() {
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getMapValueType() {
+		public TypeInformation<?> getMapValueType() {
 			return TypeInformation.of(persistentProperty.getFieldType());
 		}
 
@@ -2187,37 +2188,37 @@ public TypeInformation<?> getRawTypeInformation() {
 		}
 
 		@Override
-		public org.springframework.data.util.@Nullable TypeInformation<?> getActualType() {
+		public @Nullable TypeInformation<?> getActualType() {
 			return delegate.getActualType();
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getReturnType(Method method) {
+		public TypeInformation<?> getReturnType(Method method) {
 			return delegate.getReturnType(method);
 		}
 
 		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(Method method) {
+		public List<TypeInformation<?>> getParameterTypes(Method method) {
 			return delegate.getParameterTypes(method);
 		}
 
 		@Override
-		public org.springframework.data.util.@Nullable TypeInformation<?> getSuperTypeInformation(Class superType) {
+		public @Nullable TypeInformation<?> getSuperTypeInformation(Class superType) {
 			return delegate.getSuperTypeInformation(superType);
 		}
 
 		@Override
-		public boolean isAssignableFrom(org.springframework.data.util.TypeInformation target) {
+		public boolean isAssignableFrom(TypeInformation target) {
 			return delegate.isAssignableFrom(target);
 		}
 
 		@Override
-		public List<org.springframework.data.util.TypeInformation<?>> getTypeArguments() {
+		public List<TypeInformation<?>> getTypeArguments() {
 			return delegate.getTypeArguments();
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<? extends S> specialize(TypeInformation<?> type) {
+		public TypeInformation<? extends S> specialize(TypeInformation<?> type) {
 			return delegate.specialize(type);
 		}
 

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

@@ -17,11 +17,12 @@
 
 import org.bson.conversions.Bson;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.convert.ValueConversionContext;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.model.PropertyValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.CheckReturnValue;
 
 /**

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

@@ -15,29 +15,30 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import com.mongodb.MongoClientSettings;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.convert.ConversionException;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.convert.EntityReader;
 import org.springframework.data.convert.TypeMapper;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mongodb.CodecRegistryProvider;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 import com.mongodb.DBRef;
+import com.mongodb.MongoClientSettings;
 
 /**
  * Central Mongo specific converter interface which combines {@link MongoWriter} and {@link EntityReader}.

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

@@ -29,6 +29,8 @@
 
 import org.bson.Document;
 import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher.NullHandler;
 import org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer;
@@ -44,7 +46,6 @@
 import org.springframework.data.mongodb.core.query.UntypedExampleMatcher;
 import org.springframework.data.mongodb.util.DotPath;
 import org.springframework.data.support.ExampleMatcherAccessor;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;