Post-rebase.

Author: mp911de

src/main/java/org/springframework/data/mapping/TypedPropertyPath.java renamed to src/main/java/org/springframework/data/core/TypedPropertyPath.java

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.core;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Iterator;
 
 import org.jspecify.annotations.Nullable;
-import org.springframework.data.util.TypeInformation;
 
 /**
  * Type-safe representation of a property path expressed through method references.
@@ -32,13 +31,13 @@
  * <p>
  * Typed property paths can be created directly they are accepted used or conveniently using the static factory method
  * {@link #of(TypedPropertyPath)} with method references:
- * 
+ *
  * <pre class="code">
  * PropertyPath.of(Person::getName);
  * </pre>
- * 
+ *
  * Property paths can be composed to navigate nested properties using {@link #then(TypedPropertyPath)}:
- * 
+ *
  * <pre class="code">
  * PropertyPath.of(Person::getAddress).then(Address::getCountry).then(Country::getName);
  * </pre>
@@ -56,7 +55,7 @@
  * <p>
  * Note that using lambda expressions requires bytecode analysis of the declaration site classes and therefore presence
  * of their class files.
- * 
+ *
  * @param <T> the owning type of the property path segment, but typically the root type for composed property paths.
  * @param <P> the property value type at this path segment.
  * @author Mark Paluch

src/main/java/org/springframework/data/mapping/TypedPropertyPaths.java renamed to src/main/java/org/springframework/data/core/TypedPropertyPaths.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.core;
 
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
@@ -46,8 +46,6 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.ResolvableType;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.mapping.model.Property;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ObjectUtils;
@@ -59,7 +57,7 @@
 class TypedPropertyPaths {
 
 	private static final Map<ClassLoader, Map<Object, PropertyPathInformation>> lambdas = new WeakHashMap<>();
-	private static final Map<ClassLoader, Map<TypedPropertyPath, ResolvedTypedPropertyPath<?, ?>>> resolved = new WeakHashMap<>();
+	private static final Map<ClassLoader, Map<TypedPropertyPath<?, ?>, ResolvedTypedPropertyPath<?, ?>>> resolved = new WeakHashMap<>();
 
 	/**
 	 * Retrieve {@link PropertyPathInformation} for a given {@link TypedPropertyPath}.
@@ -92,7 +90,7 @@ public static <P, T> TypedPropertyPath<T, P> of(TypedPropertyPath<T, P> lambda)
 			return lambda;
 		}
 
-		Map<TypedPropertyPath, ResolvedTypedPropertyPath<?, ?>> cache;
+		Map<TypedPropertyPath<?, ?>, ResolvedTypedPropertyPath<?, ?>> cache;
 		synchronized (resolved) {
 			cache = resolved.computeIfAbsent(lambda.getClass().getClassLoader(), k -> new ConcurrentReferenceHashMap<>());
 		}
@@ -168,7 +166,7 @@ public static PropertyPathInformation ofFieldAccess(Class<?> owner, String field
 
 			Field field = ReflectionUtils.findField(owner, fieldName, fieldType);
 			if (field == null) {
-				throw new IllegalArgumentException("Field %s.%s() not found".formatted(owner.getName(), field));
+				throw new IllegalArgumentException("Field %s.%s() not found".formatted(owner.getName(), fieldName));
 			}
 
 			return new PropertyPathInformation(TypeInformation.of(owner),

src/main/java/org/springframework/data/domain/ExampleMatcher.java

@@ -25,7 +25,7 @@
 
 import org.jspecify.annotations.Nullable;
 
-import org.springframework.data.util.TypedPropertyPath;
+import org.springframework.data.core.TypedPropertyPath;
 import org.springframework.lang.CheckReturnValue;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/domain/Sort.java

@@ -29,11 +29,11 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.core.PropertyPath;
+import org.springframework.data.core.TypedPropertyPath;
 import org.springframework.data.util.MethodInvocationRecorder;
 import org.springframework.data.util.MethodInvocationRecorder.Recorded;
-import org.springframework.data.util.PropertyPath;
 import org.springframework.data.util.Streamable;
-import org.springframework.data.util.TypedPropertyPath;
 import org.springframework.lang.CheckReturnValue;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
@@ -797,7 +797,7 @@ public String toString() {
 	 * @author Oliver Gierke
 	 * @since 2.2
 	 * @soundtrack The Intersphere - Linger (The Grand Delusion)
-	 * @deprecated since 4.1 in favor of {@link Sort#by(org.springframework.data.util.TypedPropertyPath...)}
+	 * @deprecated since 4.1 in favor of {@link Sort#by(org.springframework.data.core.TypedPropertyPath...)}
 	 */
 	@Deprecated(since = "4.1")
 	public static class TypedSort<T> extends Sort {

src/test/java/org/springframework/data/mapping/TypedPropertyPathUnitTests.java renamed to src/test/java/org/springframework/data/core/TypedPropertyPathUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping;
+package org.springframework.data.core;
 
 import static org.assertj.core.api.Assertions.*;
 

src/test/java/org/springframework/data/domain/SortUnitTests.java

@@ -21,11 +21,12 @@
 import java.util.Collection;
 
 import org.junit.jupiter.api.Test;
+
+import org.springframework.data.core.TypedPropertyPath;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.mapping.Person;
-import org.springframework.data.util.TypedPropertyPath;
 
 /**
  * Unit test for {@link Sort}.