Set ApplicationEventPublisher on repository factory if it implements ApplicationEventPublisherAware.

Closes #3424

Author: mp911de

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

@@ -331,19 +331,23 @@ public void afterPropertiesSet() {
 				: QueryMethodValueEvaluationContextAccessor.DEFAULT_CONTEXT_PROVIDER);
 		this.factory.setBeanClassLoader(classLoader);
 
-		if (beanFactory != null) {
+		if (this.beanFactory != null) {
 			this.factory.setBeanFactory(beanFactory);
 		}
 
 		if (this.publisher != null) {
 			this.factory.addRepositoryProxyPostProcessor(new EventPublishingRepositoryProxyPostProcessor(publisher));
+
+			if (this.factory instanceof ApplicationEventPublisherAware aware) {
+				aware.setApplicationEventPublisher(this.publisher);
+			}
 		}
 
 		if (this.environment != null) {
 			this.factory.setEnvironment(this.environment);
 		}
 
-		if (repositoryBaseClass != null) {
+		if (this.repositoryBaseClass != null) {
 			this.factory.setRepositoryBaseClass(repositoryBaseClass);
 		}
 

src/test/java/org/springframework/data/repository/core/support/DummyRepositoryFactory.java

@@ -25,6 +25,8 @@
 import org.mockito.Mockito;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.core.metrics.ApplicationStartup;
 import org.springframework.core.metrics.StartupStep;
 import org.springframework.data.projection.ProjectionFactory;
@@ -46,14 +48,16 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-public class DummyRepositoryFactory extends RepositoryFactorySupport {
+public class DummyRepositoryFactory extends RepositoryFactorySupport implements ApplicationEventPublisherAware {
 
 	public final MyRepositoryQuery queryOne = mock(MyRepositoryQuery.class);
 	public final RepositoryQuery queryTwo = mock(RepositoryQuery.class);
 	public final QueryLookupStrategy strategy = mock(QueryLookupStrategy.class);
 
 	private final ApplicationStartup applicationStartup;
 
+	private ApplicationEventPublisher publisher;
+
 	@SuppressWarnings("unchecked") private final QuerydslPredicateExecutor<Object> querydsl = mock(
 			QuerydslPredicateExecutor.class);
 	private final Object repository;
@@ -97,6 +101,15 @@ protected Optional<QueryLookupStrategy> getQueryLookupStrategy(Key key,
 		return Optional.of(strategy);
 	}
 
+	public ApplicationEventPublisher getPublisher() {
+		return publisher;
+	}
+
+	@Override
+	public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
+		this.publisher = publisher;
+	}
+
 	@Override
 	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
 

src/test/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupportUnitTests.java

@@ -23,6 +23,7 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.Repository;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -32,6 +33,7 @@
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Mark Paluch
  */
 class RepositoryFactoryBeanSupportUnitTests {
 
@@ -97,7 +99,7 @@ public Object invoke(@NonNull MethodInvocation invocation) {
 	@Test // DATACMNS-1345
 	void reportsMappingContextUnavailableForPersistentEntityLookup() {
 
-		var bean = new RepositoryFactoryBeanSupport<SampleRepository, Object, Long>(
+		var bean = new RepositoryFactoryBeanSupport<>(
 				SampleRepository.class) {
 
 			@Override
@@ -112,6 +114,25 @@ protected RepositoryFactorySupport createRepositoryFactory() {
 				.isThrownBy(() -> bean.getPersistentEntity());
 	}
 
+	@Test // DATACMNS-1345
+	void setsApplicationEventPublisher() {
+
+		var bean = new RepositoryFactoryBeanSupport<>(SampleRepository.class) {
+
+			@Override
+			protected RepositoryFactorySupport createRepositoryFactory() {
+				return new DummyRepositoryFactory(mock(SampleRepository.class));
+			}
+		};
+
+		bean.setApplicationEventPublisher(event -> {});
+		bean.setLazyInit(true);
+		bean.afterPropertiesSet();
+
+		var factory = ReflectionTestUtils.getField(bean, "factory");
+		assertThat(factory).extracting("publisher").isNotNull();
+	}
+
 	interface SampleRepository extends Repository<Object, Long> {
 
 		void someMethod();