From 756398b52c984cd58deab0da7e8ca18c605ae268 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 28 Sep 2017 22:51:07 +0200 Subject: [PATCH] Replace some String.length() checks with String.isEmpty() Closes gh-10451 --- .../endpoint/jmx/DefaultEndpointObjectNameFactory.java | 2 +- .../boot/cli/command/archive/ResourceMatcher.java | 2 +- .../springframework/boot/cli/command/core/HintCommand.java | 2 +- .../web/client/MockRestServiceServerAutoConfiguration.java | 2 +- .../boot/test/context/SpringBootConfigurationFinder.java | 2 +- .../test/web/client/MockServerRestTemplateCustomizer.java | 2 +- .../boot/configurationmetadata/RawConfigurationMetadata.java | 2 +- .../boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java | 2 +- .../java/org/springframework/boot/loader/tools/JarWriter.java | 2 +- .../java/org/springframework/boot/maven/AbstractRunMojo.java | 2 +- .../java/org/springframework/boot/maven/RepackageMojo.java | 4 ++-- .../java/org/springframework/boot/json/BasicJsonParser.java | 4 ++-- .../web/servlet/server/AbstractServletWebServerFactory.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/DefaultEndpointObjectNameFactory.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/DefaultEndpointObjectNameFactory.java index b01ed4b50c2..03d8411c51b 100644 --- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/DefaultEndpointObjectNameFactory.java +++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/DefaultEndpointObjectNameFactory.java @@ -66,7 +66,7 @@ class DefaultEndpointObjectNameFactory implements EndpointObjectNameFactory { private boolean hasMBean(String baseObjectName) throws MalformedObjectNameException { ObjectName query = new ObjectName(baseObjectName + ",*"); - return this.mBeanServer.queryNames(query, null).size() > 0; + return !this.mBeanServer.queryNames(query, null).isEmpty(); } private String getStaticNames() { diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java index f4a0a7f267d..e57293b027b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java @@ -117,7 +117,7 @@ class ResourceMatcher { value = value.substring(1); minus.add(value); } - else if (value.trim().length() > 0) { + else if (!value.trim().isEmpty()) { result.add(value); } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java index 88dfbefc987..0f01a9c202d 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java @@ -57,7 +57,7 @@ public class HintCommand extends AbstractCommand { if (index == 0) { showCommandHints(starting); } - else if (!arguments.isEmpty() && (starting.length() > 0)) { + else if (!arguments.isEmpty() && !starting.isEmpty()) { String command = arguments.remove(0); showCommandOptionHints(command, Collections.unmodifiableList(arguments), starting); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java index a58aec08014..e3e946bea88 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java @@ -113,7 +113,7 @@ public class MockRestServiceServerAutoConfiguration { private RequestExpectationManager getDelegate() { Map expectationManagers = this.customizer .getExpectationManagers(); - Assert.state(expectationManagers.size() > 0, + Assert.state(!expectationManagers.isEmpty(), "Unable to use auto-configured MockRestServiceServer since " + "MockServerRestTemplateCustomizer has not been bound to " + "a RestTemplate"); diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java index 61329056a48..5c1aff44c06 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java @@ -63,7 +63,7 @@ final class SpringBootConfigurationFinder { } private Class scanPackage(String source) { - while (source.length() > 0) { + while (!source.isEmpty()) { Set components = this.scanner.findCandidateComponents(source); if (!components.isEmpty()) { Assert.state(components.size() == 1, diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java index 827f9153dd3..8fbba716637 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java @@ -98,7 +98,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer } public MockRestServiceServer getServer() { - Assert.state(this.servers.size() > 0, + Assert.state(!this.servers.isEmpty(), "Unable to return a single MockRestServiceServer since " + "MockServerRestTemplateCustomizer has not been bound to " + "a RestTemplate"); diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java index f3d0ecf8081..15ef0d665cd 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java @@ -88,7 +88,7 @@ class RawConfigurationMetadata { } private static boolean hasLength(String string) { - return (string != null && string.length() > 0); + return (string != null && !string.isEmpty()); } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java index e6a789a3fd2..22163aee895 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java @@ -63,7 +63,7 @@ class UnresolvedDependenciesAnalyzer { private boolean hasNoVersion(ModuleVersionSelector selector) { String version = selector.getVersion(); - return version == null || version.trim().length() == 0; + return version == null || version.trim().isEmpty(); } } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index 34c0554ef2f..f8cc051fed0 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -255,7 +255,7 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable { } if (parent.lastIndexOf("/") != -1) { parent = parent.substring(0, parent.lastIndexOf("/") + 1); - if (parent.length() > 0) { + if (!parent.isEmpty()) { writeEntry(new JarArchiveEntry(parent), null); } } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index f098542ac2f..65648e0fb77 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -201,7 +201,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { } private boolean hasJvmArgs() { - return (this.jvmArguments != null && this.jvmArguments.length() > 0); + return (this.jvmArguments != null && !this.jvmArguments.isEmpty()); } private boolean hasWorkingDirectorySet() { diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 9a51fbefa65..5c01ee97da3 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -225,7 +225,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { private File getTargetFile() { String classifier = (this.classifier == null ? "" : this.classifier.trim()); - if (classifier.length() > 0 && !classifier.startsWith("-")) { + if (!classifier.isEmpty() && !classifier.startsWith("-")) { classifier = "-" + classifier; } if (!this.outputDirectory.exists()) { @@ -292,7 +292,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { String... valueCandidates) { if (!properties.containsKey(key)) { for (String candidate : valueCandidates) { - if (candidate != null && candidate.length() > 0) { + if (candidate != null && !candidate.isEmpty()) { properties.put(key, candidate); return; } diff --git a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java index c6d0ca2ba0b..e92b8281541 100644 --- a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java @@ -93,14 +93,14 @@ public class BasicJsonParser implements JsonParser { } private static String trimTrailingCharacter(String string, char c) { - if (string.length() > 0 && string.charAt(string.length() - 1) == c) { + if (!string.isEmpty() && string.charAt(string.length() - 1) == c) { return string.substring(0, string.length() - 1); } return string; } private static String trimLeadingCharacter(String string, char c) { - if (string.length() > 0 && string.charAt(0) == c) { + if (!string.isEmpty() && string.charAt(0) == c) { return string.substring(1); } return string; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java index 651cb366810..3d22ce0450b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java @@ -125,7 +125,7 @@ public abstract class AbstractServletWebServerFactory private void checkContextPath(String contextPath) { Assert.notNull(contextPath, "ContextPath must not be null"); - if (contextPath.length() > 0) { + if (!contextPath.isEmpty()) { if ("/".equals(contextPath)) { throw new IllegalArgumentException( "Root ContextPath must be specified using an empty string");