Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10565 from thiagohirata/fix/#10564

Browse Source 
* pr/10565:
  Update OriginTrackedPropertiesLoader to ISO 8859-1
This commit is contained in:
Phillip Webb 2017-10-10 12:31:53 -07:00
commit f35af88de5
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import org.springframework.util.Assert;
*
* @author Madhura Bhave
* @author Phillip Webb
* @author Thiago Hirata
*/
class OriginTrackedPropertiesLoader {
@ -154,7 +155,7 @@ class OriginTrackedPropertiesLoader {
CharacterReader(Resource resource) throws IOException {
this.reader = new LineNumberReader(
new InputStreamReader(resource.getInputStream()));
new InputStreamReader(resource.getInputStream(), "8859_1"));
}
@Override

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

@ -228,6 +228,12 @@ public class OriginTrackedPropertiesLoaderTests {
assertThat(getLocation(mango)).isEqualTo("27:1");
}
@Test
public void getPropertyWithISO88591Character() throws Exception {
OriginTrackedValue value = this.properties.get("test-iso8859-1-chars");
assertThat(getValue(value)).isEqualTo("æ×ÈÅÞßáñÀÿ");
}
private Object getValue(OriginTrackedValue value) {
return (value == null ? null : value.getValue());
}

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

@ -37,3 +37,6 @@ test-property-value-comment=foo \
!bar #foo
test-multiline-immediate-bang=\
!foo
#test ISO 8859-1
test-iso8859-1-chars=<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>