Move NullableWrapper to core package.

Author: mp911de

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-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 org.jspecify.annotations.Nullable;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-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 scala.Function0;
 import scala.Option;
@@ -31,7 +31,8 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterRegistry;
 import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.data.core.TypeInformation;
+import org.springframework.data.util.StreamUtils;
+import org.springframework.data.util.Streamable;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

src/main/java/org/springframework/data/core/TypeDiscoverer.java

@@ -36,7 +36,6 @@
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.data.util.CustomCollections;
 import org.springframework.data.util.Lazy;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.Streamable;
 import org.springframework.util.Assert;
 import org.springframework.util.ConcurrentLruCache;

src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -50,6 +50,7 @@
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.NativeDetector;
 import org.springframework.core.env.Environment;
+import org.springframework.data.core.NullableWrapperConverters;
 import org.springframework.data.core.PropertyPath;
 import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.ManagedTypes;
@@ -69,7 +70,6 @@
 import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.data.util.CustomCollections;
 import org.springframework.data.util.KotlinReflectionUtils;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.Optionals;
 import org.springframework.data.util.Streamable;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java

@@ -31,9 +31,9 @@
 
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.data.core.NullableWrapper;
+import org.springframework.data.core.NullableWrapperConverters;
 import org.springframework.data.core.TypeInformation;
-import org.springframework.data.util.NullableWrapper;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java

@@ -24,7 +24,6 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.aop.framework.Advised;
@@ -33,8 +32,8 @@
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.Jsr310Converters;
+import org.springframework.data.core.NullableWrapperConverters;
 import org.springframework.data.util.Lazy;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.NullnessMethodInvocationValidator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

src/main/java/org/springframework/data/repository/core/support/QueryExecutionResultHandler.java

@@ -30,9 +30,9 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.core.NullableWrapper;
 import org.springframework.data.repository.util.QueryExecutionConverters;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.util.NullableWrapper;
 import org.springframework.data.util.ReactiveWrappers;
 import org.springframework.data.util.Streamable;
 

src/main/java/org/springframework/data/repository/query/QueryMethod.java

@@ -24,6 +24,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.core.NullableWrapperConverters;
 import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Page;
@@ -40,7 +41,6 @@
 import org.springframework.data.repository.util.QueryExecutionConverters;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.data.util.Lazy;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.ReactiveWrappers;
 import org.springframework.data.util.ReflectionUtils;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java

@@ -37,6 +37,8 @@
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.data.core.NullableWrapper;
+import org.springframework.data.core.NullableWrapperConverters;
 import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.SearchResult;
@@ -45,8 +47,6 @@
 import org.springframework.data.domain.Window;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.util.CustomCollections;
-import org.springframework.data.util.NullableWrapper;
-import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.data.util.Streamable;
 import org.springframework.lang.Contract;

src/test/java/org/springframework/data/util/NullableWrapperConvertersUnitTests.java renamed to src/test/java/org/springframework/data/core/NullableWrapperConvertersUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-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 static org.assertj.core.api.Assertions.*;