From b914b4aa52eaac6a024dbec25f6029fb42e47ada Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 18 Apr 2016 19:00:35 +0900 Subject: [PATCH] Remove the second parameter of substring() if possible Closes gh-5720 --- .../boot/autoconfigure/info/ProjectInfoAutoConfiguration.java | 2 +- .../boot/cli/command/init/InitializrService.java | 3 +-- .../boot/configurationmetadata/RawConfigurationMetadata.java | 2 +- .../boot/configurationprocessor/metadata/ItemHint.java | 2 +- .../src/main/java/org/test/SampleApplication.java | 2 +- .../run-profiles/src/main/java/org/test/SampleApplication.java | 2 +- .../context/config/ConfigFileApplicationListenerTests.java | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java index 3faf8ab1264..faf55105d81 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java @@ -76,7 +76,7 @@ public class ProjectInfoAutoConfiguration { Properties target = new Properties(); for (String key : source.stringPropertyNames()) { if (key.startsWith(p)) { - target.put(key.substring(p.length(), key.length()), source.get(key)); + target.put(key.substring(p.length()), source.get(key)); } } return target; diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java index 8e5cc141bc8..92bb4db1c4a 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrService.java @@ -250,8 +250,7 @@ class InitializrService { String value = header.getValue(); int start = value.indexOf(FILENAME_HEADER_PREFIX); if (start != -1) { - value = value.substring(start + FILENAME_HEADER_PREFIX.length(), - value.length()); + value = value.substring(start + FILENAME_HEADER_PREFIX.length()); int end = value.indexOf("\""); if (end != -1) { return value.substring(0, end); 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 358568e83ae..4bc6c4d9502 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 @@ -81,7 +81,7 @@ class RawConfigurationMetadata { String dottedPrefix = groupId + "."; String id = item.getId(); if (hasLength(groupId) && id.startsWith(dottedPrefix)) { - String name = id.substring(dottedPrefix.length(), id.length()); + String name = id.substring(dottedPrefix.length()); item.setName(name); } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java index 8847796f16b..7343a6575da 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java @@ -54,7 +54,7 @@ public class ItemHint implements Comparable { int dot = name.lastIndexOf('.'); if (dot != -1) { String prefix = name.substring(0, dot); - String originalName = name.substring(dot, name.length()); + String originalName = name.substring(dot); return prefix + ConfigurationMetadata.toDashedCase(originalName); } return ConfigurationMetadata.toDashedCase(name); diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles-fork/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles-fork/src/main/java/org/test/SampleApplication.java index 5e19ea31cd2..aafeb0904ed 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles-fork/src/main/java/org/test/SampleApplication.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles-fork/src/main/java/org/test/SampleApplication.java @@ -29,7 +29,7 @@ public class SampleApplication { throw new IllegalArgumentException("Invalid argument " + argument); } int index = args[0].indexOf("="); - String profile = argument.substring(index + 1, argument.length()); + String profile = argument.substring(index + 1); System.out.println("I haz been run with profile(s) '" + profile + "'"); } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles/src/main/java/org/test/SampleApplication.java index 5e19ea31cd2..aafeb0904ed 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles/src/main/java/org/test/SampleApplication.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-profiles/src/main/java/org/test/SampleApplication.java @@ -29,7 +29,7 @@ public class SampleApplication { throw new IllegalArgumentException("Invalid argument " + argument); } int index = args[0].indexOf("="); - String profile = argument.substring(index + 1, argument.length()); + String profile = argument.substring(index + 1); System.out.println("I haz been run with profile(s) '" + profile + "'"); } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index ae0e8cc022b..0dbdba13973 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -464,7 +464,7 @@ public class ConfigFileApplicationListenerTests { assertThat(index) .as("Loading profile '" + profile + "' not found in '" + log + "'") .isNotEqualTo(-1); - log = log.substring(index + line.length(), log.length()); + log = log.substring(index + line.length()); } }