Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source 
Closes gh-17078
This commit is contained in:
Andy Wilkinson
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java
View File

@@ -51,8 +51,7 @@ public class WebConfig implements WebMvcConfigurer {
}
@Override
public void configureDefaultServletHandling(
DefaultServletHandlerConfigurer configurer) {
public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
configurer.enable();
}

3
spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java
View File

@@ -51,8 +51,7 @@ public class SampleTraditionalApplicationTests {
@Test
public void testStaticPage() {
ResponseEntity<String> entity = this.restTemplate.getForEntity("/index.html",
String.class);
ResponseEntity<String> entity = this.restTemplate.getForEntity("/index.html", String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
String body = entity.getBody();
assertThat(body).contains("<html>").contains("<h1>Hello</h1>");