From 06a8c4194316c9ad7f692f5a3b09b2a64b1fa0f2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 2 Jul 2018 19:17:02 +0100 Subject: [PATCH] Preserve trailing whitespace in origin-tracked property values Closes gh-13602 --- .../boot/env/OriginTrackedPropertiesLoader.java | 2 +- .../boot/env/OriginTrackedPropertiesLoaderTests.java | 6 ++++++ .../org/springframework/boot/env/test-properties.properties | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java index fbd62f6313..c43538f637 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java @@ -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); } /** diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java index fd00e2a544..5e0e2e5beb 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java @@ -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); } diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties index dcefcff57d..7630cff49f 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties @@ -40,3 +40,5 @@ test-multiline-immediate-bang=\ #test ISO 8859-1 test-iso8859-1-chars=æ×ÈÅÞßáñÀÿ + +test-with-trailing-space= trailing