Exclude TestcontainersPropertySource.EventPublisherRegistrar

Author: nosan

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java

@@ -44,6 +44,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * Tests for {@link ImportTestcontainers}.
@@ -53,6 +54,8 @@
 @DisabledIfDockerUnavailable
 class ImportTestcontainersTests {
 
+	private final TestGenerationContext generationContext = new TestGenerationContext();
+
 	private AnnotationConfigApplicationContext applicationContext;
 
 	@AfterEach
@@ -144,13 +147,19 @@ void aotContributionRegistersTestcontainers() {
 		});
 	}
 
+	@Test
+	void importTestcontainersWithDynamicPropertySourceDoNotCauseAotProcessingToFail() {
+		this.applicationContext = new AnnotationConfigApplicationContext();
+		this.applicationContext.register(ContainerDefinitionsWithDynamicPropertySource.class);
+		new TestcontainersLifecycleApplicationContextInitializer().initialize(this.applicationContext);
+		assertThatNoException().isThrownBy(() -> new ApplicationContextAotGenerator()
+			.processAheadOfTime(this.applicationContext, this.generationContext));
+	}
+
 	@SuppressWarnings("unchecked")
 	private void compile(BiConsumer<GenericApplicationContext, Compiled> result) {
-		TestGenerationContext generationContext = new TestGenerationContext();
-		ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(this.applicationContext,
-				generationContext);
-		generationContext.writeGeneratedContent();
-		TestCompiler.forSystem().with(generationContext).compile((compiled) -> {
+		ClassName className = processAheadOfTime();
+		TestCompiler.forSystem().with(this.generationContext).compile((compiled) -> {
 			GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
 			ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
 				.getInstance(ApplicationContextInitializer.class, className.toString());
@@ -160,6 +169,13 @@ private void compile(BiConsumer<GenericApplicationContext, Compiled> result) {
 		});
 	}
 
+	private ClassName processAheadOfTime() {
+		ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(this.applicationContext,
+				this.generationContext);
+		this.generationContext.writeGeneratedContent();
+		return className;
+	}
+
 	@ImportTestcontainers
 	static class ImportWithoutValue {
 

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySource.java

@@ -26,9 +26,11 @@
 import org.testcontainers.containers.Container;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
@@ -166,4 +168,13 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 
 	}
 
+	static class TestcontainersEventPublisherBeanRegistrationExcludeFilter implements BeanRegistrationExcludeFilter {
+
+		@Override
+		public boolean isExcludedFromAotProcessing(RegisteredBean registeredBean) {
+			return EventPublisherRegistrar.NAME.equals(registeredBean.getBeanName());
+		}
+
+	}
+
 }

spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring/aot.factories

@@ -1,5 +1,6 @@
 org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter=\
-org.springframework.boot.testcontainers.service.connection.ConnectionDetailsRegistrar.ServiceConnectionBeanRegistrationExcludeFilter
+org.springframework.boot.testcontainers.service.connection.ConnectionDetailsRegistrar.ServiceConnectionBeanRegistrationExcludeFilter,\
+org.springframework.boot.testcontainers.properties.TestcontainersPropertySource.TestcontainersEventPublisherBeanRegistrationExcludeFilter
 
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
 org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory.ContainerConnectionDetailsFactoriesRuntimeHints