Fixed binding to proper command object for selected itinerary

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoAdminController.java

@@ -7,6 +7,7 @@ import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.application.remoting.dto.LegDTO;
 import se.citerus.dddsample.application.remoting.dto.LocationDTO;
 import se.citerus.dddsample.application.web.command.RegistrationCommand;
+import se.citerus.dddsample.application.web.command.RouteAssignmentCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -86,23 +87,15 @@ public final class CargoAdminController extends MultiActionController {
     return map;
   }
 
-  public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final String trackingId = request.getParameter("trackingId");
-
-    // TODO:  gah, stuck on indexoutofbounds (legs[0].fromUnlocode etc) when trying to bind...
-    // Revisit and fix this with a proper command object, this is just hideous
-    final String[] cmIds = (String[]) request.getParameterMap().get("legs.carrierMovementId");
-    final String[] fromUnlocodes = (String[]) request.getParameterMap().get("legs.fromUnlocode");
-    final String[] toUnlocodes = (String[]) request.getParameterMap().get("legs.toUnlocode");
-
-    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(cmIds.length);
-    for (int i = 0; i < cmIds.length; i++) {
-      legDTOs.add(new LegDTO(cmIds[i], fromUnlocodes[i], toUnlocodes[i]));
+  public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
+    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
+    for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
+      legDTOs.add(new LegDTO(leg.getCarrierMovementId(), leg.getFromUnLocode(), leg.getToUnLocode()));
     }
 
     final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
 
-    bookingServiceFacade.assignCargoToRoute(trackingId, selectedItinerary);
+    bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedItinerary);
 
     response.sendRedirect("list.html");
   }

dddsample/src/main/java/se/citerus/dddsample/application/web/command/RouteAssignmentCommand.java

