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

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Stephane Nicoll
2018-07-16 14:12:16 +02:00
parent a18c413767 fec5ecc5b0
commit ffe994335e
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View File

@@ -222,7 +222,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(metadata).has(Metadata
.withProperty("description.multi-line", String.class)
.fromSource(DescriptionProperties.class).withDescription(
"This is a lengthy description that spans across multiple lines to showcase that the carriage return is cleaned automatically."));
"This is a lengthy description that spans across multiple lines to showcase that the line separators are cleaned automatically."));
}
@Test

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java
View File

@@ -33,7 +33,7 @@ public class DescriptionProperties {
/**
* This is a lengthy description that spans across multiple lines to showcase that the
* carriage return is cleaned automatically.
* line separators are cleaned automatically.
*/
private String multiLine;