Merge branch '1.5.x'

2017-06-16 09:13:42 +01:00
parent 573007166c 59122358d3
commit 991314c63d
36 changed files with 109 additions and 111 deletions
--- a/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/test/java/sample/secure/oauth2/actuator/SampleSecureOAuth2ActuatorApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/test/java/sample/secure/oauth2/actuator/SampleSecureOAuth2ActuatorApplicationTests.java
@@ -70,7 +70,8 @@ public class SampleSecureOAuth2ActuatorApplicationTests {

 	@Test
 	public void healthAvailable() throws Exception {
-		this.mvc.perform(get("/application/health")).andExpect(status().isOk()).andDo(print());
+		this.mvc.perform(get("/application/health")).andExpect(status().isOk())
+				.andDo(print());
 	}

 	@Test