Skip to content

Commit c58b63a

Browse files
committed
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.
1 parent b1756e2 commit c58b63a

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public static void registerBeanDefinition(
166166
* for the given bean definition or the definition cannot be registered
167167
*/
168168
public static String registerWithGeneratedName(
169-
BeanDefinition definition, BeanDefinitionRegistry registry)
169+
AbstractBeanDefinition definition, BeanDefinitionRegistry registry)
170170
throws BeanDefinitionStoreException {
171171

172172
String generatedName = generateBeanName(definition, registry, false);

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,16 @@
2020
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
2121
import org.springframework.beans.factory.parsing.ComponentDefinition;
2222
import org.springframework.beans.factory.parsing.ComponentRegistrar;
23+
import org.springframework.beans.factory.support.AbstractBeanDefinition;
2324
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
2425
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2526

27+
/**
28+
* TODO SPR-7420: document
29+
*
30+
* @author Chris Beams
31+
* @since 3.1
32+
*/
2633
public class SimpleComponentRegistrar implements ComponentRegistrar {
2734

2835
private final BeanDefinitionRegistry registry;
@@ -32,7 +39,7 @@ public SimpleComponentRegistrar(BeanDefinitionRegistry registry) {
3239
}
3340

3441
public String registerWithGeneratedName(BeanDefinition beanDefinition) {
35-
return BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, this.registry);
42+
return BeanDefinitionReaderUtils.registerWithGeneratedName((AbstractBeanDefinition)beanDefinition, this.registry);
3643
}
3744

3845
public void registerBeanComponent(BeanComponentDefinition component) {

0 commit comments

Comments
 (0)