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-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java
@@ -38,8 +38,8 @@ public class SampleJersey1ApplicationTests {

 	@Test
 	public void contextLoads() {
-		assertEquals("Hello World", new TestRestTemplate().getForObject(
-				"http://localhost:" + this.port + "/", String.class));
+		assertEquals("Hello World", new TestRestTemplate()
+				.getForObject("http://localhost:" + this.port + "/", String.class));
 	}

 }