Polishing

Signed-off-by: Sébastien Deleuze <sdeleuze@users.noreply.github.com>

Author: sdeleuze

README.adoc

@@ -34,7 +34,7 @@ To manually initialize the project:
 
 . Navigate to https://start.spring.io.
 This service pulls in all the dependencies you need for an application and does most of the setup for you.
-. Choose either Gradle or Maven and the language you want to use: Kotlin or Java.
+. Choose either Gradle or Maven and the language you want to use.
 . Click *Dependencies* and select *Spring Web*.
 . Click *Generate*.
 . Download the resulting ZIP file, which is an archive of a web application that is configured with your choices.
@@ -59,10 +59,6 @@ include::complete/src/main/java/com/example/testingweb/HomeController.java[]
 include::complete-kotlin/src/main/kotlin/com/example/testingweb/HomeController.kt[]
 ----
 
-NOTE: The preceding example does not specify `GET` versus `PUT`, `POST`, and so forth.
-By default `@RequestMapping` maps all HTTP operations. You can use `@GetMapping` or
-`@RequestMapping(method=GET)` to narrow this mapping.
-
 
 == Run the Application
 
@@ -253,7 +249,7 @@ include::complete/src/test/java/com/example/testingweb/WebMockTest.java[]
 include::complete-kotlin/src/test/kotlin/com/example/testingweb/WebMockTest.kt[]
 ----
 
-We use `@MockBean` to create and inject a mock for the `GreetingService` (if you do not do
+We use `@MockitoBean` to create and inject a mock for the `GreetingService` (if you do not do
 so, the application context cannot start), and we set its expectations using `Mockito`.
 
 == Summary

complete-kotlin/src/main/kotlin/com/example/testingweb/GreetingController.kt

@@ -1,13 +1,11 @@
 package com.example.testingweb
 
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.ResponseBody
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
 
-@Controller
+@RestController
 class GreetingController(private val service: GreetingService) {
 
-    @RequestMapping("/greeting")
-    @ResponseBody
+    @GetMapping("/greeting")
     fun greeting(): String = service.greet()
 }

complete-kotlin/src/main/kotlin/com/example/testingweb/HomeController.kt

@@ -1,13 +1,11 @@
 package com.example.testingweb
 
-import org.springframework.stereotype.Controller
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.ResponseBody
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
 
-@Controller
+@RestController
 class HomeController {
 
-    @RequestMapping("/")
-    @ResponseBody
+    @GetMapping("/")
     fun greeting(): String = "Hello, World"
 }

complete/src/main/java/com/example/testingweb/GreetingController.java

@@ -1,11 +1,10 @@
 package com.example.testingweb;
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
-@Controller
+@RestController
 public class GreetingController {
 
 	private final GreetingService service;
@@ -14,8 +13,8 @@ public GreetingController(GreetingService service) {
 		this.service = service;
 	}
 
-	@RequestMapping("/greeting")
-	public @ResponseBody String greeting() {
+	@GetMapping("/greeting")
+	public String greeting() {
 		return service.greet();
 	}
 

complete/src/main/java/com/example/testingweb/HomeController.java

@@ -1,14 +1,13 @@
 package com.example.testingweb;
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
 public class HomeController {
 
-	@RequestMapping("/")
-	public @ResponseBody String greeting() {
+	@GetMapping("/")
+	public String greeting() {
 		return "Hello, World";
 	}