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

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-50064
This commit is contained in:
Phillip Webb
2026-04-13 15:41:08 -07:00
parent 481b972fad 208d750a5a
commit 3cf39544c3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java
+3 -1
View File
@@ -35,6 +35,7 @@ import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.core.annotation.MergedAnnotations;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.MethodMetadata;
import org.springframework.util.Assert;
/**
@@ -100,7 +101,8 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
return testcontainerBeanDefinition.getAnnotations();
}
if (beanDefinition instanceof AnnotatedBeanDefinition annotatedBeanDefinition) {
return annotatedBeanDefinition.getFactoryMethodMetadata().getAnnotations();
MethodMetadata metadata = annotatedBeanDefinition.getFactoryMethodMetadata();
return (metadata != null) ? metadata.getAnnotations() : null;
}
return null;
}