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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2014-12-12 12:30:28 -08:00
parent 4c39073d2a
commit 5dd40e6999
4 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
View File

@@ -80,19 +80,20 @@ public class ConfigurationMetadata {
Matcher matcher = CAMEL_CASE_PATTERN.matcher(name);
StringBuffer result = new StringBuffer();
while (matcher.find()) {
String first = matcher.group(1);
String second = matcher.group(2);
String target;
if (first.equals("_")) { // not a word for the binder
target = first + second;
} else {
target = first + "-" + second;
}
matcher.appendReplacement(result,target);
matcher.appendReplacement(result, getDashed(matcher));
}
matcher.appendTail(result);
String value = result.toString();
return value.toLowerCase();
return result.toString().toLowerCase();
}
private static String getDashed(Matcher matcher) {
String first = matcher.group(1);
String second = matcher.group(2);
if (first.equals("_")) {
// not a word for the binder
return first + second;
}
return first + "-" + second;
}
}

20
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadataTests.java
View File

@@ -30,42 +30,46 @@ public class ConfigurationMetadataTests {
@Test
public void toDashedCaseCamelCase() {
assertThat(ConfigurationMetadata.toDashedCase("simpleCamelCase"), is("simple-camel-case"));
assertThat(toDashedCase("simpleCamelCase"), is("simple-camel-case"));
}
@Test
public void toDashedCaseWordsUnderScore() {
assertThat(ConfigurationMetadata.toDashedCase("Word_With_underscore"), is("word_with_underscore"));
assertThat(toDashedCase("Word_With_underscore"), is("word_with_underscore"));
}
@Test
public void toDashedCaseWordsSeveralUnderScores() {
assertThat(ConfigurationMetadata.toDashedCase("Word___With__underscore"), is("word___with__underscore"));
assertThat(toDashedCase("Word___With__underscore"), is("word___with__underscore"));
}
@Test
public void toDashedCaseLowerCaseUnderscore() {
assertThat(ConfigurationMetadata.toDashedCase("lower_underscore"), is("lower_underscore"));
assertThat(toDashedCase("lower_underscore"), is("lower_underscore"));
}
@Test
public void toDashedCaseUpperUnderscore() {
assertThat(ConfigurationMetadata.toDashedCase("UPPER_UNDERSCORE"), is("upper_underscore"));
assertThat(toDashedCase("UPPER_UNDERSCORE"), is("upper_underscore"));
}
@Test
public void toDashedCaseMultipleUnderscores() {
assertThat(ConfigurationMetadata.toDashedCase("super___crazy"), is("super___crazy"));
assertThat(toDashedCase("super___crazy"), is("super___crazy"));
}
@Test
public void toDashedCaseUppercase() {
assertThat(ConfigurationMetadata.toDashedCase("UPPERCASE"), is("uppercase"));
assertThat(toDashedCase("UPPERCASE"), is("uppercase"));
}
@Test
public void toDashedCaseLowercase() {
assertThat(ConfigurationMetadata.toDashedCase("lowercase"), is("lowercase"));
assertThat(toDashedCase("lowercase"), is("lowercase"));
}
private String toDashedCase(String name) {
return ConfigurationMetadata.toDashedCase(name);
}
}