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

Polish defaultElementEquals 

See gh-16671
This commit is contained in:
Phillip Webb 2019-06-01 13:32:22 -07:00
parent a89e6ff67c
commit 763d18ca68
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
View File

@ -360,11 +360,17 @@ public final class ConfigurationPropertyName
i2++; i2++;
} }
} }
while (i2 < l2) { if (i2 < l2) {
char ch2 = Character.toLowerCase(e2.charAt(i, i2++)); if (indexed2) {
if (indexed2 || ElementsParser.isAlphaNumeric(ch2)) {
return false; return false;
} }
do {
char ch2 = Character.toLowerCase(e2.charAt(i, i2++));
if (ElementsParser.isAlphaNumeric(ch2)) {
return false;
}
}
while (i2 < l2);
} }
return true; return true;
} }
@ -399,7 +405,8 @@ public final class ConfigurationPropertyName
return false; return false;
} }
do { do {
if (e2.charAt(i, i2++) != '-') { char ch2 = e2.charAt(i, i2++);
if (ch2 != '-') {
return false; return false;
} }
} }

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

@ -632,6 +632,7 @@ public class ConfigurationPropertyNameTests {
ConfigurationPropertyName n2 = ConfigurationPropertyName ConfigurationPropertyName n2 = ConfigurationPropertyName
.of("management.metrics.web.server.auto-time-requests"); .of("management.metrics.web.server.auto-time-requests");
assertThat(n1).isNotEqualTo(n2); assertThat(n1).isNotEqualTo(n2);
assertThat(n2).isNotEqualTo(n1);
} }
@Test @Test