From 90268de9c0548a14893aa1c386f4de6e957e0948 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 20 Mar 2020 19:13:20 +0100 Subject: [PATCH] Polish implementation of BeanDefinitionReaderUtils.generateBeanName() Closes gh-24739 --- .../factory/support/BeanDefinitionReaderUtils.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java index 62c422c1a6..b02687792e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java @@ -118,16 +118,13 @@ public abstract class BeanDefinitionReaderUtils { "'class' nor 'parent' nor 'factory-bean' - can't generate bean name"); } - String id = generatedBeanName; if (isInnerBean) { // Inner bean: generate identity hashcode suffix. - id = generatedBeanName + GENERATED_BEAN_NAME_SEPARATOR + ObjectUtils.getIdentityHexString(definition); + return generatedBeanName + GENERATED_BEAN_NAME_SEPARATOR + ObjectUtils.getIdentityHexString(definition); } - else { - // Top-level bean: use plain class name with unique suffix if necessary. - return uniqueBeanName(generatedBeanName, registry); - } - return id; + + // Top-level bean: use plain class name with unique suffix if necessary. + return uniqueBeanName(generatedBeanName, registry); } /**