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

Revert signature change in BDRU.registerWithGeneratedName 

This change broke binary compatibility as evidenced by running
the greenhouse test suite and finding that Spring Integration's
AbstractConsumerEndpointParser.parseInternal fails with
NoSuchMethodError when trying to invoke.
This commit is contained in:
Chris Beams 2011-02-09 06:57:24 +00:00
parent b1756e2f17
commit c58b63a982
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
View File

@ -166,7 +166,7 @@ public class BeanDefinitionReaderUtils {
* for the given bean definition or the definition cannot be registered * for the given bean definition or the definition cannot be registered
*/ */
public static String registerWithGeneratedName( public static String registerWithGeneratedName(
BeanDefinition definition, BeanDefinitionRegistry registry) AbstractBeanDefinition definition, BeanDefinitionRegistry registry)
throws BeanDefinitionStoreException { throws BeanDefinitionStoreException {
String generatedName = generateBeanName(definition, registry, false); String generatedName = generateBeanName(definition, registry, false);

9
org.springframework.context/src/main/java/org/springframework/context/annotation/SimpleComponentRegistrar.java
View File

@ -20,9 +20,16 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.parsing.ComponentDefinition; import org.springframework.beans.factory.parsing.ComponentDefinition;
import org.springframework.beans.factory.parsing.ComponentRegistrar; import org.springframework.beans.factory.parsing.ComponentRegistrar;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
/**
* TODO SPR-7420: document
*
* @author Chris Beams
* @since 3.1
*/
public class SimpleComponentRegistrar implements ComponentRegistrar { public class SimpleComponentRegistrar implements ComponentRegistrar {
private final BeanDefinitionRegistry registry; private final BeanDefinitionRegistry registry;
@ -32,7 +39,7 @@ public class SimpleComponentRegistrar implements ComponentRegistrar {
} }
public String registerWithGeneratedName(BeanDefinition beanDefinition) { public String registerWithGeneratedName(BeanDefinition beanDefinition) {
return BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, this.registry); return BeanDefinitionReaderUtils.registerWithGeneratedName((AbstractBeanDefinition)beanDefinition, this.registry);
} }
public void registerBeanComponent(BeanComponentDefinition component) { public void registerBeanComponent(BeanComponentDefinition component) {