Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
06a8c419
Commit
06a8c419
authored
Jul 02, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Preserve trailing whitespace in origin-tracked property values
Closes gh-13602
parent
032d5488
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
OriginTrackedPropertiesLoader.java
...ringframework/boot/env/OriginTrackedPropertiesLoader.java
+1
-1
OriginTrackedPropertiesLoaderTests.java
...ramework/boot/env/OriginTrackedPropertiesLoaderTests.java
+6
-0
test-properties.properties
...s/org/springframework/boot/env/test-properties.properties
+2
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java
View file @
06a8c419
...
...
@@ -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
);
}
/**
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
View file @
06a8c419
...
...
@@ -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
);
}
...
...
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties
View file @
06a8c419
...
...
@@ -40,3 +40,5 @@ test-multiline-immediate-bang=\
#test ISO 8859-1
test-iso8859-1-chars
=
test-with-trailing-space
=
trailing
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment