Merge branch 'main' of https://github.com/spring-projects/spring-data-commons into remote-unused-import

Signed-off-by: Tran Ngoc Nhan <[email protected]>

# Conflicts:
#	src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java

Author: ngocnhan-tran1996

src/main/antora/modules/ROOT/pages/auditing.adoc

@@ -3,13 +3,16 @@
 
 [[auditing.basics]]
 == Basics
-Spring Data provides sophisticated support to transparently keep track of who created or changed an entity and when the change happened.To benefit from that functionality, you have to equip your entity classes with auditing metadata that can be defined either using annotations or by implementing an interface.
+
+Spring Data provides sophisticated support to transparently keep track of who created or changed an entity and when the change happened.
+To benefit from that functionality, you have to equip your entity classes with auditing metadata that can be defined either using annotations or by implementing an interface.
 Additionally, auditing has to be enabled either through Annotation configuration or XML configuration to register the required infrastructure components.
 Please refer to the store-specific section for configuration samples.
 
 [NOTE]
 ====
 Applications that only track creation and modification dates are not required do make their entities implement <<auditing.auditor-aware,`AuditorAware`>>.
+If no `AuditorAware` or `DateTimeProvider` bean is configured, `AuditingHandler` will use Spring's autowiring to detect a matching bean if beans of the corresponding type are available in the application context.
 ====
 
 [[auditing.annotations]]

src/main/java/org/springframework/data/aot/AotMappingContext.java

@@ -21,6 +21,7 @@
 import java.util.UUID;
 import java.util.function.Predicate;
 
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.Association;
@@ -34,7 +35,6 @@
 import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.TypeInformation;
 
 /**
  * Simple {@link AbstractMappingContext} for processing of AOT contributions.

src/main/java/org/springframework/data/aot/AuditingBeanRegistrationAotProcessor.java

@@ -25,9 +25,9 @@
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.core.DecoratingProxy;
+import org.springframework.data.core.ReactiveWrappers;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.domain.ReactiveAuditorAware;
-import org.springframework.data.util.ReactiveWrappers;
 import org.springframework.util.ClassUtils;
 
 /**

src/main/java/org/springframework/data/auditing/AuditingHandler.java

@@ -19,6 +19,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.mapping.context.MappingContext;
@@ -66,12 +68,10 @@ public static AuditingHandler from(MappingContext<?, ?> mappingContext) {
 	/**
 	 * Setter to inject a {@code AuditorAware} component to retrieve the current auditor.
 	 *
-	 * @param auditorAware must not be {@literal null}.
+	 * @param auditorAware can be {@literal null} if no auditor-aware is available.
 	 */
-	public void setAuditorAware(AuditorAware<?> auditorAware) {
-
-		Assert.notNull(auditorAware, "AuditorAware must not be null");
-		this.auditorAware = Optional.of(auditorAware);
+	public void setAuditorAware(@Nullable AuditorAware<?> auditorAware) {
+		this.auditorAware = Optional.ofNullable(auditorAware);
 	}
 
 	/**

src/main/java/org/springframework/data/auditing/ReactiveAuditingHandler.java

@@ -17,6 +17,8 @@
 
 import reactor.core.publisher.Mono;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.domain.ReactiveAuditorAware;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
@@ -56,12 +58,10 @@ public static ReactiveAuditingHandler from(MappingContext<?, ?> mappingContext)
 	/**
 	 * Setter to inject a {@link ReactiveAuditorAware} component to retrieve the current auditor.
 	 *
-	 * @param auditorAware must not be {@literal null}.
+	 * @param auditorAware can be {@literal null}.
 	 */
-	public void setAuditorAware(ReactiveAuditorAware<?> auditorAware) {
-
-		Assert.notNull(auditorAware, "AuditorAware must not be null");
-		this.auditorAware = auditorAware;
+	public void setAuditorAware(@Nullable ReactiveAuditorAware<?> auditorAware) {
+		this.auditorAware = auditorAware == null ? Mono::empty : auditorAware;
 	}
 
 	/**

src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java

@@ -21,15 +21,13 @@
 
 import org.springframework.aop.framework.ProxyFactoryBean;
 import org.springframework.aop.target.LazyInitTargetSource;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.auditing.AuditingHandler;
-import org.springframework.data.auditing.CurrentDateTimeProvider;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -42,6 +40,7 @@
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Francisco Soler
+ * @author Jaeyeon Kim
  */
 public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBeanDefinitionRegistrar {
 
@@ -120,17 +119,19 @@ protected BeanDefinitionBuilder configureDefaultAuditHandlerAttributes(AuditingC
 		if (StringUtils.hasText(configuration.getAuditorAwareRef())) {
 			builder.addPropertyValue(AUDITOR_AWARE,
 					createLazyInitTargetSourceBeanDefinition(configuration.getAuditorAwareRef()));
-		} else {
-			builder.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE);
+		}
+		else {
+			builder.addAutowiredProperty(AUDITOR_AWARE);
 		}
 
 		builder.addPropertyValue(SET_DATES, configuration.isSetDates());
 		builder.addPropertyValue(MODIFY_ON_CREATE, configuration.isModifyOnCreate());
 
 		if (StringUtils.hasText(configuration.getDateTimeProviderRef())) {
 			builder.addPropertyReference(DATE_TIME_PROVIDER, configuration.getDateTimeProviderRef());
-		} else {
-			builder.addPropertyValue(DATE_TIME_PROVIDER, CurrentDateTimeProvider.INSTANCE);
+		}
+		else {
+			builder.addAutowiredProperty(DATE_TIME_PROVIDER);
 		}
 
 		builder.setRole(AbstractBeanDefinition.ROLE_INFRASTRUCTURE);

src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java

@@ -21,10 +21,10 @@
 
 import org.jspecify.annotations.Nullable;
 
+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.Assert;
 
 /**

src/main/java/org/springframework/data/convert/CustomConversions.java

@@ -34,9 +34,9 @@
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.ConverterBuilder.ConverterAware;
+import org.springframework.data.core.CustomCollections;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.CustomCollections;
 import org.springframework.data.util.Predicates;
 import org.springframework.data.util.Streamable;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/convert/DefaultTypeMapper.java

@@ -26,10 +26,10 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
+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.Assert;
 
 /**

src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java

@@ -20,11 +20,11 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.Alias;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
 /**