Merge branch '2.0.x' into 2.1.x

Closes gh-17078
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
--- a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java
@@ -55,8 +55,7 @@ public class SampleJpaApplicationTests {

 	@Test
 	public void testHome() throws Exception {
-		this.mvc.perform(get("/")).andExpect(status().isOk())
-				.andExpect(xpath("//tbody/tr").nodeCount(4));
+		this.mvc.perform(get("/")).andExpect(status().isOk()).andExpect(xpath("//tbody/tr").nodeCount(4));
 	}

 }