responseEntityCustomHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.TEXT_PLAIN);
diff --git a/src/main/java/org/springframework/samples/mvc/simple/SimpleController.java b/src/main/java/org/springframework/samples/mvc/simple/SimpleController.java
index eb37c30e5..7c9bfa278 100644
--- a/src/main/java/org/springframework/samples/mvc/simple/SimpleController.java
+++ b/src/main/java/org/springframework/samples/mvc/simple/SimpleController.java
@@ -1,14 +1,13 @@
package org.springframework.samples.mvc.simple;
-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 SimpleController {
- @RequestMapping("/simple")
- public @ResponseBody String simple() {
+ @GetMapping("/simple")
+ public String simple() {
return "Hello world!";
}
diff --git a/src/main/java/org/springframework/samples/mvc/simple/SimpleControllerRevisited.java b/src/main/java/org/springframework/samples/mvc/simple/SimpleControllerRevisited.java
index 67efe40f9..fb9889ce4 100644
--- a/src/main/java/org/springframework/samples/mvc/simple/SimpleControllerRevisited.java
+++ b/src/main/java/org/springframework/samples/mvc/simple/SimpleControllerRevisited.java
@@ -1,15 +1,13 @@
package org.springframework.samples.mvc.simple;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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 SimpleControllerRevisited {
- @RequestMapping(value="/simple/revisited", method=RequestMethod.GET, headers="Accept=text/plain")
- public @ResponseBody String simple() {
+ @GetMapping(path="/simple/revisited", headers="Accept=text/plain")
+ public String simple() {
return "Hello world revisited!";
}
diff --git a/src/main/java/org/springframework/samples/mvc/validation/ValidationController.java b/src/main/java/org/springframework/samples/mvc/validation/ValidationController.java
index 6384e3065..4a916d5b7 100644
--- a/src/main/java/org/springframework/samples/mvc/validation/ValidationController.java
+++ b/src/main/java/org/springframework/samples/mvc/validation/ValidationController.java
@@ -4,16 +4,16 @@
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
-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 ValidationController {
// enforcement of constraints on the JavaBean arg require a JSR-303 provider on the classpath
- @RequestMapping("/validate")
- public @ResponseBody String validate(@Valid JavaBean bean, BindingResult result) {
+ @GetMapping("/validate")
+ public String validate(@Valid JavaBean bean, BindingResult result) {
if (result.hasErrors()) {
return "Object has validation errors";
} else {
diff --git a/src/main/java/org/springframework/samples/mvc/views/ViewsController.java b/src/main/java/org/springframework/samples/mvc/views/ViewsController.java
index d8ce95f8e..b1f9ab1b2 100644
--- a/src/main/java/org/springframework/samples/mvc/views/ViewsController.java
+++ b/src/main/java/org/springframework/samples/mvc/views/ViewsController.java
@@ -4,35 +4,35 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
@Controller
@RequestMapping("/views/*")
public class ViewsController {
- @RequestMapping(value="html", method=RequestMethod.GET)
+ @GetMapping("html")
public String prepare(Model model) {
model.addAttribute("foo", "bar");
model.addAttribute("fruit", "apple");
return "views/html";
}
- @RequestMapping(value="/viewName", method=RequestMethod.GET)
+ @GetMapping("/viewName")
public void usingRequestToViewNameTranslator(Model model) {
model.addAttribute("foo", "bar");
model.addAttribute("fruit", "apple");
}
- @RequestMapping(value="pathVariables/{foo}/{fruit}", method=RequestMethod.GET)
+ @GetMapping("pathVariables/{foo}/{fruit}")
public String pathVars(@PathVariable String foo, @PathVariable String fruit) {
// No need to add @PathVariables "foo" and "fruit" to the model
// They will be merged in the model before rendering
return "views/html";
}
- @RequestMapping(value="dataBinding/{foo}/{fruit}", method=RequestMethod.GET)
+ @GetMapping("dataBinding/{foo}/{fruit}")
public String dataBinding(@Valid JavaBean javaBean, Model model) {
// JavaBean "foo" and "fruit" properties populated from URI variables
return "views/dataBinding";
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
deleted file mode 100644
index 5439a479f..000000000
--- a/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..da5e62170
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
deleted file mode 100644
index 56dba6e8c..000000000
--- a/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
deleted file mode 100644
index 21630e518..000000000
--- a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml
deleted file mode 100644
index c38cdffdf..000000000
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/views/fileupload.jsp b/src/main/webapp/WEB-INF/views/fileupload.jsp
index 182fabbbd..0b54e1d9b 100644
--- a/src/main/webapp/WEB-INF/views/fileupload.jsp
+++ b/src/main/webapp/WEB-INF/views/fileupload.jsp
@@ -14,7 +14,12 @@
See the org.springframework.samples.mvc.fileupload package for the @Controller code
-