Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Search implemented interfaces on superclass for @ServiceConnection

Browse Source 
Refine original fix to also search interfaces on the superclass.

Fixes gh-37671
This commit is contained in:
Phillip Webb
2023-10-14 19:43:41 -07:00
parent 084bd3a420
commit e01e4f1912
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java
View File

@@ -54,7 +54,10 @@ class ServiceConnectionContextCustomizerFactory implements ContextCustomizerFact
} }
private void findSources(Class<?> clazz, List<ContainerConnectionSource<?>> sources) { private void findSources(Class<?> clazz, List<ContainerConnectionSource<?>> sources) {
ReflectionUtils.doWithFields(clazz, (field) -> { if (clazz == Object.class || clazz == null) {
return;
}
ReflectionUtils.doWithLocalFields(clazz, (field) -> {
MergedAnnotations annotations = MergedAnnotations.from(field); MergedAnnotations annotations = MergedAnnotations.from(field);
annotations.stream(ServiceConnection.class) annotations.stream(ServiceConnection.class)
.forEach((annotation) -> sources.add(createSource(field, annotation))); .forEach((annotation) -> sources.add(createSource(field, annotation)));
@@ -65,6 +68,7 @@ class ServiceConnectionContextCustomizerFactory implements ContextCustomizerFact
for (Class<?> implementedInterface : clazz.getInterfaces()) { for (Class<?> implementedInterface : clazz.getInterfaces()) {
findSources(implementedInterface, sources); findSources(implementedInterface, sources);
} }
findSources(clazz.getSuperclass(), sources);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

12
spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactoryTests.java
View File

@@ -94,6 +94,14 @@ class ServiceConnectionContextCustomizerFactoryTests {
assertThat(customizer.getSources()).hasSize(2); assertThat(customizer.getSources()).hasSize(2);
} }
@Test
void createContextCustomizerWhenInheritedImplementedInterfaceHasServiceConnectionsReturnsCustomizer() {
ServiceConnectionContextCustomizer customizer = (ServiceConnectionContextCustomizer) this.factory
.createContextCustomizer(ServiceConnectionsImplSubclass.class, null);
assertThat(customizer).isNotNull();
assertThat(customizer.getSources()).hasSize(2);
}
@Test @Test
void createContextCustomizerWhenClassHasNonStaticServiceConnectionFailsWithHelpfulException() { void createContextCustomizerWhenClassHasNonStaticServiceConnectionFailsWithHelpfulException() {
assertThatIllegalStateException() assertThatIllegalStateException()
@@ -186,6 +194,10 @@ class ServiceConnectionContextCustomizerFactoryTests {
} }
static class ServiceConnectionsImplSubclass extends ServiceConnectionsImpl {
}
static class NonStaticServiceConnection { static class NonStaticServiceConnection {
@ServiceConnection @ServiceConnection