diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java index 0e23374f930..75c7f2bf189 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java @@ -71,7 +71,7 @@ public class Token { } public byte[] getContent() { - return this.encoded.substring(0, this.encoded.lastIndexOf(".")).getBytes(); + return this.encoded.substring(0, this.encoded.lastIndexOf('.')).getBytes(); } public byte[] getSignature() { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java index fcae7248c6f..e8cdb500a77 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java @@ -94,7 +94,7 @@ public class AuditEvent implements Serializable { private static Map convert(String[] data) { Map result = new HashMap<>(); for (String entry : data) { - int index = entry.indexOf("="); + int index = entry.indexOf('='); if (index != -1) { result.put(entry.substring(0, index), entry.substring(index + 1)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java index c0adbf176aa..fad8563d1d8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java @@ -891,7 +891,7 @@ public class RabbitProperties { } private String parseVirtualHost(String input) { - int hostIndex = input.indexOf("/"); + int hostIndex = input.indexOf('/'); if (hostIndex >= 0) { this.virtualHost = input.substring(hostIndex + 1); if (this.virtualHost.isEmpty()) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java index e727688103d..414b8f03160 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java @@ -132,7 +132,7 @@ abstract class RedisConnectionConfiguration { String password = null; if (uri.getUserInfo() != null) { password = uri.getUserInfo(); - int index = password.lastIndexOf(":"); + int index = password.lastIndexOf(':'); if (index >= 0) { password = password.substring(index + 1); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java index e66a1d04253..c0384333e46 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzer.java @@ -33,8 +33,8 @@ class DataSourceBeanCreationFailureAnalyzer protected FailureAnalysis analyze(Throwable rootFailure, DataSourceBeanCreationException cause) { String message = cause.getMessage(); - String description = message.substring(0, message.indexOf(".")).trim(); - String action = message.substring(message.indexOf(".") + 1).trim(); + String description = message.substring(0, message.indexOf('.')).trim(); + String action = message.substring(message.indexOf('.') + 1).trim(); return new FailureAnalysis(description, action, cause); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index b71ad455860..85270dff1e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -292,7 +292,7 @@ public class ServerProperties { public String getServletPrefix() { String result = this.path; - int index = result.indexOf("*"); + int index = result.indexOf('*'); if (index != -1) { result = result.substring(0, index); } diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java index 66b15e00631..f6e18b4a9f7 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java @@ -251,7 +251,7 @@ class InitializrService { int start = value.indexOf(FILENAME_HEADER_PREFIX); if (start != -1) { value = value.substring(start + FILENAME_HEADER_PREFIX.length()); - int end = value.indexOf("\""); + int end = value.indexOf('\"'); if (end != -1) { return value.substring(0, end); } diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java index 335bcd907a1..68bbb4a6fd5 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java @@ -48,7 +48,7 @@ class RemoteUrlPropertyExtractor ConfigurableEnvironment environment = event.getEnvironment(); String url = cleanRemoteUrl(environment.getProperty(NON_OPTION_ARGS)); Assert.state(StringUtils.hasLength(url), "No remote URL specified"); - Assert.state(url.indexOf(",") == -1, "Multiple URLs specified"); + Assert.state(url.indexOf(',') == -1, "Multiple URLs specified"); try { new URI(url); } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java index 291eb59125e..c3cbe7f4cc1 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java @@ -78,7 +78,7 @@ final class SpringBootConfigurationFinder { } private String getParentPackage(String sourcePackage) { - int lastDot = sourcePackage.lastIndexOf("."); + int lastDot = sourcePackage.lastIndexOf('.'); return (lastDot == -1 ? "" : sourcePackage.substring(0, lastDot)); } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java index f42d83dc75c..1f2ee45e1b9 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java @@ -91,8 +91,8 @@ public abstract class EnvironmentTestUtils { } private static int getSeparatorIndex(String pair) { - int colonIndex = pair.indexOf(":"); - int equalIndex = pair.indexOf("="); + int colonIndex = pair.indexOf(':'); + int equalIndex = pair.indexOf('='); if (colonIndex == -1) { return equalIndex; } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java index b3cd764a857..63639fd5aa4 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java @@ -267,8 +267,8 @@ public final class TestPropertyValues { } private static int getSeparatorIndex(String pair) { - int colonIndex = pair.indexOf(":"); - int equalIndex = pair.indexOf("="); + int colonIndex = pair.indexOf(':'); + int equalIndex = pair.indexOf('='); if (colonIndex == -1) { return equalIndex; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java index 4864089c153..8dbf686bcc2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java @@ -30,7 +30,7 @@ class DescriptionExtractor { if (description == null) { return null; } - int dot = description.indexOf("."); + int dot = description.indexOf('.'); if (dot != -1) { BreakIterator breakIterator = BreakIterator.getSentenceInstance(Locale.US); breakIterator.setText(description); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java index e66f66022a2..9f77f91611a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java @@ -176,7 +176,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser { Object instance = expression.getInstance(); if (instance != null && instance.toString().startsWith(DURATION_OF)) { String type = instance.toString(); - type = type.substring(DURATION_OF.length(), type.indexOf("(")); + type = type.substring(DURATION_OF.length(), type.indexOf('(')); String suffix = DURATION_SUFFIX.get(type); return (suffix == null ? null : factoryValue + suffix); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index ab75f8d190c..29dcd0b7493 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -253,8 +253,8 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable { else { entry.setUnixMode(UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM); } - if (parent.lastIndexOf("/") != -1) { - parent = parent.substring(0, parent.lastIndexOf("/") + 1); + if (parent.lastIndexOf('/') != -1) { + parent = parent.substring(0, parent.lastIndexOf('/') + 1); if (!parent.isEmpty()) { writeEntry(new JarArchiveEntry(parent), null); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index edb41259b69..3e8094a1e74 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -498,7 +498,7 @@ public class PropertiesLauncher extends Launcher { // If home dir is same as parent archive, no need to add it twice. return null; } - int index = root.indexOf("!"); + int index = root.indexOf('!'); if (index != -1) { File file = new File(this.home, root.substring(0, index)); if (root.startsWith("jar:file:")) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java index dabc8f1e099..988e17b7d83 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java @@ -112,8 +112,8 @@ public class JarFileArchive implements Archive { private Archive getUnpackedNestedArchive(JarEntry jarEntry) throws IOException { String name = jarEntry.getName(); - if (name.lastIndexOf("/") != -1) { - name = name.substring(name.lastIndexOf("/") + 1); + if (name.lastIndexOf('/') != -1) { + name = name.substring(name.lastIndexOf('/') + 1); } File file = new File(getTempUnpackFolder(), name); if (!file.exists() || file.length() != jarEntry.getSize()) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java index 6453c60b9ad..8971206ddcb 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java @@ -243,7 +243,7 @@ class BeanDefinitionLoader { // a file list of the package content. We double check here that it's not // actually a package. String path = ((ClassPathResource) resource).getPath(); - if (path.indexOf(".") == -1) { + if (path.indexOf('.') == -1) { try { return Package.getPackage(path) == null; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzer.java index f782ef923e5..13d21518047 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzer.java @@ -93,7 +93,7 @@ class NoUniqueBeanDefinitionFailureAnalyzer private String[] extractBeanNames(NoUniqueBeanDefinitionException cause) { if (cause.getMessage().indexOf("but found") > -1) { return StringUtils.commaDelimitedListToStringArray(cause.getMessage() - .substring(cause.getMessage().lastIndexOf(":") + 1).trim()); + .substring(cause.getMessage().lastIndexOf(':') + 1).trim()); } return null; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java index ca646267939..06534bc0861 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java @@ -69,7 +69,7 @@ class SpringPropertyAction extends Action { if (value != null) { return value; } - int lastDot = source.lastIndexOf("."); + int lastDot = source.lastIndexOf('.'); if (lastDot > 0) { String prefix = source.substring(0, lastDot + 1); return this.environment.getProperty(prefix + source.substring(lastDot + 1),