Simplify utility implementations in spring-core

polyglot-k · sbrannen · commit 2494ecb47bed · 2024-11-17T15:08:30.000+01:00
Closes gh-33903
diff --git a/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java b/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java
@@ -98,13 +98,11 @@ public void write(int datum) throws IOException {
 		if (this.closed) {
 			throw new IOException("Stream closed");
 		}
-		else {
-			if (this.buffers.peekLast() == null || this.buffers.getLast().length == this.index) {
-				addBuffer(1);
-			}
-			// store the byte
-			this.buffers.getLast()[this.index++] = (byte) datum;
+		if (this.buffers.peekLast() == null || this.buffers.getLast().length == this.index) {
+			addBuffer(1);
 		}
+		// store the byte
+		this.buffers.getLast()[this.index++] = (byte) datum;
 	}
 
 	@Override
@@ -384,22 +382,20 @@ public int read() {
 				// This stream doesn't have any data in it...
 				return -1;
 			}
+			if (this.nextIndexInCurrentBuffer < this.currentBufferLength) {
+				this.totalBytesRead++;
+				return this.currentBuffer[this.nextIndexInCurrentBuffer++] & 0xFF;
+			}
 			else {
-				if (this.nextIndexInCurrentBuffer < this.currentBufferLength) {
-					this.totalBytesRead++;
-					return this.currentBuffer[this.nextIndexInCurrentBuffer++] & 0xFF;
+				if (this.buffersIterator.hasNext()) {
+					this.currentBuffer = this.buffersIterator.next();
+					updateCurrentBufferLength();
+					this.nextIndexInCurrentBuffer = 0;
 				}
 				else {
-					if (this.buffersIterator.hasNext()) {
-						this.currentBuffer = this.buffersIterator.next();
-						updateCurrentBufferLength();
-						this.nextIndexInCurrentBuffer = 0;
-					}
-					else {
-						this.currentBuffer = null;
-					}
-					return read();
+					this.currentBuffer = null;
 				}
+				return read();
 			}
 		}
 
diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
@@ -226,14 +226,12 @@ protected Method findMatchingMethod() {
 		Method matchingMethod = null;
 
 		for (Method candidate : candidates) {
-			if (candidate.getName().equals(targetMethod)) {
-				if (candidate.getParameterCount() == argCount) {
-					Class<?>[] paramTypes = candidate.getParameterTypes();
-					int typeDiffWeight = getTypeDifferenceWeight(paramTypes, arguments);
-					if (typeDiffWeight < minTypeDiffWeight) {
-						minTypeDiffWeight = typeDiffWeight;
-						matchingMethod = candidate;
-					}
+			if (candidate.getName().equals(targetMethod) && candidate.getParameterCount() == argCount) {
+				Class<?>[] paramTypes = candidate.getParameterTypes();
+				int typeDiffWeight = getTypeDifferenceWeight(paramTypes, arguments);
+				if (typeDiffWeight < minTypeDiffWeight) {
+					minTypeDiffWeight = typeDiffWeight;
+					matchingMethod = candidate;
 				}
 			}
 		}
diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -243,9 +243,7 @@ private boolean isQuotedString(String s) {
 		if (s.length() < 2) {
 			return false;
 		}
-		else {
-			return ((s.startsWith("\"") && s.endsWith("\"")) || (s.startsWith("'") && s.endsWith("'")));
-		}
+		return ((s.startsWith("\"") && s.endsWith("\"")) || (s.startsWith("'") && s.endsWith("'")));
 	}
 
 	protected String unquote(String s) {
diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
@@ -110,10 +110,8 @@ else if (BigInteger.class == targetClass) {
 				// do not lose precision - use BigDecimal's own conversion
 				return (T) bigDecimal.toBigInteger();
 			}
-			else {
-				// original value is not a Big* number - use standard long conversion
-				return (T) BigInteger.valueOf(number.longValue());
-			}
+			// original value is not a Big* number - use standard long conversion
+			return (T) BigInteger.valueOf(number.longValue());
 		}
 		else if (Float.class == targetClass) {
 			return (T) Float.valueOf(number.floatValue());
diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -702,8 +702,7 @@ public static String nullSafeToString(@Nullable byte[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
@@ -726,8 +725,7 @@ public static String nullSafeToString(@Nullable char[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
@@ -750,8 +748,7 @@ public static String nullSafeToString(@Nullable double[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
@@ -774,8 +771,7 @@ public static String nullSafeToString(@Nullable float[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
@@ -798,8 +794,7 @@ public static String nullSafeToString(@Nullable int[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);
@@ -846,8 +841,7 @@ public static String nullSafeToString(@Nullable short[] array) {
 		if (array == null) {
 			return NULL_STRING;
 		}
-		int length = array.length;
-		if (length == 0) {
+		if (array.length == 0) {
 			return EMPTY_ARRAY;
 		}
 		StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);

Original file line number	Diff line number	Diff line change
`@@ -243,9 +243,7 @@ private boolean isQuotedString(String s) {`
`243`	`243`	`if (s.length() < 2) {`
`244`	`244`	`return false;`
`245`	`245`	`}`
`246`		`- else {`
`247`		`- return ((s.startsWith("\"") && s.endsWith("\"")) \|\| (s.startsWith("'") && s.endsWith("'")));`
`248`		`- }`
	`246`	`+ return ((s.startsWith("\"") && s.endsWith("\"")) \|\| (s.startsWith("'") && s.endsWith("'")));`
`249`	`247`	`}`
`250`	`248`
`251`	`249`	`protected String unquote(String s) {`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,8 @@ else if (BigInteger.class == targetClass) {`
`110`	`110`	`// do not lose precision - use BigDecimal's own conversion`
`111`	`111`	`return (T) bigDecimal.toBigInteger();`
`112`	`112`	`}`
`113`		`- else {`
`114`		`- // original value is not a Big* number - use standard long conversion`
`115`		`- return (T) BigInteger.valueOf(number.longValue());`
`116`		`- }`
	`113`	`+ // original value is not a Big* number - use standard long conversion`
	`114`	`+ return (T) BigInteger.valueOf(number.longValue());`
`117`	`115`	`}`
`118`	`116`	`else if (Float.class == targetClass) {`
`119`	`117`	`return (T) Float.valueOf(number.floatValue());`
Original file line number	Diff line number	Diff line change
`@@ -702,8 +702,7 @@ public static String nullSafeToString(@Nullable byte[] array) {`
`702`	`702`	`if (array == null) {`
`703`	`703`	`return NULL_STRING;`
`704`	`704`	`}`
`705`		`- int length = array.length;`
`706`		`- if (length == 0) {`
	`705`	`+ if (array.length == 0) {`
`707`	`706`	`return EMPTY_ARRAY;`
`708`	`707`	`}`
`709`	`708`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`
`@@ -726,8 +725,7 @@ public static String nullSafeToString(@Nullable char[] array) {`
`726`	`725`	`if (array == null) {`
`727`	`726`	`return NULL_STRING;`
`728`	`727`	`}`
`729`		`- int length = array.length;`
`730`		`- if (length == 0) {`
	`728`	`+ if (array.length == 0) {`
`731`	`729`	`return EMPTY_ARRAY;`
`732`	`730`	`}`
`733`	`731`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`
`@@ -750,8 +748,7 @@ public static String nullSafeToString(@Nullable double[] array) {`
`750`	`748`	`if (array == null) {`
`751`	`749`	`return NULL_STRING;`
`752`	`750`	`}`
`753`		`- int length = array.length;`
`754`		`- if (length == 0) {`
	`751`	`+ if (array.length == 0) {`
`755`	`752`	`return EMPTY_ARRAY;`
`756`	`753`	`}`
`757`	`754`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`
`@@ -774,8 +771,7 @@ public static String nullSafeToString(@Nullable float[] array) {`
`774`	`771`	`if (array == null) {`
`775`	`772`	`return NULL_STRING;`
`776`	`773`	`}`
`777`		`- int length = array.length;`
`778`		`- if (length == 0) {`
	`774`	`+ if (array.length == 0) {`
`779`	`775`	`return EMPTY_ARRAY;`
`780`	`776`	`}`
`781`	`777`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`
`@@ -798,8 +794,7 @@ public static String nullSafeToString(@Nullable int[] array) {`
`798`	`794`	`if (array == null) {`
`799`	`795`	`return NULL_STRING;`
`800`	`796`	`}`
`801`		`- int length = array.length;`
`802`		`- if (length == 0) {`
	`797`	`+ if (array.length == 0) {`
`803`	`798`	`return EMPTY_ARRAY;`
`804`	`799`	`}`
`805`	`800`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`
`@@ -846,8 +841,7 @@ public static String nullSafeToString(@Nullable short[] array) {`
`846`	`841`	`if (array == null) {`
`847`	`842`	`return NULL_STRING;`
`848`	`843`	`}`
`849`		`- int length = array.length;`
`850`		`- if (length == 0) {`
	`844`	`+ if (array.length == 0) {`
`851`	`845`	`return EMPTY_ARRAY;`
`852`	`846`	`}`
`853`	`847`	`StringJoiner stringJoiner = new StringJoiner(ARRAY_ELEMENT_SEPARATOR, ARRAY_START, ARRAY_END);`