spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-19 22:09:01 +00:00
Code Issues Projects Releases Wiki Activity

Polish 'Include @Bean method annotations in ContainerConnectionSource'

Browse Source 
See gh-50033
This commit is contained in:
Phillip Webb
2026-04-13 15:25:07 -07:00
parent fe5424b7e1
commit 04ecce4e2a
2 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java
+12 -14
View File
@@ -16,7 +16,6 @@
package org.springframework.boot.testcontainers.service.connection;
import java.lang.reflect.Method;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -24,10 +23,10 @@ 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;
@@ -63,8 +62,7 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
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 +71,6 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
}
}
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 +93,16 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
}
}
private MergedAnnotations getAnnotations(BeanDefinition beanDefinition) {
if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) {
return testcontainerBeanDefinition.getAnnotations();
}
if (beanDefinition instanceof AnnotatedBeanDefinition annotatedBeanDefinition) {
return annotatedBeanDefinition.getFactoryMethodMetadata().getAnnotations();
}
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
+13 -20
View File
@@ -19,9 +19,9 @@ package org.springframework.boot.testcontainers.service.connection;
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;
@@ -29,9 +29,7 @@ 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
*/
@@ -39,19 +37,14 @@ 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 @@ class ServiceConnectionAutoConfigurationRegistrarTests {
@Bean
@ServiceConnection
@Ssl
PostgreSQLContainer container() {
return mock(PostgreSQLContainer.class);
PostgreSQLContainer<?> container() {
return mock();
}
}