Refactored Controller methods

dschadow · dschadow · commit 7d41303941a4 · 2015-01-02T15:34:05.000+01:00
diff --git a/Ch04_OutputEscapingJSP/src/main/java/de/dominikschadow/webappsecurity/controller/ContactController.java b/Ch04_OutputEscapingJSP/src/main/java/de/dominikschadow/webappsecurity/controller/ContactController.java
@@ -21,10 +21,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.SessionAttributes;
-import org.springframework.web.servlet.ModelAndView;
 
 /**
  * 
@@ -37,9 +38,11 @@ public class ContactController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @RequestMapping(value = "/addContact", method = RequestMethod.POST)
-    public ModelAndView addContact(Contact contact) {
+    public String addContact(@ModelAttribute Contact contact, Model model) {
         logger.info("Firstname: " + contact.getFirstname() + ", Lastname: " + contact.getLastname());
 
-        return new ModelAndView("contact", "command", contact);
+        model.addAttribute("contact", contact);
+
+        return "contact";
     }
 }
diff --git a/Ch04_OutputEscapingJSP/src/main/java/de/dominikschadow/webappsecurity/controller/IndexController.java b/Ch04_OutputEscapingJSP/src/main/java/de/dominikschadow/webappsecurity/controller/IndexController.java
@@ -19,8 +19,8 @@
 
 import de.dominikschadow.webappsecurity.domain.Contact;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
 
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
@@ -33,7 +33,9 @@
 @RequestMapping(value = "/")
 public class IndexController {
     @RequestMapping(method = GET)
-    public ModelAndView index() {
-        return new ModelAndView("index", "command", new Contact());
+    public String index(Model model) {
+        model.addAttribute("contact", new Contact());
+
+        return "index";
     }
 }
