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
4a34c35d
Commit
4a34c35d
authored
Oct 07, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7120 from izeye:fix-string-format
* pr/7120: Fix String.format() usages
parents
20a2db79
1c4c0c61
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
WebSocketMessagingAutoConfigurationTests.java
...e/websocket/WebSocketMessagingAutoConfigurationTests.java
+1
-1
YamlConfigurationFactory.java
...g/springframework/boot/bind/YamlConfigurationFactory.java
+1
-1
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
View file @
4a34c35d
...
@@ -106,7 +106,7 @@ public class WebSocketMessagingAutoConfigurationTests {
...
@@ -106,7 +106,7 @@ public class WebSocketMessagingAutoConfigurationTests {
@Test
@Test
public
void
basicMessagingWithStringResponse
()
throws
Throwable
{
public
void
basicMessagingWithStringResponse
()
throws
Throwable
{
Object
result
=
performStompSubscription
(
"/app/string"
);
Object
result
=
performStompSubscription
(
"/app/string"
);
assertThat
(
new
String
((
byte
[])
result
)).
isEqualTo
(
String
.
format
(
"string data"
)
);
assertThat
(
new
String
((
byte
[])
result
)).
isEqualTo
(
"string data"
);
}
}
@Test
@Test
...
...
spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
View file @
4a34c35d
...
@@ -138,7 +138,7 @@ public class YamlConfigurationFactory<T>
...
@@ -138,7 +138,7 @@ public class YamlConfigurationFactory<T>
+
"either set it directly or set the resource to load it from"
);
+
"either set it directly or set the resource to load it from"
);
try
{
try
{
if
(
this
.
logger
.
isTraceEnabled
())
{
if
(
this
.
logger
.
isTraceEnabled
())
{
this
.
logger
.
trace
(
String
.
format
(
"Yaml document is %n%s"
+
this
.
yaml
));
this
.
logger
.
trace
(
String
.
format
(
"Yaml document is %n%s"
,
this
.
yaml
));
}
}
Constructor
constructor
=
new
YamlJavaBeanPropertyConstructor
(
this
.
type
,
Constructor
constructor
=
new
YamlJavaBeanPropertyConstructor
(
this
.
type
,
this
.
propertyAliases
);
this
.
propertyAliases
);
...
...
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