Use .isEmpty() where feasible

quaff · philwebb · commit ac18e3015cbe · 2023-12-19T22:38:05.000-08:00
See gh-38739
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java
@@ -221,7 +221,7 @@ private void addClassifiedManagedDependencies(Node dependencyManagement) {
 						.collect(Collectors.toSet());
 					Node target = dependency;
 					for (String classifier : classifiers) {
-						if (classifier.length() > 0) {
+						if (!classifier.isEmpty()) {
 							if (target == null) {
 								target = new Node(null, "dependency");
 								target.appendNode("groupId", groupId);
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointSupport.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointSupport.java
@@ -127,7 +127,7 @@ private Object getContributor(String[] path, int pathOffset) {
 	private String getName(String[] path, int pathOffset) {
 		StringBuilder name = new StringBuilder();
 		while (pathOffset < path.length) {
-			name.append((name.length() != 0) ? "/" : "");
+			name.append((!name.isEmpty()) ? "/" : "");
 			name.append(path[pathOffset]);
 			pathOffset++;
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -332,7 +332,7 @@ private String createOnBeanNoMatchReason(MatchResult matchResult) {
 
 	private void appendMessageForNoMatches(StringBuilder reason, Collection<String> unmatched, String description) {
 		if (!unmatched.isEmpty()) {
-			if (reason.length() > 0) {
+			if (!reason.isEmpty()) {
 				reason.append(" and ");
 			}
 			reason.append("did not find any beans ");
@@ -347,7 +347,7 @@ private String createOnMissingBeanNoMatchReason(MatchResult matchResult) {
 		appendMessageForMatches(reason, matchResult.getMatchedAnnotations(), "annotated with");
 		appendMessageForMatches(reason, matchResult.getMatchedTypes(), "of type");
 		if (!matchResult.getMatchedNames().isEmpty()) {
-			if (reason.length() > 0) {
+			if (!reason.isEmpty()) {
 				reason.append(" and ");
 			}
 			reason.append("found beans named ");
@@ -360,7 +360,7 @@ private void appendMessageForMatches(StringBuilder reason, Map<String, Collectio
 			String description) {
 		if (!matches.isEmpty()) {
 			matches.forEach((key, value) -> {
-				if (reason.length() > 0) {
+				if (!reason.isEmpty()) {
 					reason.append(" and ");
 				}
 				reason.append("found beans ");
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
@@ -345,7 +345,7 @@ private String toCommaDelimitedString(List<Object> list) {
 			}
 			StringBuilder result = new StringBuilder();
 			for (Object item : list) {
-				result.append((result.length() != 0) ? "," : "");
+				result.append((!result.isEmpty()) ? "," : "");
 				result.append(item);
 			}
 			return result.toString();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java
@@ -173,7 +173,7 @@ public JSONStringer endObject() throws JSONException {
 	 * @throws JSONException if processing of json failed
 	 */
 	JSONStringer open(Scope empty, String openBracket) throws JSONException {
-		if (this.stack.isEmpty() && this.out.length() > 0) {
+		if (this.stack.isEmpty() && !this.out.isEmpty()) {
 			throw new JSONException("Nesting problem: multiple top-level roots");
 		}
 		beforeValue();
@@ -423,7 +423,7 @@ else if (context != Scope.NULL) {
 	 */
 	@Override
 	public String toString() {
-		return this.out.length() == 0 ? null : this.out.toString();
+		return this.out.isEmpty() ? null : this.out.toString();
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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,7 +65,7 @@ private String buildName(String prefix, String name) {
 			fullName.append(prefix);
 		}
 		if (name != null) {
-			if (fullName.length() > 0) {
+			if (!fullName.isEmpty()) {
 				fullName.append('.');
 			}
 			fullName.append(ConfigurationMetadata.toDashedCase(name));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
@@ -227,7 +227,7 @@ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
 		}
 
 		boolean hasReportedErrors() {
-			return this.message.length() > 0;
+			return !this.message.isEmpty();
 		}
 
 		@Override
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
@@ -329,7 +329,7 @@ private void addClasspath(List<String> args) throws MojoExecutionException {
 		try {
 			StringBuilder classpath = new StringBuilder();
 			for (URL ele : getClassPathUrls()) {
-				if (classpath.length() > 0) {
+				if (!classpath.isEmpty()) {
 					classpath.append(File.pathSeparator);
 				}
 				classpath.append(new File(ele.toURI()));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CommandLineBuilder.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CommandLineBuilder.java
@@ -98,7 +98,7 @@ static class ClasspathBuilder {
 		static String build(List<URL> classpathElements) {
 			StringBuilder classpath = new StringBuilder();
 			for (URL element : classpathElements) {
-				if (classpath.length() > 0) {
+				if (!classpath.isEmpty()) {
 					classpath.append(File.pathSeparator);
 				}
 				classpath.append(toFile(element));
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -121,7 +121,7 @@ private void appendContext(StringBuilder message) {
 		}
 		append(context, "started by ", () -> System.getProperty("user.name"));
 		append(context, "in ", () -> System.getProperty("user.dir"));
-		if (context.length() > 0) {
+		if (!context.isEmpty()) {
 			message.append(" (");
 			message.append(context);
 			message.append(")");
@@ -143,7 +143,7 @@ private void append(StringBuilder message, String prefix, Callable<Object> call,
 			value = defaultValue;
 		}
 		if (StringUtils.hasLength(value)) {
-			message.append((message.length() > 0) ? " " : "");
+			message.append((!message.isEmpty()) ? " " : "");
 			message.append(prefix);
 			message.append(value);
 		}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectPropertyName.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectPropertyName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -52,7 +52,7 @@ public static String toDashedForm(String name) {
 				}
 				else {
 					ch = (ch != '_') ? ch : '-';
-					if (Character.isUpperCase(ch) && result.length() > 0 && result.charAt(result.length() - 1) != '-') {
+					if (Character.isUpperCase(ch) && !result.isEmpty() && result.charAt(result.length() - 1) != '-') {
 						result.append('-');
 					}
 					result.append(Character.toLowerCase(ch));
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
@@ -211,7 +211,7 @@ private boolean isScalarValue(ConfigurationPropertySource source, ConfigurationP
 		private String getKeyName(ConfigurationPropertyName name) {
 			StringBuilder result = new StringBuilder();
 			for (int i = this.root.getNumberOfElements(); i < name.getNumberOfElements(); i++) {
-				if (result.length() != 0) {
+				if (!result.isEmpty()) {
 					result.append('.');
 				}
 				result.append(name.getElement(i, Form.ORIGINAL));
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -543,7 +543,7 @@ private String buildToString() {
 		StringBuilder result = new StringBuilder(elements * 8);
 		for (int i = 0; i < elements; i++) {
 			boolean indexed = isIndexed(i);
-			if (result.length() > 0 && !indexed) {
+			if (!result.isEmpty() && !indexed) {
 				result.append('.');
 			}
 			if (indexed) {
@@ -615,7 +615,7 @@ private static Elements elementsOf(CharSequence name, boolean returnNullIfInvali
 			Assert.isTrue(returnNullIfInvalid, "Name must not be null");
 			return null;
 		}
-		if (name.length() == 0) {
+		if (name.isEmpty()) {
 			return Elements.EMPTY;
 		}
 		if (name.charAt(0) == '.' || name.charAt(name.length() - 1) == '.') {
@@ -674,7 +674,7 @@ public static ConfigurationPropertyName adapt(CharSequence name, char separator)
 	static ConfigurationPropertyName adapt(CharSequence name, char separator,
 			Function<CharSequence, CharSequence> elementValueProcessor) {
 		Assert.notNull(name, "Name must not be null");
-		if (name.length() == 0) {
+		if (name.isEmpty()) {
 			return EMPTY;
 		}
 		Elements elements = new ElementsParser(name, separator).parse(elementValueProcessor);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -57,7 +57,7 @@ private String convertName(ConfigurationPropertyName name) {
 	private String convertName(ConfigurationPropertyName name, int numberOfElements) {
 		StringBuilder result = new StringBuilder();
 		for (int i = 0; i < numberOfElements; i++) {
-			if (result.length() > 0) {
+			if (!result.isEmpty()) {
 				result.append('_');
 			}
 			result.append(name.getElement(i, Form.UNIFORM).toUpperCase(Locale.ENGLISH));
@@ -68,7 +68,7 @@ private String convertName(ConfigurationPropertyName name, int numberOfElements)
 	private String convertLegacyName(ConfigurationPropertyName name) {
 		StringBuilder result = new StringBuilder();
 		for (int i = 0; i < name.getNumberOfElements(); i++) {
-			if (result.length() > 0) {
+			if (!result.isEmpty()) {
 				result.append('_');
 			}
 			result.append(convertLegacyNameElement(name.getElement(i, Form.ORIGINAL)));
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -158,7 +158,7 @@ else if (current == '\\') {
 			}
 			index++;
 		}
-		if (build.length() > 0) {
+		if (!build.isEmpty()) {
 			list.add(build.toString().trim());
 		}
 		return list;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
@@ -130,7 +130,7 @@ public void format(LogEvent event, StringBuilder toAppendTo) {
 		for (PatternFormatter formatter : this.formatters) {
 			formatter.format(event, buf);
 		}
-		if (buf.length() > 0) {
+		if (!buf.isEmpty()) {
 			AnsiElement element = this.styling;
 			if (element == null) {
 				// Assume highlighting
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -258,14 +258,14 @@ private void reportConfigurationErrorsIfNecessary(LoggerContext loggerContext) {
 		List<Throwable> suppressedExceptions = new ArrayList<>();
 		for (Status status : loggerContext.getStatusManager().getCopyOfStatusList()) {
 			if (status.getLevel() == Status.ERROR) {
-				errors.append((errors.length() > 0) ? String.format("%n") : "");
+				errors.append((!errors.isEmpty()) ? String.format("%n") : "");
 				errors.append(status.toString());
 				if (status.getThrowable() != null) {
 					suppressedExceptions.add(status.getThrowable());
 				}
 			}
 		}
-		if (errors.length() == 0) {
+		if (errors.isEmpty()) {
 			if (!StatusUtil.contextHasStatusListener(loggerContext)) {
 				StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext);
 			}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java
@@ -212,7 +212,7 @@ ConnectionFactory buildAndWrap(ConnectionFactoryOptions options) {
 
 		private ConnectionFactoryOptions delegateFactoryOptions(ConnectionFactoryOptions options) {
 			String protocol = toString(options.getRequiredValue(ConnectionFactoryOptions.PROTOCOL));
-			if (protocol.trim().length() == 0) {
+			if (protocol.trim().isEmpty()) {
 				throw new IllegalArgumentException(String.format("Protocol %s is not valid.", protocol));
 			}
 			String[] protocols = protocol.split(COLON, 2);

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private Object getContributor(String[] path, int pathOffset) {`
`127`	`127`	`private String getName(String[] path, int pathOffset) {`
`128`	`128`	`StringBuilder name = new StringBuilder();`
`129`	`129`	`while (pathOffset < path.length) {`
`130`		`- name.append((name.length() != 0) ? "/" : "");`
	`130`	`+ name.append((!name.isEmpty()) ? "/" : "");`
`131`	`131`	`name.append(path[pathOffset]);`
`132`	`132`	`pathOffset++;`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ private String toCommaDelimitedString(List<Object> list) {`
`345`	`345`	`}`
`346`	`346`	`StringBuilder result = new StringBuilder();`
`347`	`347`	`for (Object item : list) {`
`348`		`- result.append((result.length() != 0) ? "," : "");`
	`348`	`+ result.append((!result.isEmpty()) ? "," : "");`
`349`	`349`	`result.append(item);`
`350`	`350`	`}`
`351`	`351`	`return result.toString();`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public JSONStringer endObject() throws JSONException {`
`173`	`173`	`* @throws JSONException if processing of json failed`
`174`	`174`	`*/`
`175`	`175`	`JSONStringer open(Scope empty, String openBracket) throws JSONException {`
`176`		`- if (this.stack.isEmpty() && this.out.length() > 0) {`
	`176`	`+ if (this.stack.isEmpty() && !this.out.isEmpty()) {`
`177`	`177`	`throw new JSONException("Nesting problem: multiple top-level roots");`
`178`	`178`	`}`
`179`	`179`	`beforeValue();`
`@@ -423,7 +423,7 @@ else if (context != Scope.NULL) {`
`423`	`423`	`*/`
`424`	`424`	`@Override`
`425`	`425`	`public String toString() {`
`426`		`- return this.out.length() == 0 ? null : this.out.toString();`
	`426`	`+ return this.out.isEmpty() ? null : this.out.toString();`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2020 the original author or authors.`
	`2`	`+ * Copyright 2012-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -65,7 +65,7 @@ private String buildName(String prefix, String name) {`
`65`	`65`	`fullName.append(prefix);`
`66`	`66`	`}`
`67`	`67`	`if (name != null) {`
`68`		`- if (fullName.length() > 0) {`
	`68`	`+ if (!fullName.isEmpty()) {`
`69`	`69`	`fullName.append('.');`
`70`	`70`	`}`
`71`	`71`	`fullName.append(ConfigurationMetadata.toDashedCase(name));`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`boolean hasReportedErrors() {`
`230`		`- return this.message.length() > 0;`
	`230`	`+ return !this.message.isEmpty();`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ private void addClasspath(List<String> args) throws MojoExecutionException {`
`329`	`329`	`try {`
`330`	`330`	`StringBuilder classpath = new StringBuilder();`
`331`	`331`	`for (URL ele : getClassPathUrls()) {`
`332`		`- if (classpath.length() > 0) {`
	`332`	`+ if (!classpath.isEmpty()) {`
`333`	`333`	`classpath.append(File.pathSeparator);`
`334`	`334`	`}`
`335`	`335`	`classpath.append(new File(ele.toURI()));`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static class ClasspathBuilder {`
`98`	`98`	`static String build(List<URL> classpathElements) {`
`99`	`99`	`StringBuilder classpath = new StringBuilder();`
`100`	`100`	`for (URL element : classpathElements) {`
`101`		`- if (classpath.length() > 0) {`
	`101`	`+ if (!classpath.isEmpty()) {`
`102`	`102`	`classpath.append(File.pathSeparator);`
`103`	`103`	`}`
`104`	`104`	`classpath.append(toFile(element));`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2022 the original author or authors.`
	`2`	`+ * Copyright 2012-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -121,7 +121,7 @@ private void appendContext(StringBuilder message) {`
`121`	`121`	`}`
`122`	`122`	`append(context, "started by ", () -> System.getProperty("user.name"));`
`123`	`123`	`append(context, "in ", () -> System.getProperty("user.dir"));`
`124`		`- if (context.length() > 0) {`
	`124`	`+ if (!context.isEmpty()) {`
`125`	`125`	`message.append(" (");`
`126`	`126`	`message.append(context);`
`127`	`127`	`message.append(")");`
`@@ -143,7 +143,7 @@ private void append(StringBuilder message, String prefix, Callable<Object> call,`
`143`	`143`	`value = defaultValue;`
`144`	`144`	`}`
`145`	`145`	`if (StringUtils.hasLength(value)) {`
`146`		`- message.append((message.length() > 0) ? " " : "");`
	`146`	`+ message.append((!message.isEmpty()) ? " " : "");`
`147`	`147`	`message.append(prefix);`
`148`	`148`	`message.append(value);`
`149`	`149`	`}`