Polish 'Include @bean method annotations in ContainerConnectionSource'

See gh-50033

Author: philwebb

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java

@@ -16,25 +16,25 @@
 
 package org.springframework.boot.testcontainers.service.connection;
 
-import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.testcontainers.containers.Container;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactories;
 import org.springframework.boot.origin.Origin;
 import org.springframework.boot.testcontainers.beans.TestcontainerBeanDefinition;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.MethodMetadata;
 
 /**
  * {@link ImportBeanDefinitionRegistrar} used by
@@ -63,8 +63,7 @@ private void registerBeanDefinitions(ConfigurableListableBeanFactory beanFactory
 				new ConnectionDetailsFactories(null));
 		for (String beanName : beanFactory.getBeanNamesForType(Container.class)) {
 			BeanDefinition beanDefinition = getBeanDefinition(beanFactory, beanName);
-			MergedAnnotations annotations = (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition)
-					? testcontainerBeanDefinition.getAnnotations() : getAnnotationsFromFactoryMethod(beanDefinition);
+			MergedAnnotations annotations = getAnnotations(beanDefinition);
 			for (ServiceConnection serviceConnection : getServiceConnections(beanFactory, beanName, annotations)) {
 				ContainerConnectionSource<?> source = createSource(beanFactory, beanName, beanDefinition, annotations,
 						serviceConnection);
@@ -73,16 +72,6 @@ private void registerBeanDefinitions(ConfigurableListableBeanFactory beanFactory
 		}
 	}
 
-	private MergedAnnotations getAnnotationsFromFactoryMethod(BeanDefinition beanDefinition) {
-		if (beanDefinition instanceof RootBeanDefinition rootBeanDefinition) {
-			Method factoryMethod = rootBeanDefinition.getResolvedFactoryMethod();
-			if (factoryMethod != null) {
-				return MergedAnnotations.from(factoryMethod, MergedAnnotations.SearchStrategy.DIRECT);
-			}
-		}
-		return null;
-	}
-
 	private Set<ServiceConnection> getServiceConnections(ConfigurableListableBeanFactory beanFactory, String beanName,
 			MergedAnnotations annotations) {
 		Set<ServiceConnection> serviceConnections = beanFactory.findAllAnnotationsOnBean(beanName,
@@ -105,6 +94,17 @@ private BeanDefinition getBeanDefinition(ConfigurableListableBeanFactory beanFac
 		}
 	}
 
+	private MergedAnnotations getAnnotations(BeanDefinition beanDefinition) {
+		if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) {
+			return testcontainerBeanDefinition.getAnnotations();
+		}
+		if (beanDefinition instanceof AnnotatedBeanDefinition annotatedBeanDefinition) {
+			MethodMetadata metadata = annotatedBeanDefinition.getFactoryMethodMetadata();
+			return (metadata != null) ? metadata.getAnnotations() : null;
+		}
+		return null;
+	}
+
 	@SuppressWarnings("unchecked")
 	private <C extends Container<?>> ContainerConnectionSource<C> createSource(
 			ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition beanDefinition,

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java

@@ -19,39 +19,32 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory.ContainerConnectionDetails;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link ServiceConnectionAutoConfigurationRegistrar} to verify that
- * annotations on {@link Bean @Bean} methods are available in
- * {@link ContainerConnectionSource}.
+ * Tests for {@link ServiceConnectionAutoConfigurationRegistrar}.
  *
  * @author Daeho Kwon
  */
 class ServiceConnectionAutoConfigurationRegistrarTests {
 
 	@Test
 	void sslAnnotationOnBeanMethodShouldBeDetectedInContainerConnectionSource() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
-			context.register(WithServiceConnectionAutoConfiguration.class, ContainerConfiguration.class);
-			context.refresh();
-			ContainerConnectionDetails<?> details = (ContainerConnectionDetails<?>) context
-				.getBean(DatabaseConnectionDetails.class);
-			assertThat(details.hasAnnotation(Ssl.class)).isTrue();
-		}
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(ServiceConnectionAutoConfiguration.class)
-	static class WithServiceConnectionAutoConfiguration {
-
+		new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(ServiceConnectionAutoConfiguration.class))
+			.withUserConfiguration(ContainerConfiguration.class)
+			.run((context) -> {
+				ContainerConnectionDetails<?> connectionDetails = (ContainerConnectionDetails<?>) context
+					.getBean(DatabaseConnectionDetails.class);
+				assertThat(connectionDetails.hasAnnotation(Ssl.class)).isTrue();
+			});
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -60,8 +53,8 @@ static class ContainerConfiguration {
 		@Bean
 		@ServiceConnection
 		@Ssl
-		PostgreSQLContainer container() {
-			return mock(PostgreSQLContainer.class);
+		PostgreSQLContainer<?> container() {
+			return mock();
 		}
 
 	}