Introduce Core package.

Author: mp911de

src/main/java/org/springframework/data/util/PropertyPath.java renamed to src/main/java/org/springframework/data/core/PropertyPath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2025 the original author or authors.
+ * Copyright 2025 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.
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.util;
+package org.springframework.data.core;
 
 import java.util.Iterator;
 import java.util.regex.Pattern;
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.util.Streamable;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
 /**

src/main/java/org/springframework/data/util/PropertyReferenceException.java renamed to src/main/java/org/springframework/data/core/PropertyReferenceException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2025 the original author or authors.
+ * Copyright 2025 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.util;
+package org.springframework.data.core;
 
 import java.io.Serial;
 import java.util.Arrays;
@@ -25,6 +25,8 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.PropertyMatches;
+import org.springframework.data.util.Lazy;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

src/main/java/org/springframework/data/util/SimplePropertyPath.java renamed to src/main/java/org/springframework/data/core/SimplePropertyPath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2025 the original author or authors.
+ * Copyright 2025 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.util;
+package org.springframework.data.core;
 
 import java.beans.Introspector;
 import java.util.ArrayList;
@@ -28,6 +28,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.StringUtils;

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

@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.util;
+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.
  * <p>

src/main/java/org/springframework/data/util/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.util;
+package org.springframework.data.core;
 
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
@@ -46,6 +46,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.ResolvableType;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ObjectUtils;

src/main/java/org/springframework/data/core/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Provides basic classes for type handling and other core helpers that are not specific to any part of the framework.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.core;

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(TypedPropertyPath...)}
 	 */
 	@Deprecated(since = "4.1")
 	public static class TypedSort<T> extends Sort {

src/main/java/org/springframework/data/mapping/PersistentPropertyPaths.java

@@ -18,7 +18,7 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import org.springframework.data.util.PropertyPath;
+import org.springframework.data.core.PropertyPath;
 import org.springframework.data.util.Streamable;
 
 /**

src/main/java/org/springframework/data/mapping/PropertyPath.java

@@ -26,6 +26,6 @@
  * @deprecated since 4.1, use its replacement that moved to {@code org.springframework.data.util} package.
  */
 @Deprecated
-public interface PropertyPath extends org.springframework.data.util.PropertyPath {
+public interface PropertyPath extends org.springframework.data.core.PropertyPath {
 
 }