Cargo tracking web interface now sits immediately on top of the domain layer, forming one of the "user interface extremes" (the other one being complete remote-DTO-separation).

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/CargoTrackingDTO.java

@@ -1,90 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import se.citerus.dddsample.domain.model.cargo.StatusCode;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-/**
- * DTO for a cargo and its delivery history.
- */
-public final class CargoTrackingDTO implements Serializable {
-
-  private final String trackingId;
-  private final String origin;
-  private final String finalDestination;
-  private final String currentLocationId;
-  private final List<HandlingEventDTO> events;
-  private final String carrierMovementId;
-  private final StatusCode statusCode;
-  private final boolean misdirected;
-
-  /**
-   * Constructor.
-   *
-   * @param trackingId
-   * @param origin
-   * @param finalDestination
-   * @param statusCode
-   * @param currentLocationId
-   * @param carrierMovementId
-   * @param isMisdirected
-   */
-  public CargoTrackingDTO(final String trackingId, final String origin, final String finalDestination,
-                          final StatusCode statusCode, final String currentLocationId, final String carrierMovementId,
-                          final boolean isMisdirected) {
-    this.trackingId = trackingId;
-    this.origin = origin;
-    this.finalDestination = finalDestination;
-    this.statusCode = statusCode;
-    this.currentLocationId = currentLocationId;
-    this.carrierMovementId = carrierMovementId;
-    this.misdirected = isMisdirected;
-
-    this.events = new ArrayList<HandlingEventDTO>();
-  }
-
-  public void addEvent(final String location, final String type, final String carrier, final Date time,
-                       final boolean expected) {
-    events.add(new HandlingEventDTO(location, type, carrier, time, expected));
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<HandlingEventDTO> getEvents() {
-    return Collections.unmodifiableList(events);
-  }
-
-  public String getFinalDestination() {
-    return finalDestination;
-  }
-
-  public String getOrigin() {
-    return origin;
-  }
-
-  public String getTrackingId() {
-    return trackingId;
-  }
-
-  public String getCurrentLocationId() {
-    return currentLocationId;
-  }
-
-  public StatusCode getStatusCode() {
-    return statusCode;
-  }
-
-  public String getCarrierMovementId() {
-    return carrierMovementId;
-  }
-
-  public boolean isMisdirected() {
-    return misdirected;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoTrackingDTOAssembler.java

@@ -1,44 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
-
-import se.citerus.dddsample.application.remoting.dto.CargoTrackingDTO;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.util.List;
-
-/**
- * Assembler class for the CargoTrackingDTO.
- */
-public class CargoTrackingDTOAssembler {
-
-  public CargoTrackingDTO toDTO(final Cargo cargo) {
-    final DeliveryHistory deliveryHistory = cargo.deliveryHistory();
-    final Location currentLocation = deliveryHistory.currentLocation();
-    final CarrierMovement currentCarrierMovement = deliveryHistory.currentCarrierMovement();
-    final CargoTrackingDTO dto = new CargoTrackingDTO(
-      cargo.trackingId().idString(),
-      cargo.origin().toString(),
-      cargo.destination().toString(),
-      deliveryHistory.status(),
-      currentLocation == null ? null : currentLocation.unLocode().idString(),
-      currentCarrierMovement == null ? null : currentCarrierMovement.carrierMovementId().idString(),
-      cargo.isMisdirected()
-    );
-
-    final List<HandlingEvent> events = deliveryHistory.eventsOrderedByCompletionTime();
-    for (HandlingEvent event : events) {
-      final CarrierMovement cm = event.carrierMovement();
-      final String carrierIdString = (cm == null) ? "" : cm.carrierMovementId().idString();
-      dto.addEvent(event.location().toString(),
-        event.type().toString(),
-        carrierIdString,
-        event.completionTime(),
-        cargo.itinerary().isExpected(event));
-    }
-    return dto;
-  }
-
-}

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

@@ -3,8 +3,6 @@ package se.citerus.dddsample.application.web;
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
-import se.citerus.dddsample.application.remoting.dto.CargoTrackingDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.CargoTrackingDTOAssembler;
 import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
@@ -37,10 +35,9 @@ public final class CargoTrackingController extends SimpleFormController {
     final String tidStr = trackCommand.getTrackingId();
     final Cargo cargo = trackingService.track(new TrackingId(tidStr));
 
-    final Map<String, CargoTrackingDTO> model = new HashMap<String, CargoTrackingDTO>();
+    final Map<String, Cargo> model = new HashMap<String, Cargo>();
     if (cargo != null) {
-      final CargoTrackingDTO dto = new CargoTrackingDTOAssembler().toDTO(cargo);
-      model.put("cargo", dto);
+      model.put("cargo", cargo);
     } else {
       errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()},
         "Unknown tracking id");

dddsample/src/main/webapp/WEB-INF/jsp/cargo/track.jsp

@@ -1,3 +1,6 @@
+<%@ page import="se.citerus.dddsample.domain.model.cargo.Cargo" %>
+<%@ page import="se.citerus.dddsample.domain.model.cargo.DeliveryHistory" %>
+<%@ page import="se.citerus.dddsample.domain.model.handling.HandlingEvent" %>
 <html>
 <head>
   <title>Cargo search</title>
@@ -30,12 +33,24 @@
   </form:form>
   </div>
 
-  <c:if test="${cargo ne null}">
-    <div id="result">	
-    <h2>Status: <spring:message code="cargo.status.${cargo.statusCode}"/>&nbsp;${cargo.currentLocationId}&nbsp;${cargo.carrierMovementId}</h2>
-    <c:if test="${cargo.misdirected}">
+  <% final Cargo cargo = (Cargo) request.getAttribute("cargo"); %>
+
+  <% if (cargo != null) { %>
+    <% final DeliveryHistory dh = cargo.deliveryHistory(); %>
+    <div id="result">
+    <h2>
+      <c:set var="statusMessageCode"><%="cargo.status." + dh.status()%></c:set>
+      Status: <spring:message code="${statusMessageCode}"/>
+      &nbsp;
+      <%= dh.currentLocation() != null ?
+          dh.currentLocation().name() : "" %>
+      &nbsp;
+      <%= dh.currentCarrierMovement() != null ?
+          dh.currentCarrierMovement().carrierMovementId().idString() : "" %>
+    </h2>
+    <% if (cargo.isMisdirected()) { %>
       <p class="notify"><img src="${rc.contextPath}/images/error.png" alt="" />Cargo is misdirected</p>
-    </c:if>  
+    <% } %>
     <h3>Tracking History</h3>
     <table cellspacing="4">
       <thead>
@@ -47,18 +62,19 @@
         </tr>
       </thead>
       <tbody>
-        <c:forEach var="event" items="${cargo.events}">
-          <tr class="event-type-${event.type}">
-            <td>${event.type}</td>
-            <td>${event.location}</td>
-            <td>${event.time}</td>
-            <td><img src="${rc.contextPath}/images/${event.expected ? "tick" : "cross"}.png" alt=""/></td>
+        <% for (HandlingEvent event : dh.eventsOrderedByCompletionTime()) { %>
+          <tr class="event-type-<%=event.type()%>">
+            <td><%=event.type()%></td>
+            <td><%=event.location().name()%></td>
+            <td><%=event.completionTime()%></td>
+            <td><img src="${rc.contextPath}/images/<%=cargo.itinerary().isExpected(event) ? "tick" : "cross"%>.png" alt=""/></td>
           </tr>
-        </c:forEach>
+        <% } %>
       </tbody>
     </table>
   </div>
-  </c:if>
+  <% } %>
+
 </div>
 <script type="text/javascript" charset="UTF-8">
   try {

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

@@ -9,7 +9,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.application.remoting.dto.CargoTrackingDTO;
 import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
@@ -80,8 +79,8 @@ public class CargoTrackingControllerTest extends TestCase {
     assertEquals("test-form", mav.getViewName());
     // Errors, command are two standard map attributes, the third should be the cargo object
     assertEquals(3, mav.getModel().size());
-    CargoTrackingDTO cargo = (CargoTrackingDTO) mav.getModel().get("cargo");
-    assertEquals("CNHKG", cargo.getCurrentLocationId());
+    Cargo cargo = (Cargo) mav.getModel().get("cargo");
+    assertEquals(HONGKONG, cargo.deliveryHistory().currentLocation());
   }
 
   public void testUnknownCargo() throws Exception {