root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #10077 from izeye:substring-20170825 

* pr/10077:
  Avoid substring() invocation when the result is itself
This commit is contained in:
Stephane Nicoll 2017-08-25 17:38:03 +02:00
parent 8198b87538 4ae3691fee
commit a37a45921f
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java
View File

@ -73,7 +73,7 @@ public abstract class EnvironmentTestUtils {
Map<String, Object> map = getOrAdd(sources, name); Map<String, Object> map = getOrAdd(sources, name);
for (String pair : pairs) { for (String pair : pairs) {
int index = getSeparatorIndex(pair); int index = getSeparatorIndex(pair);
String key = pair.substring(0, index > 0 ? index : pair.length()); String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : ""; String value = index > 0 ? pair.substring(index + 1) : "";
map.put(key.trim(), value.trim()); map.put(key.trim(), value.trim());
} }

2
spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
View File

@ -253,7 +253,7 @@ public final class TestPropertyValues {
public static Pair parse(String pair) { public static Pair parse(String pair) {
int index = getSeparatorIndex(pair); int index = getSeparatorIndex(pair);
String key = pair.substring(0, index > 0 ? index : pair.length()); String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : ""; String value = index > 0 ? pair.substring(index + 1) : "";
return of(key.trim(), value.trim()); return of(key.trim(), value.trim());
} }

2
spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@ -395,7 +395,7 @@ public class SpringApplicationBuilder {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (String property : properties) { for (String property : properties) {
int index = lowestIndexOf(property, ":", "="); int index = lowestIndexOf(property, ":", "=");
String key = property.substring(0, index > 0 ? index : property.length()); String key = index > 0 ? property.substring(0, index) : property;
String value = index > 0 ? property.substring(index + 1) : ""; String value = index > 0 ? property.substring(index + 1) : "";
map.put(key, value); map.put(key, value);
} }

2
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindFailureAnalyzerTests.java
View File

@ -102,7 +102,7 @@ public class BindFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (String pair : environment) { for (String pair : environment) {
int index = pair.indexOf("="); int index = pair.indexOf("=");
String key = pair.substring(0, index > 0 ? index : pair.length()); String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : ""; String value = index > 0 ? pair.substring(index + 1) : "";
map.put(key.trim(), value.trim()); map.put(key.trim(), value.trim());
} }

2
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java
View File

@ -135,7 +135,7 @@ public class BindValidationFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (String pair : environment) { for (String pair : environment) {
int index = pair.indexOf("="); int index = pair.indexOf("=");
String key = pair.substring(0, index > 0 ? index : pair.length()); String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : ""; String value = index > 0 ? pair.substring(index + 1) : "";
map.put(key.trim(), value.trim()); map.put(key.trim(), value.trim());
} }

2
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/UnboundConfigurationPropertyFailureAnalyzerTests.java
View File

@ -98,7 +98,7 @@ public class UnboundConfigurationPropertyFailureAnalyzerTests {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
for (String pair : environment) { for (String pair : environment) {
int index = pair.indexOf("="); int index = pair.indexOf("=");
String key = pair.substring(0, index > 0 ? index : pair.length()); String key = index > 0 ? pair.substring(0, index) : pair;
String value = index > 0 ? pair.substring(index + 1) : ""; String value = index > 0 ? pair.substring(index + 1) : "";
map.put(key.trim(), value.trim()); map.put(key.trim(), value.trim());
} }