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.

Author: cbeams

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java

@@ -166,24 +166,11 @@ public static void registerBeanDefinition(
 	 * 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);
-
-	}
-
 }

org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

@@ -180,7 +180,7 @@ private void doLoadBeanDefinitionForConfigurationClassIfNecessary(ConfigurationC
 		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));