From f683f781c584b12790752ddfb0ee334e61a0b9e9 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 6 May 2011 19:01:35 +0000 Subject: [PATCH] Revert deprecation of BDRU#registerWithGeneratedName The overloading necessary to preserve the new signature as well as the old causes ambiguities leading to deprecation warnings in some caller scenarios. --- .../support/BeanDefinitionReaderUtils.java | 15 +-------------- .../ConfigurationClassBeanDefinitionReader.java | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java index 4407c05902..804378b1b1 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java @@ -166,24 +166,11 @@ public class BeanDefinitionReaderUtils { * for the given bean definition or the definition cannot be registered */ public static String registerWithGeneratedName( - BeanDefinition definition, BeanDefinitionRegistry registry) + AbstractBeanDefinition definition, BeanDefinitionRegistry registry) throws BeanDefinitionStoreException { String generatedName = generateBeanName(definition, registry, false); registry.registerBeanDefinition(generatedName, definition); return generatedName; } - /** - * @deprecated since Spring 3.1 in favor of - * {@link #registerWithGeneratedName(BeanDefinition, BeanDefinitionRegistry)} - * and its more general signature. - */ - @Deprecated - public static String registerWithGeneratedName( - AbstractBeanDefinition definition, BeanDefinitionRegistry registry) - throws BeanDefinitionStoreException { - return registerWithGeneratedName((BeanDefinition)definition, registry); - - } - } 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 5e05f74a30..0d60633912 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 @@ -180,7 +180,7 @@ public class ConfigurationClassBeanDefinitionReader { String className = configClass.getMetadata().getClassName(); configBeanDef.setBeanClassName(className); if (checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) { - String configBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(configBeanDef, this.registry); + String configBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName((AbstractBeanDefinition)configBeanDef, this.registry); configClass.setBeanName(configBeanName); if (logger.isDebugEnabled()) { logger.debug(String.format("Registered bean definition for imported @Configuration class %s", configBeanName));