Update for Spring Boot 1.2

README.adoc

@@ -62,6 +62,8 @@ Here you create an `Application` class with the components:
 ----
 include::initial/src/main/java/hello/Application.java[]
 ----
+
+`@SpringBootApplication` is a convenience annotation that adds all of the following:
     
 - `@Configuration` tags the class as a source of bean definitions for the application context.
 - `@EnableAutoConfiguration` tells Spring Boot to start adding beans based on classpath settings, other beans, and various property settings.
@@ -235,7 +237,7 @@ It's easy to check the health of the app.
 
 ----
 $ curl localhost:8080/health
-ok
+{"status":"UP"}
 ----
 
 You can try to invoke shutdown through curl.

complete/src/main/java/hello/Application.java

@@ -3,14 +3,10 @@ package hello;
 import java.util.Arrays;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration
-@EnableAutoConfiguration
-@ComponentScan
+@SpringBootApplication
 public class Application {
     
     public static void main(String[] args) {

complete/src/test/java/hello/HelloControllerIT.java

@@ -1,6 +1,6 @@
 package hello;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
 import java.net.URL;
@@ -38,6 +38,6 @@ public class HelloControllerIT {
 	@Test
 	public void getHello() throws Exception {
 		ResponseEntity<String> response = template.getForEntity(base.toString(), String.class);
-		assertThat(response.getBody(), is("Greetings from Spring Boot!"));
+		assertThat(response.getBody(), equalTo("Greetings from Spring Boot!"));
 	}
 }

complete/src/test/java/hello/HelloControllerTest.java

@@ -1,6 +1,6 @@
 package hello;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.equalTo;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -32,6 +32,6 @@ public class HelloControllerTest {
 	public void getHello() throws Exception {
 		mvc.perform(MockMvcRequestBuilders.get("/").accept(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andExpect(content().string(is("Greetings from Spring Boot!")));
+				.andExpect(content().string(equalTo("Greetings from Spring Boot!")));
 	}
 }