Introduced Voyage, Schedule and VoyageNumber. CarrierMovement is now a value object, CarrierMovementId is dropped.

Leg now has load/unload location and time, and a reference to a Voyage.

HandlingEvent references a Voyage instead of a CarrierMovement.

DeliveryHistory is renamed to Delivery.

(Yes, it's very broken right now, but it compiles)

dddsample/src/main/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryHibernate.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-
-/**
- * Hibernate implementation of CarrierMovementRepository.
- */
-@Repository
-public final class CarrierMovementRepositoryHibernate extends HibernateRepository implements CarrierMovementRepository {
-
-  public CarrierMovement find(final CarrierMovementId carrierMovementId) {
-    return (CarrierMovement) getSession().
-      createQuery("from CarrierMovement where carrierMovementId = ?").
-      setParameter(0, carrierMovementId).
-      uniqueResult();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/VoyageRepositoryHibernate.java

@@ -0,0 +1,21 @@
+package se.citerus.dddsample.application.persistence;
+
+import org.springframework.stereotype.Repository;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
+
+/**
+ * Hibernate implementation of CarrierMovementRepository.
+ */
+@Repository
+public final class VoyageRepositoryHibernate extends HibernateRepository implements VoyageRepository {
+
+  public Voyage find(final VoyageNumber voyageNumber) {
+    return (Voyage) getSession().
+      createQuery("from Voyage where voyageNumber = :vn").
+      setParameter("vn", voyageNumber).
+      uniqueResult();
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/DeliveryHistory.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Delivery.java

@@ -2,31 +2,31 @@ package se.citerus.dddsample.domain.model.cargo;
 
 import se.citerus.dddsample.domain.model.ValueObject;
 import static se.citerus.dddsample.domain.model.cargo.StatusCode.*;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.*;
 
 /**
- * The delivery history of a cargo.
+ * The actual result of the cargo transportation, as opposed to
+ * the customer requirement (RouteSpecification) and the plan (Itinerary). 
  *
- * This is a value object.
  */
-public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
+public final class Delivery implements ValueObject<Delivery> {
 
   private Set<HandlingEvent> events;
 
-  public static final DeliveryHistory EMPTY_DELIVERY_HISTORY = new DeliveryHistory(Collections.EMPTY_SET);
+  public static final Delivery EMPTY_DELIVERY = new Delivery(Collections.EMPTY_SET);
 
-  DeliveryHistory(final Collection<HandlingEvent> events) {
+  Delivery(final Collection<HandlingEvent> events) {
     this.events = new HashSet<HandlingEvent>(events);
   }
 
   /**
    * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
    */
-  public List<HandlingEvent> eventsOrderedByCompletionTime() {
+  public List<HandlingEvent> history() {
     final List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
     Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
     return Collections.unmodifiableList(eventList);
@@ -39,11 +39,14 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     if (events.isEmpty()) {
       return null;
     } else {
-      final List<HandlingEvent> orderedEvents = eventsOrderedByCompletionTime();
+      final List<HandlingEvent> orderedEvents = history();
       return orderedEvents.get(orderedEvents.size() - 1);
     }
   }
 
+  /**
+   * @return
+   */
   public StatusCode status() {
     if (lastEvent() == null)
       return NOT_RECEIVED;
@@ -67,6 +70,9 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     }
   }
 
+  /**
+   * @return
+   */
   public Location currentLocation() {
     if (status().equals(IN_PORT)) {
       return lastEvent().location();
@@ -75,24 +81,27 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     }
   }
 
-  public CarrierMovement currentCarrierMovement() {
+  /**
+   * @return
+   */
+  public Voyage currentVoyage() {
     if (status().equals(ONBOARD_CARRIER)) {
-      return lastEvent().carrierMovement();
+      return lastEvent().voyage();
     } else {
-      return CarrierMovement.NONE;
+      return Voyage.NONE;
     }
   }
 
   @Override
-  public boolean sameValueAs(DeliveryHistory other) {
+  public boolean sameValueAs(Delivery other) {
     return other != null && events.equals(other.events);
   }
 
   @Override
-  public DeliveryHistory copy() {
+  public Delivery copy() {
     final Set<HandlingEvent> eventsCopy = new HashSet<HandlingEvent>(events);
 
-    return new DeliveryHistory(eventsCopy);
+    return new Delivery(eventsCopy);
   }
 
   @Override
@@ -100,7 +109,7 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    final DeliveryHistory other = (DeliveryHistory) o;
+    final Delivery other = (Delivery) o;
 
     return sameValueAs(other);
   }
@@ -110,7 +119,7 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     return events.hashCode();
   }
 
-  DeliveryHistory() {
+  Delivery() {
     // Needed by Hibernate
   }
 

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryInMem.java

@@ -1,14 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements;
-
-public final class CarrierMovementRepositoryInMem implements CarrierMovementRepository {
-
-  public CarrierMovement find(final CarrierMovementId carrierMovementId) {
-    return SampleCarrierMovements.lookup(carrierMovementId);
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/application/persistence/VoyageRepositoryInMem.java

@@ -0,0 +1,13 @@
+package se.citerus.dddsample.application.persistence;
+
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
+
+public final class VoyageRepositoryInMem implements VoyageRepository {
+
+  public Voyage find(VoyageNumber voyageNumber) {
+    throw new UnsupportedOperationException("Implement this!");
+  }
+  
+}

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/DeliveryHistoryTest.java

@@ -1,78 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-public class DeliveryHistoryTest extends TestCase {
-
-  private Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, NEWYORK);
-
-  public void testEvensOrderedByTimeOccured() throws Exception {
-
-    DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), HONGKONG, NEWYORK, new Date(), new Date());
-    HandlingEvent he1 = new HandlingEvent(cargo, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, NEWYORK);
-    HandlingEvent he2 = new HandlingEvent(cargo, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, NEWYORK, carrierMovement);
-    HandlingEvent he3 = new HandlingEvent(cargo, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, HONGKONG);
-    HandlingEvent he4 = new HandlingEvent(cargo, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, carrierMovement);
-    DeliveryHistory dh = new DeliveryHistory(Arrays.asList(he1, he2, he3, he4));
-
-    List<HandlingEvent> orderEvents = dh.eventsOrderedByCompletionTime();
-    assertEquals(4, orderEvents.size());
-    assertSame(he2, orderEvents.get(0));
-    assertSame(he4, orderEvents.get(1));
-    assertSame(he1, orderEvents.get(2));
-    assertSame(he3, orderEvents.get(3));
-  }
-
-  public void testCargoStatusFromLastHandlingEvent() {
-    Set<HandlingEvent> events = new HashSet<HandlingEvent>();
-    DeliveryHistory deliveryHistory = new DeliveryHistory(events);
-
-    assertEquals(StatusCode.NOT_RECEIVED, deliveryHistory.status());
-
-    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
-    deliveryHistory = new DeliveryHistory(events);
-    assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
-
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG, new Date(), new Date());
-    events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, carrierMovement));
-    deliveryHistory = new DeliveryHistory(events);
-    assertEquals(StatusCode.ONBOARD_CARRIER, deliveryHistory.status());
-
-    events.add(new HandlingEvent(cargo, new Date(30), new Date(31), HandlingEvent.Type.UNLOAD, HAMBURG, carrierMovement));
-    deliveryHistory = new DeliveryHistory(events);
-    assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
-
-    events.add(new HandlingEvent(cargo, new Date(40), new Date(41), HandlingEvent.Type.CLAIM, HAMBURG));
-    deliveryHistory = new DeliveryHistory(events);
-    assertEquals(StatusCode.CLAIMED, deliveryHistory.status());
-  }
-
-  public void testCurrentLocation() throws Exception {
-    Set<HandlingEvent> events = new HashSet<HandlingEvent>();
-    DeliveryHistory deliveryHistory = new DeliveryHistory(events);
-
-    assertEquals(Location.UNKNOWN, deliveryHistory.currentLocation());
-
-    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
-    deliveryHistory = new DeliveryHistory(events);
-
-    assertEquals(HAMBURG, deliveryHistory.currentLocation());
-
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG, new Date(), new Date());
-    events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, carrierMovement));
-    deliveryHistory = new DeliveryHistory(events);
-
-    assertEquals(Location.UNKNOWN, deliveryHistory.currentLocation());
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/DeliveryTest.java

@@ -0,0 +1,74 @@
+package se.citerus.dddsample.domain.model.cargo;
+
+import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.Location;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class DeliveryTest extends TestCase {
+
+  private Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, NEWYORK);
+
+  public void testEvensOrderedByTimeOccured() throws Exception {
+
+    DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+    HandlingEvent he1 = new HandlingEvent(cargo, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, NEWYORK);
+    HandlingEvent he2 = new HandlingEvent(cargo, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, NEWYORK, CM003);
+    HandlingEvent he3 = new HandlingEvent(cargo, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, HONGKONG);
+    HandlingEvent he4 = new HandlingEvent(cargo, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, CM004);
+    Delivery dh = new Delivery(Arrays.asList(he1, he2, he3, he4));
+
+    List<HandlingEvent> orderEvents = dh.history();
+    assertEquals(4, orderEvents.size());
+    assertSame(he2, orderEvents.get(0));
+    assertSame(he4, orderEvents.get(1));
+    assertSame(he1, orderEvents.get(2));
+    assertSame(he3, orderEvents.get(3));
+  }
+
+  public void testCargoStatusFromLastHandlingEvent() {
+    Set<HandlingEvent> events = new HashSet<HandlingEvent>();
+    Delivery delivery = new Delivery(events);
+
+    assertEquals(StatusCode.NOT_RECEIVED, delivery.status());
+
+    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
+    delivery = new Delivery(events);
+    assertEquals(StatusCode.IN_PORT, delivery.status());
+
+    events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, CM005));
+    delivery = new Delivery(events);
+    assertEquals(StatusCode.ONBOARD_CARRIER, delivery.status());
+
+    events.add(new HandlingEvent(cargo, new Date(30), new Date(31), HandlingEvent.Type.UNLOAD, HAMBURG, CM006));
+    delivery = new Delivery(events);
+    assertEquals(StatusCode.IN_PORT, delivery.status());
+
+    events.add(new HandlingEvent(cargo, new Date(40), new Date(41), HandlingEvent.Type.CLAIM, HAMBURG));
+    delivery = new Delivery(events);
+    assertEquals(StatusCode.CLAIMED, delivery.status());
+  }
+
+  public void testCurrentLocation() throws Exception {
+    Set<HandlingEvent> events = new HashSet<HandlingEvent>();
+    Delivery delivery = new Delivery(events);
+
+    assertEquals(Location.UNKNOWN, delivery.currentLocation());
+
+    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
+    delivery = new Delivery(events);
+
+    assertEquals(HAMBURG, delivery.currentLocation());
+
+    events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, CM003));
+    delivery = new Delivery(events);
+
+    assertEquals(Location.UNKNOWN, delivery.currentLocation());
+  }
+
+}