diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index 4d6a341066..1cdef3141d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -544,9 +544,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("AspectJExpressionPointcut: "); - sb.append("("); + StringBuilder sb = new StringBuilder("AspectJExpressionPointcut: ("); for (int i = 0; i < this.pointcutParameterTypes.length; i++) { sb.append(this.pointcutParameterTypes[i].getName()); sb.append(" "); @@ -555,8 +553,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut sb.append(", "); } } - sb.append(")"); - sb.append(" "); + sb.append(") "); if (getExpression() != null) { sb.append(getExpression()); } diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java index d6379f4e03..e079a48900 100644 --- a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java @@ -987,14 +987,11 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA @Override public String toString() { - StringBuilder sb = new StringBuilder(getClass().getName()); - if (this.wrappedObject != null) { - sb.append(": wrapping object [").append(ObjectUtils.identityToString(this.wrappedObject)).append("]"); + String className = getClass().getName(); + if (this.wrappedObject == null) { + return className + ": no wrapped object set"; } - else { - sb.append(": no wrapped object set"); - } - return sb.toString(); + return className + ": wrapping object [" + ObjectUtils.identityToString(this.wrappedObject) + ']'; } diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java index 7ab1536ea9..b3f05399f4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java @@ -380,11 +380,10 @@ public class MutablePropertyValues implements PropertyValues, Serializable { @Override public String toString() { PropertyValue[] pvs = getPropertyValues(); - StringBuilder sb = new StringBuilder("PropertyValues: length=").append(pvs.length); if (pvs.length > 0) { - sb.append("; ").append(StringUtils.arrayToDelimitedString(pvs, "; ")); + return "PropertyValues: length=" + pvs.length + "; " + StringUtils.arrayToDelimitedString(pvs, "; "); } - return sb.toString(); + return "PropertyValues: length=0"; } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java index 867b62bc27..d6767f7dcf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java @@ -135,12 +135,10 @@ public class BeanDefinitionHolder implements BeanMetadataElement { * @see #getAliases() */ public String getShortDescription() { - StringBuilder sb = new StringBuilder(); - sb.append("Bean definition with name '").append(this.beanName).append("'"); - if (this.aliases != null) { - sb.append(" and aliases [").append(StringUtils.arrayToCommaDelimitedString(this.aliases)).append("]"); + if (this.aliases == null) { + return "Bean definition with name '" + this.beanName + "'"; } - return sb.toString(); + return "Bean definition with name '" + this.beanName + "' and aliases [" + StringUtils.arrayToCommaDelimitedString(this.aliases) + ']'; } /**