root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ConfigurationClassParser detects @Bean methods in interface hierarchies as well 

Issue: SPR-14288
This commit is contained in:
Juergen Hoeller 2016-05-27 22:34:09 +02:00
parent 2d85accb83
commit 03affa02db
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -303,15 +303,7 @@ class ConfigurationClassParser {
} }
// Process default methods on interfaces // Process default methods on interfaces
for (SourceClass ifc : sourceClass.getInterfaces()) { processInterfaces(configClass, sourceClass);
beanMethods = ifc.getMetadata().getAnnotatedMethods(Bean.class.getName());
for (MethodMetadata methodMetadata : beanMethods) {
if (!methodMetadata.isAbstract()) {
// A default method or other concrete method on a Java 8+ interface...
configClass.addBeanMethod(new BeanMethod(methodMetadata, configClass));
}
}
}
// Process superclass, if any // Process superclass, if any
if (sourceClass.getMetadata().hasSuperClass()) { if (sourceClass.getMetadata().hasSuperClass()) {
@ -329,8 +321,6 @@ class ConfigurationClassParser {
/** /**
* Register member (nested) classes that happen to be configuration classes themselves. * Register member (nested) classes that happen to be configuration classes themselves.
* @param sourceClass the source class to process
* @throws IOException if there is any problem reading metadata from a member class
*/ */
private void processMemberClasses(ConfigurationClass configClass, SourceClass sourceClass) throws IOException { private void processMemberClasses(ConfigurationClass configClass, SourceClass sourceClass) throws IOException {
for (SourceClass memberClass : sourceClass.getMemberClasses()) { for (SourceClass memberClass : sourceClass.getMemberClasses()) {
@ -352,6 +342,22 @@ class ConfigurationClassParser {
} }
} }
/**
* Register default methods on interfaces implemented by the configuration class.
*/
private void processInterfaces(ConfigurationClass configClass, SourceClass sourceClass) throws IOException {
for (SourceClass ifc : sourceClass.getInterfaces()) {
Set<MethodMetadata> beanMethods = ifc.getMetadata().getAnnotatedMethods(Bean.class.getName());
for (MethodMetadata methodMetadata : beanMethods) {
if (!methodMetadata.isAbstract()) {
// A default method or other concrete method on a Java 8+ interface...
configClass.addBeanMethod(new BeanMethod(methodMetadata, configClass));
}
}
processInterfaces(configClass, ifc);
}
}
/** /**
* Process the given <code>@PropertySource</code> annotation metadata. * Process the given <code>@PropertySource</code> annotation metadata.
* @param propertySource metadata for the <code>@PropertySource</code> annotation found * @param propertySource metadata for the <code>@PropertySource</code> annotation found

18
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@ -1063,17 +1063,27 @@ public class ConfigurationClassPostProcessorTests {
} }
} }
public interface DefaultMethodsConfig { public interface BaseInterface {
@Bean ServiceBean serviceBean();
default ServiceBean serviceBean() {
return provider().getServiceBean();
} }
public interface BaseDefaultMethods extends BaseInterface {
@Bean @Bean
default ServiceBeanProvider provider() { default ServiceBeanProvider provider() {
return new ServiceBeanProvider(); return new ServiceBeanProvider();
} }
@Bean
@Override
default ServiceBean serviceBean() {
return provider().getServiceBean();
}
}
public interface DefaultMethodsConfig extends BaseDefaultMethods {
} }
@Configuration @Configuration