From fe5424b7e150da564db72eaec8f92e8a526d1c56 Mon Sep 17 00:00:00 2001 From: Daeho Kwon Date: Sun, 12 Apr 2026 03:24:59 +0900 Subject: [PATCH 1/2] Include @Bean method annotations in ContainerConnectionSource Update `ServiceConnectionAutoConfigurationRegistrar` to include annotations from `@Bean` methods. See gh-50033 Signed-off-by: Daeho Kwon --- ...eConnectionAutoConfigurationRegistrar.java | 15 +++- .../connection/DatabaseConnectionDetails.java | 25 +++++++ ...aseContainerDatabaseConnectionDetails.java | 30 ++++++++ ...ectionAutoConfigurationRegistrarTests.java | 69 +++++++++++++++++++ .../TestDatabaseConnectionDetails.java | 39 +++++++++++ .../test/resources/META-INF/spring.factories | 3 + 6 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseConnectionDetails.java create mode 100644 spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseContainerDatabaseConnectionDetails.java create mode 100644 spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java create mode 100644 spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/TestDatabaseConnectionDetails.java create mode 100644 spring-boot-project/spring-boot-testcontainers/src/test/resources/META-INF/spring.factories diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java index e3c2c8b60e5..fb04d7e80b4 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java +++ b/spring-boot-project/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; @@ -26,6 +27,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; 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; @@ -39,6 +41,7 @@ import org.springframework.core.type.AnnotationMetadata; * {@link ServiceConnectionAutoConfiguration}. * * @author Phillip Webb + * @author Daeho Kwon */ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitionRegistrar { @@ -61,7 +64,7 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio 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); @@ -70,6 +73,16 @@ 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 getServiceConnections(ConfigurableListableBeanFactory beanFactory, String beanName, MergedAnnotations annotations) { Set serviceConnections = beanFactory.findAllAnnotationsOnBean(beanName, diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseConnectionDetails.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseConnectionDetails.java new file mode 100644 index 00000000000..60ba7aa0244 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseConnectionDetails.java @@ -0,0 +1,25 @@ +/* + * 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.springframework.boot.autoconfigure.service.connection.ConnectionDetails; + +public interface DatabaseConnectionDetails extends ConnectionDetails { + + String getJdbcUrl(); + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseContainerDatabaseConnectionDetails.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseContainerDatabaseConnectionDetails.java new file mode 100644 index 00000000000..51ebb2dd2e1 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/DatabaseContainerDatabaseConnectionDetails.java @@ -0,0 +1,30 @@ +/* + * 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.testcontainers.containers.JdbcDatabaseContainer; + +public class DatabaseContainerDatabaseConnectionDetails + extends ContainerConnectionDetailsFactory, DatabaseConnectionDetails> { + + @Override + protected DatabaseConnectionDetails getContainerConnectionDetails( + ContainerConnectionSource> source) { + return new TestDatabaseConnectionDetails(source); + } + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java new file mode 100644 index 00000000000..455d5090471 --- /dev/null +++ b/spring-boot-project/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.containers.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); + } + + } + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/TestDatabaseConnectionDetails.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/TestDatabaseConnectionDetails.java new file mode 100644 index 00000000000..24dbee71110 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/TestDatabaseConnectionDetails.java @@ -0,0 +1,39 @@ +/* + * 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.testcontainers.containers.JdbcDatabaseContainer; + +import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory.ContainerConnectionDetails; + +class TestDatabaseConnectionDetails extends ContainerConnectionDetails> + implements DatabaseConnectionDetails { + + TestDatabaseConnectionDetails(ContainerConnectionSource> source) { + super(source); + } + + @Override + public String getJdbcUrl() { + return getContainer().getJdbcUrl(); + } + + JdbcDatabaseContainer callGetContainer() { + return super.getContainer(); + } + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-testcontainers/src/test/resources/META-INF/spring.factories new file mode 100644 index 00000000000..63e1752eed2 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/test/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# Test Connection Details Factories +org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ +org.springframework.boot.testcontainers.service.connection.DatabaseContainerDatabaseConnectionDetails From 04ecce4e2a8e751f281f6b106f830138d522bedd Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 13 Apr 2026 14:32:31 -0700 Subject: [PATCH 2/2] Polish 'Include @Bean method annotations in ContainerConnectionSource' See gh-50033 --- ...eConnectionAutoConfigurationRegistrar.java | 26 +++++++-------- ...ectionAutoConfigurationRegistrarTests.java | 33 ++++++++----------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java index fb04d7e80b4..5426fa2727d 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java @@ -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 getServiceConnections(ConfigurableListableBeanFactory beanFactory, String beanName, MergedAnnotations annotations) { Set 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 > ContainerConnectionSource createSource( ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition beanDefinition, diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java index 455d5090471..5bf3d260b28 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java @@ -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(); } }