From 0a790c143feeabf571e98f8ee0700a4586cbb67c Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 6 May 2011 19:01:56 +0000 Subject: [PATCH] Rename ConfigurationClassMethod => BeanMethod --- ...rationClassMethod.java => BeanMethod.java} | 4 ++-- .../annotation/ConfigurationClass.java | 22 +++++++++---------- ...onfigurationClassBeanDefinitionReader.java | 6 ++--- .../annotation/ConfigurationClassParser.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) rename org.springframework.context/src/main/java/org/springframework/context/annotation/{ConfigurationClassMethod.java => BeanMethod.java} (95%) diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java similarity index 95% rename from org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java index 429ba06bce0..477d69c5b4f 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java @@ -31,14 +31,14 @@ import org.springframework.core.type.MethodMetadata; * @see ConfigurationClassParser * @see ConfigurationClassBeanDefinitionReader */ -final class ConfigurationClassMethod { +final class BeanMethod { private final MethodMetadata metadata; private final ConfigurationClass configurationClass; - public ConfigurationClassMethod(MethodMetadata metadata, ConfigurationClass configurationClass) { + public BeanMethod(MethodMetadata metadata, ConfigurationClass configurationClass) { this.metadata = metadata; this.configurationClass = configurationClass; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java index 22a26ebaf47..3ec03d36073 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java @@ -40,7 +40,7 @@ import org.springframework.util.ClassUtils; * @author Chris Beams * @author Juergen Hoeller * @since 3.0 - * @see ConfigurationClassMethod + * @see BeanMethod * @see ConfigurationClassParser */ final class ConfigurationClass { @@ -51,7 +51,7 @@ final class ConfigurationClass { private final Map> importedResources = new LinkedHashMap>(); - private final Set methods = new LinkedHashSet(); + private final Set beanMethods = new LinkedHashSet(); private String beanName; @@ -89,12 +89,12 @@ final class ConfigurationClass { return this.beanName; } - public void addMethod(ConfigurationClassMethod method) { - this.methods.add(method); + public void addBeanMethod(BeanMethod method) { + this.beanMethods.add(method); } - public Set getMethods() { - return this.methods; + public Set getBeanMethods() { + return this.beanMethods; } public void addImportedResource(String importedResource, Class readerClass) { @@ -110,9 +110,9 @@ final class ConfigurationClass { // @Configuration class may declare two @Bean methods with the same name. final char hashDelim = '#'; Map methodNameCounts = new HashMap(); - for (ConfigurationClassMethod method : methods) { - String dClassName = method.getMetadata().getDeclaringClassName(); - String methodName = method.getMetadata().getMethodName(); + for (BeanMethod beanMethod : beanMethods) { + String dClassName = beanMethod.getMetadata().getDeclaringClassName(); + String methodName = beanMethod.getMetadata().getMethodName(); String fqMethodName = dClassName + hashDelim + methodName; Integer currentCount = methodNameCounts.get(fqMethodName); int newCount = currentCount != null ? currentCount + 1 : 1; @@ -134,8 +134,8 @@ final class ConfigurationClass { } } - for (ConfigurationClassMethod method : this.methods) { - method.validate(problemReporter); + for (BeanMethod beanMethod : this.beanMethods) { + beanMethod.validate(problemReporter); } } diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java index 0d606339122..88dc2778f6c 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java @@ -139,7 +139,7 @@ public class ConfigurationClassBeanDefinitionReader { AnnotationMetadata metadata = configClass.getMetadata(); processFeatureAnnotations(metadata); doLoadBeanDefinitionForConfigurationClassIfNecessary(configClass); - for (ConfigurationClassMethod beanMethod : configClass.getMethods()) { + for (BeanMethod beanMethod : configClass.getBeanMethods()) { loadBeanDefinitionsForBeanMethod(beanMethod); } loadBeanDefinitionsFromImportedResources(configClass.getImportedResources()); @@ -200,10 +200,10 @@ public class ConfigurationClassBeanDefinitionReader { } /** - * Read a particular {@link ConfigurationClassMethod}, registering bean definitions + * Read a particular {@link BeanMethod}, registering bean definitions * with the BeanDefinitionRegistry based on its contents. */ - private void loadBeanDefinitionsForBeanMethod(ConfigurationClassMethod beanMethod) { + private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) { ConfigurationClass configClass = beanMethod.getConfigurationClass(); MethodMetadata metadata = beanMethod.getMetadata(); diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java index 5507bee5049..b0ed6bdb952 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java @@ -150,8 +150,8 @@ class ConfigurationClassParser { } } Set beanMethods = metadata.getAnnotatedMethods(Bean.class.getName()); - for (MethodMetadata beanMethod : beanMethods) { - configClass.addMethod(new ConfigurationClassMethod(beanMethod, configClass)); + for (MethodMetadata methodMetadata : beanMethods) { + configClass.addBeanMethod(new BeanMethod(methodMetadata, configClass)); } }