Merge branch '5.3.x'

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

@@ -508,7 +508,7 @@ boolean hasAnyExternallyManagedInitMethod(String initMethod) {
 			}
 			if (this.externallyManagedInitMethods != null) {
 				for (String candidate : this.externallyManagedInitMethods) {
-					int indexOfDot = candidate.lastIndexOf(".");
+					int indexOfDot = candidate.lastIndexOf('.');
 					if (indexOfDot >= 0) {
 						String methodName = candidate.substring(indexOfDot + 1);
 						if (methodName.equals(initMethod)) {
@@ -585,7 +585,7 @@ boolean hasAnyExternallyManagedDestroyMethod(String destroyMethod) {
 			}
 			if (this.externallyManagedDestroyMethods != null) {
 				for (String candidate : this.externallyManagedDestroyMethods) {
-					int indexOfDot = candidate.lastIndexOf(".");
+					int indexOfDot = candidate.lastIndexOf('.');
 					if (indexOfDot >= 0) {
 						String methodName = candidate.substring(indexOfDot + 1);
 						if (methodName.equals(destroyMethod)) {

spring-core/src/main/java/org/springframework/util/StringUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,8 @@ public abstract class StringUtils {
 
 	private static final String FOLDER_SEPARATOR = "/";
 
+	private static final char FOLDER_SEPARATOR_CHAR = '/';
+
 	private static final String WINDOWS_FOLDER_SEPARATOR = "\\";
 
 	private static final String TOP_PATH = "..";
@@ -568,7 +570,7 @@ public static String getFilename(@Nullable String path) {
 			return null;
 		}
 
-		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);
+		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
 		return (separatorIndex != -1 ? path.substring(separatorIndex + 1) : path);
 	}
 
@@ -589,7 +591,7 @@ public static String getFilenameExtension(@Nullable String path) {
 			return null;
 		}
 
-		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR);
+		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
 		if (folderIndex > extIndex) {
 			return null;
 		}
@@ -609,7 +611,7 @@ public static String stripFilenameExtension(String path) {
 			return path;
 		}
 
-		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR);
+		int folderIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
 		if (folderIndex > extIndex) {
 			return path;
 		}
@@ -626,11 +628,11 @@ public static String stripFilenameExtension(String path) {
 	 * @return the full file path that results from applying the relative path
 	 */
 	public static String applyRelativePath(String path, String relativePath) {
-		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR);
+		int separatorIndex = path.lastIndexOf(FOLDER_SEPARATOR_CHAR);
 		if (separatorIndex != -1) {
 			String newPath = path.substring(0, separatorIndex);
 			if (!relativePath.startsWith(FOLDER_SEPARATOR)) {
-				newPath += FOLDER_SEPARATOR;
+				newPath += FOLDER_SEPARATOR_CHAR;
 			}
 			return newPath + relativePath;
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@ protected final void assertAttributeNotPresent(String output, String attributeNa
 	}
 
 	protected final void assertBlockTagContains(String output, String desiredContents) {
-		String contents = output.substring(output.indexOf(">") + 1, output.lastIndexOf("<"));
+		String contents = output.substring(output.indexOf(">") + 1, output.lastIndexOf('<'));
 		assertThat(contents.contains(desiredContents)).as("Expected to find '" + desiredContents + "' in the contents of block tag '" + output + "'").isTrue();
 	}