Eliminated RoutingCommand, using itnerary DTOs directly in the view.

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

@@ -8,7 +8,6 @@ import se.citerus.dddsample.service.RoutingService;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.LegDTO;
 import se.citerus.dddsample.web.command.RegistrationCommand;
-import se.citerus.dddsample.web.command.RoutingCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -65,25 +64,8 @@ public final class CargoAdminController extends MultiActionController {
     final Map<String, Object> map = new HashMap<String, Object>();
     final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
     final List<ItineraryCandidateDTO> itineraries = routingService.calculatePossibleRoutes(trackingId, null);
-    final List<RoutingCommand.ItineraryCandidateCommand> itineraryCandidates =
-      new ArrayList<RoutingCommand.ItineraryCandidateCommand>();
-
-    // TODO: eliminate the routing command altogether, use the DTOs in the view
-    for (ItineraryCandidateDTO itinerary : itineraries) {
-      final RoutingCommand.ItineraryCandidateCommand itineraryCandidateCommand =
-        new RoutingCommand.ItineraryCandidateCommand();
-      itineraryCandidateCommand.setTrackingId(trackingId.idString());
-      itineraryCandidates.add(itineraryCandidateCommand);
-      for (LegDTO leg : itinerary.getLegs()) {
-        final RoutingCommand.LegCommand legCommand = new RoutingCommand.LegCommand();
-        legCommand.setCarrierMovementId(leg.getCarrierMovementId());
-        legCommand.setFromUnlocode(leg.getFrom());
-        legCommand.setToUnlocode(leg.getTo());
-        itineraryCandidateCommand.getLegs().add(legCommand);
-      }
-    }
 
-    map.put("itineraryCandidates", itineraryCandidates);
+    map.put("itineraryCandidates", itineraries);
     map.put("trackingId", trackingId.idString());
     return map;
   }

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

@@ -11,7 +11,7 @@
       <form action="${postUrl}" method="post">
         <input type="hidden" name="trackingId" value="${trackingId}"/>
         <table>
-          <caption>Itinerary ${status.index + 1}</caption>
+          <caption>Itinerary ${itStatus.index + 1}</caption>
           <thead>
             <tr>
               <td>Carrier</td>
@@ -22,12 +22,12 @@
           <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.fromUnlocode}"/>
-              <input type="hidden" name="legs.toUnlocode" value="${leg.toUnlocode}"/>
+              <input type="hidden" name="legs.fromUnlocode" value="${leg.from}"/>
+              <input type="hidden" name="legs.toUnlocode" value="${leg.to}"/>
               <tr>
                 <td>${leg.carrierMovementId}</td>
-                <td>${leg.fromUnlocode}</td>
-                <td>${leg.toUnlocode}</td>
+                <td>${leg.from}</td>
+                <td>${leg.to}</td>
               </tr>
             </c:forEach>
           </tbody>