root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-10-07 09:46:21 +02:00
parent 9b6fa1e8d7 4a34c35da3
commit 02b0e3955c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
View File

@ -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

2
spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
View File

@ -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);