Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15559 from igor-suhorukov

Browse Source 
* pr/15559:
  Polish "Replace indexOf() with a call to the contains()"
  Replace indexOf() with a call to the contains()
This commit is contained in:
Stephane Nicoll
2018-12-24 09:53:30 +01:00
parent 67eb3b748c 805ff6000a
commit f3d5457665
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
View File

@@ -130,7 +130,7 @@ final class JarURLConnection extends java.net.JarURLConnection {
if (spec.endsWith(SEPARATOR)) {
spec = spec.substring(0, spec.length() - SEPARATOR.length());
}
if (spec.indexOf(SEPARATOR) == -1) {
if (!spec.contains(SEPARATOR)) {
return new URL(spec);
}
return new URL("jar:" + spec);

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzer.java
View File

@@ -91,7 +91,7 @@ class NoUniqueBeanDefinitionFailureAnalyzer
}
private String[] extractBeanNames(NoUniqueBeanDefinitionException cause) {
if (cause.getMessage().indexOf("but found") > -1) {
if (cause.getMessage().contains("but found")) {
return StringUtils.commaDelimitedListToStringArray(cause.getMessage()
.substring(cause.getMessage().lastIndexOf(':') + 1).trim());
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/FilteredConfigurationPropertiesSourceTests.java
View File

@@ -114,7 +114,7 @@ public class FilteredConfigurationPropertiesSourceTests {
}
private boolean noBrackets(ConfigurationPropertyName name) {
return name.toString().indexOf("[") == -1;
return !name.toString().contains("[");
}
}

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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 @@ public class FilteredIterableConfigurationPropertiesSourceTests
}
private boolean noBrackets(ConfigurationPropertyName name) {
return name.toString().indexOf("[") == -1;
return !name.toString().contains("[");
}
}