Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
--- a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java
@@ -48,8 +48,8 @@ public class SampleHateoasApplicationTests {
 		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(
 				"http://localhost:" + this.port + "/customers/1", String.class);
 		assertThat(entity.getStatusCode(), equalTo(HttpStatus.OK));
-		assertThat(entity.getBody(), startsWith("{\"id\":1,\"firstName\":\"Oliver\""
-				+ ",\"lastName\":\"Gierke\""));
+		assertThat(entity.getBody(), startsWith(
+				"{\"id\":1,\"firstName\":\"Oliver\"" + ",\"lastName\":\"Gierke\""));
 		assertThat(entity.getBody(), containsString("_links\":{\"self\":{\"href\""));
 	}