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..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 @@ -23,6 +23,7 @@ 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; @@ -39,6 +40,7 @@ import org.springframework.core.type.AnnotationMetadata; * {@link ServiceConnectionAutoConfiguration}. * * @author Phillip Webb + * @author Daeho Kwon */ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitionRegistrar { @@ -60,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() : null; + MergedAnnotations annotations = getAnnotations(beanDefinition); for (ServiceConnection serviceConnection : getServiceConnections(beanFactory, beanName, annotations)) { ContainerConnectionSource source = createSource(beanFactory, beanName, beanDefinition, annotations, serviceConnection); @@ -92,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/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..5bf3d260b28 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrarTests.java @@ -0,0 +1,62 @@ +/* + * 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.AutoConfigurations; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory.ContainerConnectionDetails; +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}. + * + * @author Daeho Kwon + */ +class ServiceConnectionAutoConfigurationRegistrarTests { + + @Test + void sslAnnotationOnBeanMethodShouldBeDetectedInContainerConnectionSource() { + 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) + static class ContainerConfiguration { + + @Bean + @ServiceConnection + @Ssl + PostgreSQLContainer container() { + return mock(); + } + + } + +} 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