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

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2018-07-02 19:18:30 +01:00
parent de900e71a3 06a8c41943
commit c3641c480b
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java vendored
View File

@@ -135,7 +135,7 @@ class OriginTrackedPropertiesLoader {
reader.read();
}
Origin origin = new TextResourceOrigin(this.resource, location);
return OriginTrackedValue.of(buffer.toString().trim(), origin);
return OriginTrackedValue.of(buffer.toString(), origin);
}
/**

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java vendored
View File

@@ -248,6 +248,12 @@ public class OriginTrackedPropertiesLoaderTests {
assertThat(getValue(value)).isEqualTo("æ×ÈÅÞßáñÀÿ");
}
@Test
public void getPropertyWithTrailingSpace() {
OriginTrackedValue value = this.properties.get("test-with-trailing-space");
assertThat(getValue(value)).isEqualTo("trailing ");
}
private Object getValue(OriginTrackedValue value) {
return (value != null ? value.getValue() : null);
}

2
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties vendored
View File

@@ -40,3 +40,5 @@ test-multiline-immediate-bang=\
#test ISO 8859-1
test-iso8859-1-chars=<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
test-with-trailing-space= trailing