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

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2016-11-30 08:27:30 +01:00
parent 96ca884450 b35b7664b8
commit e7275b62dc
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/web/BasicErrorControllerIntegrationTests.java Normal file → Executable file
View File

@ -182,7 +182,7 @@ public class BasicErrorControllerIntegrationTests {
.accept(MediaType.TEXT_HTML).build();
ResponseEntity<String> entity = new TestRestTemplate().exchange(request,
String.class);
String resp = entity.getBody().toString();
String resp = entity.getBody();
assertThat(resp).contains("We are out of storage");
}

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java Normal file → Executable file
View File

@ -190,7 +190,7 @@ public class ExplodedArchiveTests {
private Map<String, Archive.Entry> getEntriesMap(Archive archive) {
Map<String, Archive.Entry> entries = new HashMap<String, Archive.Entry>();
for (Archive.Entry entry : archive) {
entries.put(entry.getName().toString(), entry);
entries.put(entry.getName(), entry);
}
return entries;
}