@@ -0,0 +1,70 @@
+package se.citerus.dddsample.application.web.command;
+
+import org.apache.commons.collections.Factory;
+import org.apache.commons.collections.ListUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RouteAssignmentCommand {
+
+  private String trackingId;
+  private List<LegCommand> legs = ListUtils.lazyList(
+    new ArrayList(), LegCommand.factory()
+  );
+
+  public String getTrackingId() {
+    return trackingId;
+  }
+
+  public void setTrackingId(String trackingId) {
+    this.trackingId = trackingId;
+  }
+
+  public List<LegCommand> getLegs() {
+    return legs;
+  }
+
+  public void setLegs(List<LegCommand> legs) {
+    this.legs = legs;
+  }
+
+  public static final class LegCommand {
+    private String carrierMovementId;
+    private String fromUnLocode;
+    private String toUnLocode;
+
+    public String getCarrierMovementId() {
+      return carrierMovementId;
+    }
+
+    public void setCarrierMovementId(final String carrierMovementId) {
+      this.carrierMovementId = carrierMovementId;
+    }
+
+    public String getFromUnLocode() {
+      return fromUnLocode;
+    }
+
+    public void setFromUnLocode(final String fromUnLocode) {
+      this.fromUnLocode = fromUnLocode;
+    }
+
+    public String getToUnLocode() {
+      return toUnLocode;
+    }
+
+    public void setToUnLocode(final String toUnLocode) {
+      this.toUnLocode = toUnLocode;
+    }
+
+    public static Factory factory() {
+      return new Factory() {
+        public Object create() {
+          return new LegCommand();
+        }
+      };
+    }
+    
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/application/web/command/RoutingCommand.java

@@ -1,68 +0,0 @@
-package se.citerus.dddsample.application.web.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class RoutingCommand {
-
-  private List<ItineraryCandidateCommand> itineraryCandidates = new ArrayList<ItineraryCandidateCommand>();
-
-  public List<ItineraryCandidateCommand> getItineraryCandidates() {
-    return itineraryCandidates;
-  }
-
-  public void setItineraryCandidates(final List<ItineraryCandidateCommand> itineraryCandidates) {
-    this.itineraryCandidates = itineraryCandidates;
-  }
-
-  public static final class ItineraryCandidateCommand {
-    private String trackingId;
-    private List<LegCommand> legs = new ArrayList<LegCommand>();
-
-    public String getTrackingId() {
-      return trackingId;
-    }
-
-    public void setTrackingId(final String trackingId) {
-      this.trackingId = trackingId;
-    }
-
-    public List<LegCommand> getLegs() {
-      return legs;
-    }
-
-    public void setLegs(final List<LegCommand> legs) {
-      this.legs = legs;
-    }
-  }
-
-  public static final class LegCommand {
-    private String carrierMovementId;
-    private String fromUnlocode;
-    private String toUnlocode;
-
-    public String getCarrierMovementId() {
-      return carrierMovementId;
-    }
-
-    public void setCarrierMovementId(final String carrierMovementId) {
-      this.carrierMovementId = carrierMovementId;
-    }
-
-    public String getFromUnlocode() {
-      return fromUnlocode;
-    }
-
-    public void setFromUnlocode(final String fromUnlocode) {
-      this.fromUnlocode = fromUnlocode;
-    }
-
-    public String getToUnlocode() {
-      return toUnlocode;
-    }
-
-    public void setToUnlocode(final String toUnlocode) {
-      this.toUnlocode = toUnlocode;
-    }
-  }
-}

dddsample/src/main/webapp/WEB-INF/jsp/admin/selectItinerary.jsp

@@ -51,9 +51,9 @@
           </thead>
           <tbody>
             <c:forEach items="${it.legs}" var="leg" varStatus="legStatus">
-              <input type="hidden" name="legs.carrierMovementId" value="${leg.carrierMovementId}"/>
-              <input type="hidden" name="legs.fromUnlocode" value="${leg.from}"/>
-              <input type="hidden" name="legs.toUnlocode" value="${leg.to}"/>
+              <input type="hidden" name="legs[${legStatus.index}].carrierMovementId" value="${leg.carrierMovementId}"/>
+              <input type="hidden" name="legs[${legStatus.index}].fromUnLocode" value="${leg.from}"/>
+              <input type="hidden" name="legs[${legStatus.index}].toUnLocode" value="${leg.to}"/>
               <tr>
                 <td>${leg.carrierMovementId}</td>
                 <td>${leg.from}</td>

dddsample/src/test/java/se/citerus/dddsample/application/web/CargoAdminControllerTest.java

@@ -0,0 +1,29 @@
+package se.citerus.dddsample.application.web;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import se.citerus.dddsample.application.remoting.BookingServiceFacade;
+
+public class CargoAdminControllerTest extends TestCase {
+
+  CargoAdminController controller;
+  BookingServiceFacade bookingServiceFacade;
+  MockHttpServletRequest request;
+  MockHttpServletResponse response;
+
+  public CargoAdminControllerTest() {
+    controller = new CargoAdminController();
+    bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
+    controller.setBookingServiceFacade(bookingServiceFacade);
+  }
+
+  public void testAssignItinerary() throws Exception {
+    request = new MockHttpServletRequest("GET","assignItinerary.html");
+    response = new MockHttpServletResponse();
+
+    controller.handleRequest(request, response);
+  }
+
+}

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

@@ -107,7 +107,7 @@ public class CargoTrackingControllerTest extends TestCase {
     public Cargo track(TrackingId trackingId) {
       return null;
     }
-    public void notify(TrackingId trackingId) {
+    public void inspectCargo(TrackingId trackingId) {
     }
   }
 }

dddsample/src/test/java/se/citerus/dddsample/application/web/command/ItinerarySelectionCommandTest.java

@@ -0,0 +1,48 @@
+package se.citerus.dddsample.application.web.command;
+
+import junit.framework.TestCase;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.web.bind.ServletRequestDataBinder;
+
+import java.util.List;
+
+public class ItinerarySelectionCommandTest extends TestCase {
+
+  RouteAssignmentCommand command;
+  MockHttpServletRequest request;
+
+  public void testBind() {
+    command = new RouteAssignmentCommand();
+    request = new MockHttpServletRequest();
+
+    request.addParameter("legs[0].carrierMovementId", "CM01");
+    request.addParameter("legs[0].fromUnLocode", "AAAAA");
+    request.addParameter("legs[0].toUnLocode", "BBBBB");
+
+    request.addParameter("legs[1].carrierMovementId", "CM02");
+    request.addParameter("legs[1].fromUnLocode", "CCCCC");
+    request.addParameter("legs[1].toUnLocode", "DDDDD");
+
+    request.addParameter("trackingId", "XYZ");
+
+    ServletRequestDataBinder binder = new ServletRequestDataBinder(command);
+    binder.bind(request);
+
+    List<RouteAssignmentCommand.LegCommand> legs = command.getLegs();
+    assertEquals(2, legs.size());
+
+    RouteAssignmentCommand.LegCommand leg = legs.get(0);
+    assertEquals("CM01", leg.getCarrierMovementId());
+    assertEquals("AAAAA", leg.getFromUnLocode());
+    assertEquals("BBBBB", leg.getToUnLocode());
+
+    leg = legs.get(1);
+    assertEquals("CM02", leg.getCarrierMovementId());
+    assertEquals("CCCCC", leg.getFromUnLocode());
+    assertEquals("DDDDD", leg.getToUnLocode());
+
+    assertEquals("XYZ", command.getTrackingId());
+  }
+
+
+}