Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Produce less String-related garbage when generating bean names #24476

Merged
merged 1 commit into from Feb 4, 2020
Merged

Produce less String-related garbage when generating bean names #24476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -725,8 +725,9 @@ public String[] getAliases(String name) {
aliases.add(fullBeanName);
}
String[] retrievedAliases = super.getAliases(beanName);
String prefix = factoryPrefix ? FACTORY_BEAN_PREFIX : "";
for (String retrievedAlias : retrievedAliases) {
String alias = (factoryPrefix ? FACTORY_BEAN_PREFIX : "") + retrievedAlias;
String alias = prefix + retrievedAlias;
if (!alias.equals(name)) {
aliases.add(alias);
}
Expand Down
5 changes: 3 additions & 2 deletions ...ns/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -144,9 +144,10 @@ public static String uniqueBeanName(String beanName, BeanDefinitionRegistry regi
int counter = -1;

// Increase counter until the id is unique.
String prefix = beanName + GENERATED_BEAN_NAME_SEPARATOR;
while (counter == -1 || registry.containsBeanDefinition(id)) {
counter++;
id = beanName + GENERATED_BEAN_NAME_SEPARATOR + counter;
id = prefix + counter;
}
return id;
}
Expand Down
5 changes: 3 additions & 2 deletions .../src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -400,9 +400,10 @@ private Object resolveInnerBean(Object argName, String innerBeanName, BeanDefini
private String adaptInnerBeanName(String innerBeanName) {
String actualInnerBeanName = innerBeanName;
int counter = 0;
String prefix = innerBeanName + BeanFactoryUtils.GENERATED_BEAN_NAME_SEPARATOR;
while (this.beanFactory.isBeanNameInUse(actualInnerBeanName)) {
counter++;
actualInnerBeanName = innerBeanName + BeanFactoryUtils.GENERATED_BEAN_NAME_SEPARATOR + counter;
actualInnerBeanName = prefix + counter;
}
return actualInnerBeanName;
}
Expand Down