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

ConfigurationClassBeanDefinition implements AnnotatedBeanDefinition

This commit is contained in:
Juergen Hoeller 2009-05-12 23:12:51 +00:00
parent cce6e2f4cd
commit da71f266ae
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
View File

@ -234,6 +234,9 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
this.isFactoryMethodUnique = true; this.isFactoryMethodUnique = true;
} }
/**
* Check whether the given candidate qualifies as a factory method.
*/
public boolean isFactoryMethod(Method candidate) { public boolean isFactoryMethod(Method candidate) {
return (candidate != null && candidate.getName().equals(getFactoryMethodName())); return (candidate != null && candidate.getName().equals(getFactoryMethodName()));
} }

19
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
View File

@ -26,6 +26,7 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowire;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.BeanDefinitionHolder;
@ -36,6 +37,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.MethodMetadata; import org.springframework.core.type.MethodMetadata;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -110,10 +112,11 @@ class ConfigurationClassBeanDefinitionReader {
* {@link #registry} based on its contents. * {@link #registry} based on its contents.
*/ */
private void loadBeanDefinitionsForModelMethod(ConfigurationClassMethod method) { private void loadBeanDefinitionsForModelMethod(ConfigurationClassMethod method) {
ConfigurationClass configClass = method.getDeclaringClass();
MethodMetadata metadata = method.getMetadata(); MethodMetadata metadata = method.getMetadata();
RootBeanDefinition beanDef = new ConfigurationClassBeanDefinition(); RootBeanDefinition beanDef = new ConfigurationClassBeanDefinition(configClass);
ConfigurationClass configClass = method.getDeclaringClass(); beanDef.setResource(configClass.getResource());
beanDef.setSource(this.sourceExtractor.extractSource(metadata, configClass.getResource())); beanDef.setSource(this.sourceExtractor.extractSource(metadata, configClass.getResource()));
beanDef.setFactoryBeanName(configClass.getBeanName()); beanDef.setFactoryBeanName(configClass.getBeanName());
beanDef.setUniqueFactoryMethodName(metadata.getMethodName()); beanDef.setUniqueFactoryMethodName(metadata.getMethodName());
@ -209,13 +212,21 @@ class ConfigurationClassBeanDefinitionReader {
* Used in bean overriding cases where it's necessary to determine whether the bean * Used in bean overriding cases where it's necessary to determine whether the bean
* definition was created externally. * definition was created externally.
*/ */
private class ConfigurationClassBeanDefinition extends RootBeanDefinition { private class ConfigurationClassBeanDefinition extends RootBeanDefinition implements AnnotatedBeanDefinition {
public ConfigurationClassBeanDefinition() { private AnnotationMetadata annotationMetadata;
public ConfigurationClassBeanDefinition(ConfigurationClass configClass) {
this.annotationMetadata = configClass.getMetadata();
} }
private ConfigurationClassBeanDefinition(ConfigurationClassBeanDefinition original) { private ConfigurationClassBeanDefinition(ConfigurationClassBeanDefinition original) {
super(original); super(original);
this.annotationMetadata = original.annotationMetadata;
}
public AnnotationMetadata getMetadata() {
return this.annotationMetadata;
} }
@Override @Override