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

Use System.lineSeparator()

Browse Source 
See gh-11665
This commit is contained in:
Johnny Lim
2018-01-18 20:33:33 +09:00
committed by Stephane Nicoll
parent 7002507304
commit d8c83af987
8 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/DescriptionExtractor.java
View File

@@ -26,8 +26,6 @@ import java.util.Locale;
*/
class DescriptionExtractor {
private static final String NEW_LINE = System.getProperty("line.separator");
public String getShortDescription(String description) {
if (description == null) {
return null;
@@ -41,13 +39,13 @@ class DescriptionExtractor {
return removeSpaceBetweenLine(text);
}
else {
String[] lines = description.split(NEW_LINE);
String[] lines = description.split(System.lineSeparator());
return lines[0].trim();
}
}
private String removeSpaceBetweenLine(String text) {
String[] lines = text.split(NEW_LINE);
String[] lines = text.split(System.lineSeparator());
StringBuilder sb = new StringBuilder();
for (String line : lines) {
sb.append(line.trim()).append(" ");

8
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/DescriptionExtractorTests.java
View File

@@ -27,8 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class DescriptionExtractorTests {
private static final String NEW_LINE = System.getProperty("line.separator");
private DescriptionExtractor extractor = new DescriptionExtractor();
@Test
@@ -41,14 +39,14 @@ public class DescriptionExtractorTests {
@Test
public void extractShortDescriptionNewLineBeforeDot() {
String description = this.extractor.getShortDescription(
"My short" + NEW_LINE + "description." + NEW_LINE + "More stuff.");
"My short" + System.lineSeparator() + "description." + System.lineSeparator() + "More stuff.");
assertThat(description).isEqualTo("My short description.");
}
@Test
public void extractShortDescriptionNewLineBeforeDotWithSpaces() {
String description = this.extractor.getShortDescription(
"My short " + NEW_LINE + " description. " + NEW_LINE + "More stuff.");
"My short " + System.lineSeparator() + " description. " + System.lineSeparator() + "More stuff.");
assertThat(description).isEqualTo("My short description.");
}
@@ -61,7 +59,7 @@ public class DescriptionExtractorTests {
@Test
public void extractShortDescriptionNoDotMultipleLines() {
String description = this.extractor
.getShortDescription("My short description " + NEW_LINE + " More stuff");
.getShortDescription("My short description " + System.lineSeparator() + " More stuff");
assertThat(description).isEqualTo("My short description");
}