From 29f382b04eda1c3b8cabb231bcb014395643c725 Mon Sep 17 00:00:00 2001
From: stsypanov <sergei.tsypanov@yandex.ru>
Date: Thu, 14 Mar 2019 12:37:08 +0200
Subject: [PATCH] Simplify String concatenation

---
 .../factory/config/BeanDefinitionHolder.java  |  4 +---
 .../springframework/core/ResolvableType.java  |  7 ++-----
 .../expression/spel/ast/Selection.java        | 19 ++++++++-----------
 .../mock/web/MockHttpServletRequest.java      |  9 ++++-----
 .../AbstractMediaTypeExpression.java          |  6 ++----
 .../AbstractMediaTypeExpression.java          |  6 ++----
 6 files changed, 19 insertions(+), 32 deletions(-)

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 8556c3affbf..376fa8602d8 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
@@ -150,9 +150,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement {
 	 * @see #getBeanDefinition()
 	 */
 	public String getLongDescription() {
-		StringBuilder sb = new StringBuilder(getShortDescription());
-		sb.append(": ").append(this.beanDefinition);
-		return sb.toString();
+		return getShortDescription() + ": " + this.beanDefinition;
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index ca7bece83eb..0b793d8656e 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -965,13 +965,10 @@ public class ResolvableType implements Serializable {
 				return "?";
 			}
 		}
-		StringBuilder result = new StringBuilder(this.resolved.getName());
 		if (hasGenerics()) {
-			result.append('<');
-			result.append(StringUtils.arrayToDelimitedString(getGenerics(), ", "));
-			result.append('>');
+			return this.resolved.getName() + '<' + StringUtils.arrayToDelimitedString(getGenerics(), ", ") + '>';
 		}
-		return result.toString();
+		return this.resolved.getName();
 	}
 
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
index 92c4eeaf02d..1711cc5b4db 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
@@ -205,19 +205,16 @@ public class Selection extends SpelNodeImpl {
 
 	@Override
 	public String toStringAST() {
-		StringBuilder sb = new StringBuilder();
+		return prefix() + getChild(0).toStringAST() + "]";
+	}
+
+	private String prefix() {
 		switch (this.variant) {
-			case ALL:
-				sb.append("?[");
-				break;
-			case FIRST:
-				sb.append("^[");
-				break;
-			case LAST:
-				sb.append("$[");
-				break;
+			case ALL:   return "?[";
+			case FIRST: return "^[";
+			case LAST:  return "$[";
 		}
-		return sb.append(getChild(0).toStringAST()).append("]").toString();
+		return "";
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 69f41ea1b74..628c4abbdd1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -403,12 +403,11 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	private void updateContentTypeHeader() {
 		if (StringUtils.hasLength(this.contentType)) {
-			StringBuilder sb = new StringBuilder(this.contentType);
-			if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) &&
-					StringUtils.hasLength(this.characterEncoding)) {
-				sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
+			String value = this.contentType;
+			if (StringUtils.hasLength(this.characterEncoding) && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
+				value += ';' + CHARSET_PREFIX + this.characterEncoding;
 			}
-			doAddHeaderValue(HttpHeaders.CONTENT_TYPE, sb.toString(), true);
+			doAddHeaderValue(HttpHeaders.CONTENT_TYPE, value, true);
 		}
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
index 9e41cddceb0..049e535608b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
@@ -108,12 +108,10 @@ abstract class AbstractMediaTypeExpression implements Comparable<AbstractMediaTy
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
 		if (this.isNegated) {
-			builder.append('!');
+			return '!' + this.mediaType.toString();
 		}
-		builder.append(this.mediaType.toString());
-		return builder.toString();
+		return this.mediaType.toString();
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
index a0b829bc85c..81d8345bd17 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
@@ -92,12 +92,10 @@ abstract class AbstractMediaTypeExpression implements MediaTypeExpression, Compa
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
 		if (this.isNegated) {
-			builder.append('!');
+			return '!' + this.mediaType.toString();
 		}
-		builder.append(this.mediaType.toString());
-		return builder.toString();
+		return this.mediaType.toString();
 	}
 
 }