Skip to content

Commit 49873a3

Browse files
stsypanovjhoeller
authored andcommitted
Simplify String concatenation
1 parent cc4593f commit 49873a3

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,7 @@ public int hashCode() {
544544

545545
@Override
546546
public String toString() {
547-
StringBuilder sb = new StringBuilder();
548-
sb.append("AspectJExpressionPointcut: ");
549-
sb.append("(");
547+
StringBuilder sb = new StringBuilder("AspectJExpressionPointcut: (");
550548
for (int i = 0; i < this.pointcutParameterTypes.length; i++) {
551549
sb.append(this.pointcutParameterTypes[i].getName());
552550
sb.append(" ");
@@ -555,8 +553,7 @@ public String toString() {
555553
sb.append(", ");
556554
}
557555
}
558-
sb.append(")");
559-
sb.append(" ");
556+
sb.append(") ");
560557
if (getExpression() != null) {
561558
sb.append(getExpression());
562559
}

spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -987,14 +987,11 @@ private int getPropertyNameKeyEnd(String propertyName, int startIndex) {
987987

988988
@Override
989989
public String toString() {
990-
StringBuilder sb = new StringBuilder(getClass().getName());
991-
if (this.wrappedObject != null) {
992-
sb.append(": wrapping object [").append(ObjectUtils.identityToString(this.wrappedObject)).append("]");
990+
String className = getClass().getName();
991+
if (this.wrappedObject == null) {
992+
return className + ": no wrapped object set";
993993
}
994-
else {
995-
sb.append(": no wrapped object set");
996-
}
997-
return sb.toString();
994+
return className + ": wrapping object [" + ObjectUtils.identityToString(this.wrappedObject) + ']';
998995
}
999996

1000997

spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,10 @@ public int hashCode() {
380380
@Override
381381
public String toString() {
382382
PropertyValue[] pvs = getPropertyValues();
383-
StringBuilder sb = new StringBuilder("PropertyValues: length=").append(pvs.length);
384383
if (pvs.length > 0) {
385-
sb.append("; ").append(StringUtils.arrayToDelimitedString(pvs, "; "));
384+
return "PropertyValues: length=" + pvs.length + "; " + StringUtils.arrayToDelimitedString(pvs, "; ");
386385
}
387-
return sb.toString();
386+
return "PropertyValues: length=0";
388387
}
389388

390389
}

spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,10 @@ public boolean matchesName(@Nullable String candidateName) {
135135
* @see #getAliases()
136136
*/
137137
public String getShortDescription() {
138-
StringBuilder sb = new StringBuilder();
139-
sb.append("Bean definition with name '").append(this.beanName).append("'");
140-
if (this.aliases != null) {
141-
sb.append(" and aliases [").append(StringUtils.arrayToCommaDelimitedString(this.aliases)).append("]");
138+
if (this.aliases == null) {
139+
return "Bean definition with name '" + this.beanName + "'";
142140
}
143-
return sb.toString();
141+
return "Bean definition with name '" + this.beanName + "' and aliases [" + StringUtils.arrayToCommaDelimitedString(this.aliases) + ']';
144142
}
145143

146144
/**

0 commit comments

Comments
 (0)