Polishing

Author: jhoeller

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java

@@ -60,7 +60,7 @@ class AspectJExpressionPointcutTests {
 
 
 @BeforeEach
-public void setup() throws NoSuchMethodException {
+void setup() throws NoSuchMethodException {
 getAge = TestBean.class.getMethod("getAge");
 setAge = TestBean.class.getMethod("setAge", int.class);
 setSomeNumber = TestBean.class.getMethod("setSomeNumber", Number.class);
@@ -193,7 +193,7 @@ void testFriendlyErrorOnNoLocation3ArgMatching() {
 
 
 @Test
-void testMatchWithArgs() throws Exception {
+void testMatchWithArgs() {
 String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number)) && args(Double)";
 
 Pointcut pointcut = getPointcut(expression);

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

@@ -123,7 +123,7 @@ public static boolean isEmpty(@Nullable Object str) {
  * @see #hasText(CharSequence)
  */
 public static boolean hasLength(@Nullable CharSequence str) {
-return (str != null && str.length() > 0);
+return (str != null && !str.isEmpty()); // as of JDK 15
 }
 
 /**
@@ -853,7 +853,7 @@ public static Locale parseLocale(String localeValue) {
 if (!localeValue.contains("_") && !localeValue.contains(" ")) {
 validateLocalePart(localeValue);
 Locale resolved = Locale.forLanguageTag(localeValue);
-if (resolved.getLanguage().length() > 0) {
+if (!resolved.getLanguage().isEmpty()) {
 return resolved;
 }
 }
@@ -1182,7 +1182,7 @@ public static String[] tokenizeToStringArray(
 if (trimTokens) {
 token = token.trim();
 }
-if (!ignoreEmptyTokens || token.length() > 0) {
+if (!ignoreEmptyTokens || !token.isEmpty()) {
 tokens.add(token);
 }
 }
@@ -1244,7 +1244,7 @@ public static String[] delimitedListToStringArray(
 result.add(deleteAny(str.substring(pos, delPos), charsToDelete));
 pos = delPos + delimiter.length();
 }
-if (str.length() > 0 && pos <= str.length()) {
+if (!str.isEmpty() && pos <= str.length()) {
 // Add rest of String, but not in case of empty input.
 result.add(deleteAny(str.substring(pos), charsToDelete));
 }