Detect annotations on @bean methods in ServiceConnectionAutoConfigurationRegistrar

Signed-off-by: Daeho Kwon <trewq231@naver.com>

Author: kwondh5217

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

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.testcontainers.service.connection;
 
+import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -27,6 +28,7 @@
 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;
@@ -41,6 +43,7 @@
  * {@link ServiceConnectionAutoConfiguration}.
  *
  * @author Phillip Webb
+ * @author Daeho Kwon
  */
 class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitionRegistrar {
 
@@ -63,7 +66,8 @@ private void registerBeanDefinitions(ConfigurableListableBeanFactory beanFactory
 		for (String beanName : beanFactory.getBeanNamesForType(Container.class)) {
 			BeanDefinition beanDefinition = getBeanDefinition(beanFactory, beanName);
 			MergedAnnotations annotations = (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition)
-					? testcontainerBeanDefinition.getAnnotations() : null;
+					? testcontainerBeanDefinition.getAnnotations()
+					: getAnnotationsFromFactoryMethod(beanDefinition);
 			for (ServiceConnection serviceConnection : getServiceConnections(beanFactory, beanName, annotations)) {
 				ContainerConnectionSource<?> source = createSource(beanFactory, beanName, beanDefinition, annotations,
 						serviceConnection);
@@ -85,6 +89,16 @@ private Set<ServiceConnection> getServiceConnections(ConfigurableListableBeanFac
 		return serviceConnections;
 	}
 
+	private @Nullable MergedAnnotations getAnnotationsFromFactoryMethod(@Nullable BeanDefinition beanDefinition) {
+		if (beanDefinition instanceof RootBeanDefinition rootBeanDefinition) {
+			Method factoryMethod = rootBeanDefinition.getResolvedFactoryMethod();
+			if (factoryMethod != null) {
+				return MergedAnnotations.from(factoryMethod, MergedAnnotations.SearchStrategy.DIRECT);
+			}
+		}
+		return null;
+	}
+
 	private @Nullable BeanDefinition getBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName) {
 		try {
 			return beanFactory.getBeanDefinition(beanName);

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testcontainers.service.connection;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.postgresql.PostgreSQLContainer;
+
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+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}.
+ *
+ * @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 {
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	static class ContainerConfiguration {
+
+		@Bean
+		@ServiceConnection
+		@Ssl
+		PostgreSQLContainer container() {
+			return mock(PostgreSQLContainer.class);
+		}
+
+	}
+
+}