Modified workflow in web gui to present the search result and search form in same view (start.jsp)

dddsample/src/main/java/se/citerus/dddsample/web/CargoTrackingController.java

@@ -1,5 +1,6 @@
 package se.citerus.dddsample.web;
 
+import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import org.springframework.web.servlet.view.RedirectView;
@@ -10,6 +11,9 @@ import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.web.command.TrackCommand;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,15 +30,15 @@ public class CargoTrackingController extends SimpleFormController {
 
   public CargoTrackingController() {
     setCommandClass(TrackCommand.class);
-    setBindOnNewForm(true);
   }
 
+  
   @Override
-  public ModelAndView onSubmit(final Object command) throws ServletException {
+  protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception {
     ModelAndView mav = null;
     final Map<String, Object> model = new HashMap<String, Object>();
 
-    final TrackCommand trackCommand = (TrackCommand) command;
+    final TrackCommand trackCommand = (TrackCommand) command;   
     logger.debug("Finding cargo by trackingId: " + trackCommand.getTrackingId());
     final Cargo cargo = cargoService.find(trackCommand.getTrackingId());
 
@@ -42,7 +46,10 @@ public class CargoTrackingController extends SimpleFormController {
       final Location location = cargo.currentLocation();
       logger.debug("Location of [" + trackCommand.getTrackingId() + "] is [" + location + "]");
       model.put("location", location);
-      mav = new ModelAndView(getSuccessView(), model);
+      
+      // Can't just return a new MaV instance when successView and FormView is the same. Binding will fail.
+      // showForm will append our command and model to the request so that the form will bind successfully.
+      mav = showForm(request, errors, getSuccessView(), model);
     } else {
       model.put("trackingId", trackCommand.getTrackingId());
       mav = new ModelAndView(getUnknownCargoView(), model);
@@ -50,6 +57,7 @@ public class CargoTrackingController extends SimpleFormController {
     
     return mav;
   }
+   
 
   /**
    * Sets the cargo service instance.
@@ -77,6 +85,7 @@ public class CargoTrackingController extends SimpleFormController {
   public String getUnknownCargoView() {
     return unknownCargoView;
   }
-  
+
+
   
 }

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -7,7 +7,7 @@
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="start"/>
-    <property name="successView" value="cargo"/>
+    <property name="successView" value="start"/>
     <property name="cargoService" ref="cargoService"/>
     <property name="validator" ref="trackCommandValidator"/>
     <property name="unknownCargoView" value="unknownCargo"/>

dddsample/src/main/webapp/WEB-INF/jsp/start.jsp

@@ -20,12 +20,13 @@
     </table>
     <br>
     <input type="submit" value="Track!">
+    <c:choose>
+      <c:when test="${location ne null}">
+        <p>Your cargo is currently at: <b>${location}</b></p>
+      </c:when>
+    </c:choose>
   </form:form>
 </div>
-<c:choose>
-  <c:when test="${location ne null}">
-    <p>Your cargo is currently at: <b>${location}</b></p>
-  </c:when>
-</c:choose>
+
 </body>
 </html>

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -1,11 +1,13 @@
 package se.citerus.dddsample.web;
 
 import junit.framework.TestCase;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.servlet.ModelAndView;
+
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.Location;
 import se.citerus.dddsample.domain.TrackingId;
@@ -13,7 +15,6 @@ import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.web.command.TrackCommand;
 
 public class CargoTrackingControllerTest extends TestCase {
-
   CargoTrackingController controller;
   MockHttpServletRequest request;
   MockHttpServletResponse response;
@@ -26,11 +27,17 @@ public class CargoTrackingControllerTest extends TestCase {
     response = new MockHttpServletResponse();
     session = new MockHttpSession(servletContext);
     request.setSession(session);
+    
     controller = new CargoTrackingController();
     controller.setFormView("test-form");
     controller.setSuccessView("test-success");
+    controller.setUnknownCargoView("test-unkownCargo");
     controller.setCommandName("test-command-name");
-    controller.setCargoService(new CargoService() {
+    controller.setCargoService(getCargoServiceMock());
+  }
+
+  private CargoService getCargoServiceMock() {
+    return new CargoService() {
       public Cargo find(String trackingId) {
         Cargo cargo = new Cargo(
           new TrackingId(trackingId),
@@ -38,7 +45,15 @@ public class CargoTrackingControllerTest extends TestCase {
           new Location("BBB"));
         return cargo;
       }
-    });
+    };
+  }
+  
+  private CargoService getCargoServiceNullMock() {
+    return new CargoService() {
+      public Cargo find(String trackingId) {
+        return null;
+      }
+    };
   }
 
   public void testHandleGet() throws Exception {
@@ -57,9 +72,35 @@ public class CargoTrackingControllerTest extends TestCase {
     ModelAndView mav = controller.handleRequest(request, response);
 
     assertEquals("test-success", mav.getViewName());
-    assertEquals(1, mav.getModel().size());
+    assertEquals(3, mav.getModel().size());
     Location location = (Location) mav.getModel().get("location");
     assertEquals("AAA", location.unlocode());
   }
 
+  public void testUnknownCargo() throws Exception {
+    controller.setCargoService(getCargoServiceNullMock());
+    controller.setCommandClass(TrackCommandMock.class);
+    request.setMethod("POST");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-unkownCargo", mav.getViewName());
+    assertEquals(1, mav.getModel().size());
+    String trackId = (String) mav.getModel().get("trackingId");
+    assertEquals("MOCK", trackId);
+  }
+  
+  
+  
+  
+  /**
+   * Mock track command.
+   * 
+   * Sets a default track id when constructed.
+   */
+  private static class TrackCommandMock extends TrackCommand {
+    public TrackCommandMock() {
+      setTrackingId("MOCK");
+    }
+  }
 }