Purged last DTO from domain service layer, in preparation for a combination of dedicated remote facade with DTO assembly (booking application) and working directly against the domain service layer (tracking web interface).

dddsample/src/main/java/se/citerus/dddsample/service/TrackingService.java

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.service;
 
+import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 
 /**
  * Cargo tracking service.
@@ -10,10 +10,12 @@ import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 public interface TrackingService {
 
   /**
-   * @param trackingId tracking id
+   * Track a particular cargo.
+   *
+   * @param trackingId cargo tracking id
    * @return A cargo and its delivery history, or null if no cargo with given tracking id is found.
    */
-  CargoTrackingDTO track(TrackingId trackingId);
+  Cargo track(TrackingId trackingId);
 
   /**
    * Send relevant notifications to interested parties,

dddsample/src/main/java/se/citerus/dddsample/service/TrackingServiceImpl.java

@@ -7,8 +7,6 @@ import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
 
 public class TrackingServiceImpl implements TrackingService {
 
@@ -17,15 +15,10 @@ public class TrackingServiceImpl implements TrackingService {
   private final Log logger = LogFactory.getLog(getClass());
 
   @Transactional(readOnly = true)
-  public CargoTrackingDTO track(final TrackingId trackingId) {
+  public Cargo track(final TrackingId trackingId) {
     Validate.notNull(trackingId);
 
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      return null;
-    }
-
-    return new CargoTrackingDTOAssembler().toDTO(cargo);
+    return cargoRepository.find(trackingId);
   }
 
   @Transactional(readOnly = true)

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

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

dddsample/src/test/java/se/citerus/dddsample/service/TrackingServiceTest.java

@@ -6,8 +6,6 @@ import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.CHICAGO;
 import static se.citerus.dddsample.domain.SampleLocations.STOCKHOLM;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.HandlingEventDTO;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -43,37 +41,24 @@ public class TrackingServiceTest extends TestCase {
 
 
     // Tested call
-    CargoTrackingDTO cargoDTO = cargoService.track(new TrackingId("XYZ"));
+    Cargo trackedCargo = cargoService.track(new TrackingId("XYZ"));
 
+    assertEquals(cargo, trackedCargo);
 
-    assertEquals("XYZ", cargoDTO.getTrackingId());
-    assertEquals("SESTO (Stockholm)", cargoDTO.getOrigin());
-    assertEquals("USCHI (Chicago)", cargoDTO.getFinalDestination());
-    assertEquals("USCHI", cargoDTO.getCurrentLocationId());
-
-    List<HandlingEventDTO> events = cargoDTO.getEvents();
+    List<HandlingEvent> events = trackedCargo.deliveryHistory().eventsOrderedByCompletionTime();
     assertEquals(3, events.size());
 
     // Claim happened first
-    HandlingEventDTO eventDTO = events.get(0);
-    assertEquals("SESTO (Stockholm)", eventDTO.getLocation());
-    assertEquals("CLAIM", eventDTO.getType());
-    assertEquals("", eventDTO.getCarrier());
-    assertEquals(new Date(10), eventDTO.getTime());
+    HandlingEvent handlingEvent = events.get(0);
+    assertEquals(claimed, handlingEvent);
 
     // Then load
-    eventDTO = events.get(1);
-    assertEquals("SESTO (Stockholm)", eventDTO.getLocation());
-    assertEquals("LOAD", eventDTO.getType());
-    assertEquals("CAR_001", eventDTO.getCarrier());
-    assertEquals(new Date(12), eventDTO.getTime());
+    handlingEvent = events.get(1);
+    assertEquals(loaded, handlingEvent);
 
     // Finally unload
-    eventDTO = events.get(2);
-    assertEquals("USCHI (Chicago)", eventDTO.getLocation());
-    assertEquals("UNLOAD", eventDTO.getType());
-    assertEquals("CAR_001", eventDTO.getCarrier());
-    assertEquals(new Date(100), eventDTO.getTime());
+    handlingEvent = events.get(2);
+    assertEquals(unloaded, handlingEvent);
   }
 
   public void testTrackNullResult() {
@@ -81,9 +66,9 @@ public class TrackingServiceTest extends TestCase {
     replay(cargoRepository);
 
     // Tested call
-    CargoTrackingDTO cargoDTO = cargoService.track(new TrackingId("XYZ"));
+    Cargo cargo = cargoService.track(new TrackingId("XYZ"));
     
-    assertNull(cargoDTO);
+    assertNull(cargo);
   }
 
   protected void onTearDown() throws Exception {

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

@@ -10,15 +10,16 @@ import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
 import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.DeliveryHistory;
 import se.citerus.dddsample.domain.HandlingEvent;
 import static se.citerus.dddsample.domain.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.domain.SampleLocations.TOKYO;
-import se.citerus.dddsample.domain.StatusCode;
 import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.service.TrackingService;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
+import java.util.Arrays;
 import java.util.Date;
 
 public class CargoTrackingControllerTest extends TestCase {
@@ -44,24 +45,12 @@ public class CargoTrackingControllerTest extends TestCase {
   private TrackingService getCargoServiceMock() {
     return new EmptyStubTrackingService() {
 
-      public CargoTrackingDTO track(TrackingId trackingId) {
+      public Cargo track(TrackingId trackingId) {
         final Cargo cargo = new Cargo(trackingId, HONGKONG, TOKYO);
         final HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, HONGKONG, null);
-
-        final CargoTrackingDTO cargoDTO = new CargoTrackingDTO(
-          cargo.trackingId().idString(),
-          cargo.origin().unLocode().idString(),
-          cargo.destination().unLocode().idString(),
-          StatusCode.CLAIMED,
-          "AAAAA",
-          "BALO",
-          false);
-        cargoDTO.addEvent(event.location().unLocode().idString(),
-          event.type().toString(),
-          null,
-          event.completionTime(),
-          true);
-        return cargoDTO;
+        cargo.setDeliveryHistory(new DeliveryHistory(Arrays.asList(event)));
+        
+        return cargo;
       }
     };
   }
@@ -92,7 +81,7 @@ public class CargoTrackingControllerTest extends TestCase {
     // 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("AAAAA", cargo.getCurrentLocationId());
+    assertEquals("CNHKG", cargo.getCurrentLocationId());
   }
 
   public void testUnknownCargo() throws Exception {
@@ -116,7 +105,7 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   private class EmptyStubTrackingService implements TrackingService {
-    public CargoTrackingDTO track(TrackingId trackingId) {
+    public Cargo track(TrackingId trackingId) {
       return null;
     }
     public void notify(TrackingId trackingId) {