From 176ea5e9a7a04a81d76130c795d7597f0fc1de75 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 3 Jun 2022 14:27:25 +0200
Subject: [PATCH] Fix registration of ScopedProxyBeanRegistrationAotProcessor

Closes gh-28561
---
 .../src/main/resources/META-INF/spring/aot.factories      | 2 +-
 .../ScopedProxyBeanRegistrationAotProcessorTests.java     | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/spring-aop/src/main/resources/META-INF/spring/aot.factories b/spring-aop/src/main/resources/META-INF/spring/aot.factories
index 44019be25b8..7264434e5cb 100644
--- a/spring-aop/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-aop/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,2 @@
-org.springframework.beans.factory.aot.registration.BeanRegistrationAotProcessor=\
+org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
 org.springframework.aop.scope.ScopedProxyBeanRegistrationAotProcessor
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java
index 8f2147fb73d..e120b841f43 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java
@@ -34,8 +34,10 @@ import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.test.generator.compile.Compiled;
 import org.springframework.aot.test.generator.compile.TestCompiler;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.aot.AotFactoriesLoader;
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
 import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
+import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.aot.TestBeanRegistrationsAotProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -77,6 +79,12 @@ class ScopedProxyBeanRegistrationAotProcessorTests {
 		this.beanFactoryInitializationCode = new MockBeanFactoryInitializationCode();
 	}
 
+	@Test
+	void scopedProxyBeanRegistrationAotProcessorIsRegistered() {
+		assertThat(new AotFactoriesLoader(this.beanFactory).load(BeanRegistrationAotProcessor.class))
+				.anyMatch(ScopedProxyBeanRegistrationAotProcessor.class::isInstance);
+	}
+
 	@Test
 	void getBeanRegistrationCodeGeneratorWhenNotScopedProxy() {
 		BeanDefinition beanDefinition = BeanDefinitionBuilder