From c58b63a982ace4526f8a74b5326aa32a58d684c0 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 9 Feb 2011 06:57:24 +0000 Subject: [PATCH] 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. --- .../beans/factory/support/BeanDefinitionReaderUtils.java | 2 +- .../context/annotation/SimpleComponentRegistrar.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 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 26603663fd3..1d80a290cfc 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,7 +166,7 @@ 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); diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/SimpleComponentRegistrar.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/SimpleComponentRegistrar.java index 4c5e47e0c6f..8b9ceb1e898 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/SimpleComponentRegistrar.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/SimpleComponentRegistrar.java @@ -20,9 +20,16 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.ComponentDefinition; 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.BeanDefinitionRegistry; +/** + * TODO SPR-7420: document + * + * @author Chris Beams + * @since 3.1 + */ public class SimpleComponentRegistrar implements ComponentRegistrar { private final BeanDefinitionRegistry registry; @@ -32,7 +39,7 @@ public class SimpleComponentRegistrar implements ComponentRegistrar { } public String registerWithGeneratedName(BeanDefinition beanDefinition) { - return BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, this.registry); + return BeanDefinitionReaderUtils.registerWithGeneratedName((AbstractBeanDefinition)beanDefinition, this.registry); } public void registerBeanComponent(BeanComponentDefinition component) {