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

Merge previously split strings

Browse Source 
Merge some string lines that were previously split because of the
90 chars wide formatting.
This commit is contained in:
Phillip Webb
2019-07-14 19:39:18 +01:00
parent c3816bfe7b
commit 01933f9b06
173 changed files with 351 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReport.java
View File

@@ -45,8 +45,8 @@ class PropertiesMigrationReport {
return null;
}
StringBuilder report = new StringBuilder();
report.append(String.format(
"%nThe use of configuration keys that have been " + "renamed was found in the environment:%n%n"));
report.append(String
.format("%nThe use of configuration keys that have been renamed was found in the environment:%n%n"));
append(report, content);
report.append(String.format("%n"));
report.append("Each configuration key has been temporarily mapped to its "
@@ -68,10 +68,10 @@ class PropertiesMigrationReport {
}
StringBuilder report = new StringBuilder();
report.append(String.format(
"%nThe use of configuration keys that are no longer " + "supported was found in the environment:%n%n"));
"%nThe use of configuration keys that are no longer supported was found in the environment:%n%n"));
append(report, content);
report.append(String.format("%n"));
report.append("Please refer to the migration guide or reference guide for " + "potential alternatives.");
report.append("Please refer to the migration guide or reference guide for potential alternatives.");
report.append(String.format("%n"));
return report.toString();
}

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

@@ -130,7 +130,7 @@ class PropertiesMigrationReporterTests {
String report = createErrorReport(loadRepository("metadata/type-conversion-metadata.json"));
assertThat(report).isNotNull();
assertThat(report).containsSubsequence("Property source 'test'", "wrong.inconvertible", "Line: 1",
"Reason: Replacement key " + "'test.inconvertible' uses an incompatible target type");
"Reason: Replacement key 'test.inconvertible' uses an incompatible target type");
}
@Test