Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement additional micro performance optimizations

Browse Source 
See gh-34717
This commit is contained in:
Sam Brannen
2025-04-04 15:24:38 +02:00
parent 381bc4c405
commit dbd47ff4f9
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -114,10 +114,10 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
boolean isFactoryBean = FactoryBean.class.isAssignableFrom(beanClass); boolean isFactoryBean = FactoryBean.class.isAssignableFrom(beanClass);
for (String mappedName : this.beanNames) { for (String mappedName : this.beanNames) {
if (isFactoryBean) { if (isFactoryBean) {
if (!mappedName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) { if (mappedName.isEmpty() || mappedName.charAt(0) != BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
continue; continue;
} }
mappedName = mappedName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length()); mappedName = mappedName.substring(1); // length of '&'
} }
if (isMatch(beanName, mappedName)) { if (isMatch(beanName, mappedName)) {
return true; return true;

9
spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -124,9 +124,16 @@ public interface BeanFactory {
* beans <i>created</i> by the FactoryBean. For example, if the bean named * beans <i>created</i> by the FactoryBean. For example, if the bean named
* {@code myJndiObject} is a FactoryBean, getting {@code &myJndiObject} * {@code myJndiObject} is a FactoryBean, getting {@code &myJndiObject}
* will return the factory, not the instance returned by the factory. * will return the factory, not the instance returned by the factory.
* @see #FACTORY_BEAN_PREFIX_CHAR
*/ */
String FACTORY_BEAN_PREFIX = "&"; String FACTORY_BEAN_PREFIX = "&";
/**
* Character variant of {@link #FACTORY_BEAN_PREFIX}.
* @since 6.2.6
*/
char FACTORY_BEAN_PREFIX_CHAR = '&';
/** /**
* Return an instance, which may be shared or independent, of the specified bean. * Return an instance, which may be shared or independent, of the specified bean.

14
spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
View File

@@ -64,14 +64,6 @@ public abstract class BeanFactoryUtils {
private static final Map<String, String> transformedBeanNameCache = new ConcurrentHashMap<>(); private static final Map<String, String> transformedBeanNameCache = new ConcurrentHashMap<>();
/**
* Used to dereference a {@link FactoryBean} instance and distinguish it from
* beans <i>created</i> by the FactoryBean. For example, if the bean named
* {@code myJndiObject} is a FactoryBean, getting {@code &myJndiObject}
* will return the factory, not the instance returned by the factory.
*/
private static final char FACTORY_BEAN_PREFIX = BeanFactory.FACTORY_BEAN_PREFIX.charAt(0);
/** /**
* Return whether the given name is a factory dereference * Return whether the given name is a factory dereference
* (beginning with the factory dereference prefix). * (beginning with the factory dereference prefix).
@@ -92,14 +84,14 @@ public abstract class BeanFactoryUtils {
*/ */
public static String transformedBeanName(String name) { public static String transformedBeanName(String name) {
Assert.notNull(name, "'name' must not be null"); Assert.notNull(name, "'name' must not be null");
if (!isFactoryDereference(name)) { if (name.isEmpty() || name.charAt(0) != BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
return name; return name;
} }
return transformedBeanNameCache.computeIfAbsent(name, beanName -> { return transformedBeanNameCache.computeIfAbsent(name, beanName -> {
do { do {
beanName = beanName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length()); beanName = beanName.substring(1); // length of '&'
} }
while (isFactoryDereference(beanName)); while (beanName.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR);
return beanName; return beanName;
}); });
} }

8
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View File

@@ -770,16 +770,16 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
public String[] getAliases(String name) { public String[] getAliases(String name) {
String beanName = transformedBeanName(name); String beanName = transformedBeanName(name);
List<String> aliases = new ArrayList<>(); List<String> aliases = new ArrayList<>();
boolean factoryPrefix = name.startsWith(FACTORY_BEAN_PREFIX); boolean hasFactoryPrefix = (!name.isEmpty() && name.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR);
String fullBeanName = beanName; String fullBeanName = beanName;
if (factoryPrefix) { if (hasFactoryPrefix) {
fullBeanName = FACTORY_BEAN_PREFIX + beanName; fullBeanName = FACTORY_BEAN_PREFIX + beanName;
} }
if (!fullBeanName.equals(name)) { if (!fullBeanName.equals(name)) {
aliases.add(fullBeanName); aliases.add(fullBeanName);
} }
String[] retrievedAliases = super.getAliases(beanName); String[] retrievedAliases = super.getAliases(beanName);
String prefix = (factoryPrefix ? FACTORY_BEAN_PREFIX : ""); String prefix = (hasFactoryPrefix ? FACTORY_BEAN_PREFIX : "");
for (String retrievedAlias : retrievedAliases) { for (String retrievedAlias : retrievedAliases) {
String alias = prefix + retrievedAlias; String alias = prefix + retrievedAlias;
if (!alias.equals(name)) { if (!alias.equals(name)) {
@@ -1292,7 +1292,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
*/ */
protected String originalBeanName(String name) { protected String originalBeanName(String name) {
String beanName = transformedBeanName(name); String beanName = transformedBeanName(name);
if (name.startsWith(FACTORY_BEAN_PREFIX)) { if (!name.isEmpty() && name.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
beanName = FACTORY_BEAN_PREFIX + beanName; beanName = FACTORY_BEAN_PREFIX + beanName;
} }
return beanName; return beanName;

6
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
View File

@@ -364,9 +364,9 @@ class ConfigurationClassEnhancer {
// proxy that intercepts calls to getObject() and returns any cached bean instance. // proxy that intercepts calls to getObject() and returns any cached bean instance.
// This ensures that the semantics of calling a FactoryBean from within @Bean methods // This ensures that the semantics of calling a FactoryBean from within @Bean methods
// is the same as that of referring to a FactoryBean within XML. See SPR-6602. // is the same as that of referring to a FactoryBean within XML. See SPR-6602.
if (factoryContainsBean(beanFactory, BeanFactory.FACTORY_BEAN_PREFIX + beanName) && String factoryBeanName = BeanFactory.FACTORY_BEAN_PREFIX + beanName;
factoryContainsBean(beanFactory, beanName)) { if (factoryContainsBean(beanFactory, factoryBeanName) && factoryContainsBean(beanFactory, beanName)) {
Object factoryBean = beanFactory.getBean(BeanFactory.FACTORY_BEAN_PREFIX + beanName); Object factoryBean = beanFactory.getBean(factoryBeanName);
if (factoryBean instanceof ScopedProxyFactoryBean) { if (factoryBean instanceof ScopedProxyFactoryBean) {
// Scoped proxy factory beans are a special case and should not be further proxied // Scoped proxy factory beans are a special case and should not be further proxied
} }

6
spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -932,8 +932,8 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
*/ */
private boolean isExcluded(String beanName) { private boolean isExcluded(String beanName) {
return (this.excludedBeans.contains(beanName) || return (this.excludedBeans.contains(beanName) ||
(beanName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX) && (!beanName.isEmpty() && (beanName.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR) &&
this.excludedBeans.contains(beanName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length())))); this.excludedBeans.contains(beanName.substring(1)))); // length of '&'
} }
/** /**