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/test/java/se/citerus/dddsample/domain/model/cargo/CargoTest.java

@@ -2,7 +2,9 @@ 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.carrier.Schedule;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 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.*;
@@ -13,7 +15,19 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class CargoTest extends TestCase {
+
   private Set<HandlingEvent> events;
+  private Voyage voyage;
+
+  protected void setUp() throws Exception {
+    events = new HashSet<HandlingEvent>();
+
+    voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(
+      new CarrierMovement(STOCKHOLM, HAMBURG, new Date(), new Date()),
+      new CarrierMovement(HAMBURG, HONGKONG, new Date(), new Date()),
+      new CarrierMovement(HONGKONG, MELBOURNE, new Date(), new Date())
+    )));
+  }
 
   public void testlastKnownLocationUnknownWhenNoEvents() throws Exception {
     Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
@@ -69,10 +83,6 @@ public class CargoTest extends TestCase {
     assertFalse("Cargos are not equal when TrackingID differ", c1.equals(c2));
   }
 
-  protected void setUp() throws Exception {
-    events = new HashSet<HandlingEvent>();
-  }
-
   public void testIsUnloadedAtFinalDestination() throws Exception {
     assertFalse(new Cargo().isUnloadedAtDestination());
 
@@ -82,27 +92,28 @@ public class CargoTest extends TestCase {
     // Adding an event unrelated to unloading at final destination
     events.add(
       new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU));
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     assertFalse(cargo.isUnloadedAtDestination());
 
-    CarrierMovement cm1 = new CarrierMovement(new CarrierMovementId("CM1"), HANGZOU, NEWYORK, new Date(), new Date());
+    CarrierMovement cm1 = new CarrierMovement(HANGZOU, NEWYORK, new Date(), new Date());
+    Voyage voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(cm1)));
 
     // Adding an unload event, but not at the final destination
     events.add(
-      new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, TOKYO, cm1));
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+      new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, TOKYO, voyage));
+    cargo.setDeliveryHistory(new Delivery(events));
     assertFalse(cargo.isUnloadedAtDestination());
 
     // Adding an event in the final destination, but not unload
     events.add(
       new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, NEWYORK));
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     assertFalse(cargo.isUnloadedAtDestination());
 
     // Finally, cargo is unloaded at final destination
     events.add(
-      new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, NEWYORK, cm1));
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+      new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, NEWYORK, voyage));
+    cargo.setDeliveryHistory(new Delivery(events));
     assertTrue(cargo.isUnloadedAtDestination());
   }
 
@@ -134,7 +145,7 @@ public class CargoTest extends TestCase {
 
     HandlingEvent he = new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, STOCKHOLM);
     events.add(he);
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
 
     return cargo;
   }
@@ -143,7 +154,7 @@ public class CargoTest extends TestCase {
     final Cargo cargo = populateCargoOffMelbourne();
 
     events.add(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, MELBOURNE));
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
 
     return cargo;
   }
@@ -151,86 +162,56 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoOffHongKong() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, stockholmToHamburg));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HAMBURG, HONGKONG, new Date(), new Date());
+    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
 
-    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, hamburgToHongKong));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, hamburgToHongKong));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
 
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     return cargo;
   }
 
   private Cargo populateCargoOnHamburg() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, stockholmToHamburg));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, stockholmToHamburg));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HAMBURG, HONGKONG, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, hamburgToHongKong));
-
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     return cargo;
   }
 
   private Cargo populateCargoOffMelbourne() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, stockholmToHamburg));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, stockholmToHamburg));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HAMBURG, HONGKONG, new Date(), new Date());
+    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
 
-    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, hamburgToHongKong));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, hamburgToHongKong));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, MELBOURNE, voyage));
 
-    final CarrierMovement hongKongToMelbourne = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HONGKONG, MELBOURNE, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, hongKongToMelbourne));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, MELBOURNE, hongKongToMelbourne));
-
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     return cargo;
   }
 
   private Cargo populateCargoOnHongKong() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, stockholmToHamburg));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, stockholmToHamburg));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HAMBURG, HONGKONG, new Date(), new Date());
+    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
 
-    events.add(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, hamburgToHongKong));
-    events.add(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, hamburgToHongKong));
+    events.add(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, voyage));
 
-    final CarrierMovement hongKongToMelbourne = new CarrierMovement(
-       new CarrierMovementId("CAR_001"), HONGKONG, MELBOURNE, new Date(), new Date());
-
-    events.add(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, hongKongToMelbourne));
-
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     return cargo;
   }
 
@@ -246,21 +227,23 @@ public class CargoTest extends TestCase {
 
     Collection<HandlingEvent> handlingEvents = new ArrayList<HandlingEvent>();
 
+    /*
     CarrierMovement abc = new CarrierMovement(new CarrierMovementId("ABC"), SHANGHAI, ROTTERDAM, new Date(), new Date());
     CarrierMovement def = new CarrierMovement(new CarrierMovementId("DEF"), ROTTERDAM, GOTHENBURG, new Date(), new Date());
     CarrierMovement ghi = new CarrierMovement(new CarrierMovementId("GHI"), ROTTERDAM, NEWYORK, new Date(), new Date());
-
+    */
+    
     //Happy path
     handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, def));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(90), new Date(100), HandlingEvent.Type.UNLOAD, GOTHENBURG, def));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(90), new Date(100), HandlingEvent.Type.UNLOAD, GOTHENBURG, voyage));
     handlingEvents.add(new HandlingEvent(cargo, new Date(110), new Date(120), HandlingEvent.Type.CLAIM, GOTHENBURG));
     handlingEvents.add(new HandlingEvent(cargo, new Date(130), new Date(140), HandlingEvent.Type.CUSTOMS, GOTHENBURG));
 
     events.addAll(handlingEvents);
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
     assertFalse(cargo.isMisdirected());
 
     //Try a couple of failing ones
@@ -270,9 +253,8 @@ public class CargoTest extends TestCase {
 
     handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU));
     events.addAll(handlingEvents);
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
 
-    cargo.updateState();
     assertTrue(cargo.isMisdirected());
 
 
@@ -280,14 +262,13 @@ public class CargoTest extends TestCase {
     handlingEvents = new ArrayList<HandlingEvent>();
 
     handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, ghi));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, voyage));
 
     events.addAll(handlingEvents);
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
 
-    cargo.updateState();
     assertTrue(cargo.isMisdirected());
 
 
@@ -295,27 +276,23 @@ public class CargoTest extends TestCase {
     handlingEvents = new ArrayList<HandlingEvent>();
 
     handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, abc));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
     handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, ROTTERDAM));
 
     events.addAll(handlingEvents);
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
 
-    cargo.updateState();
     assertTrue(cargo.isMisdirected());
   }
 
   private Cargo setUpCargoWithItinerary(Location origin, Location midpoint, Location destination) {
     Cargo cargo = new Cargo(new TrackingId("CARGO1"), origin, destination);
 
-    CarrierMovement cm = new CarrierMovement(
-      new CarrierMovementId("ABC"), origin, destination, new Date(), new Date());
-    
     Itinerary itinerary = new Itinerary(
       Arrays.asList(
-        new Leg(cm, origin, midpoint),
-        new Leg(cm, midpoint, destination)
+        new Leg(voyage, origin, midpoint, new Date(), new Date()),
+        new Leg(voyage, midpoint, destination, new Date(), new Date())
       )
     );
 

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

@@ -22,7 +22,7 @@ public class CargoTestHelper {
   }
 
   public static void setDeliveryHistory(Cargo cargo, Collection<HandlingEvent> events) {
-    cargo.setDeliveryHistory(new DeliveryHistory(events));
+    cargo.setDeliveryHistory(new Delivery(events));
   }
   
 }

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

@@ -2,7 +2,9 @@ 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.carrier.Schedule;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
@@ -12,10 +14,18 @@ import java.util.Date;
 import java.util.List;
 
 public class ItineraryTest extends TestCase {
-  private final CarrierMovement abc = new CarrierMovement(new CarrierMovementId("ABC"), SHANGHAI, ROTTERDAM, new Date(), new Date());
-  private final CarrierMovement def = new CarrierMovement(new CarrierMovementId("DEF"), ROTTERDAM, GOTHENBURG, new Date(), new Date());
-  private final CarrierMovement ghi = new CarrierMovement(new CarrierMovementId("GHI"), ROTTERDAM, NEWYORK, new Date(), new Date());
-  private final CarrierMovement jkl = new CarrierMovement(new CarrierMovementId("JKL"), SHANGHAI, HELSINKI, new Date(), new Date());
+  private final CarrierMovement abc = new CarrierMovement(SHANGHAI, ROTTERDAM, new Date(), new Date());
+  private final CarrierMovement def = new CarrierMovement(ROTTERDAM, GOTHENBURG, new Date(), new Date());
+  private final CarrierMovement ghi = new CarrierMovement(ROTTERDAM, NEWYORK, new Date(), new Date());
+  private final CarrierMovement jkl = new CarrierMovement(SHANGHAI, HELSINKI, new Date(), new Date());
+
+  Voyage voyage;
+
+  protected void setUp() throws Exception {
+    voyage = new Voyage(new VoyageNumber("0123"), new Schedule(Arrays.asList(
+      abc, def, ghi, jkl
+    )));
+  }
 
   public void testCargoOnTrack() throws Exception {
 
@@ -23,8 +33,8 @@ public class ItineraryTest extends TestCase {
 
     Itinerary itinerary = new Itinerary(
       Arrays.asList(
-        new Leg(new CarrierMovement(new CarrierMovementId("ABC"), SHANGHAI, ROTTERDAM, new Date(), new Date()), SHANGHAI, ROTTERDAM),
-        new Leg(new CarrierMovement(new CarrierMovementId("DEF"), ROTTERDAM, GOTHENBURG, new Date(), new Date()), ROTTERDAM, GOTHENBURG)
+        new Leg(voyage, SHANGHAI, ROTTERDAM, new Date(), new Date()),
+        new Leg(voyage, ROTTERDAM, GOTHENBURG, new Date(), new Date())
       )
     );
 
@@ -32,16 +42,16 @@ public class ItineraryTest extends TestCase {
     HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, SHANGHAI);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, SHANGHAI, abc);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, SHANGHAI, voyage);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, ROTTERDAM, abc);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, def);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, voyage);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, GOTHENBURG, def);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, GOTHENBURG, voyage);
     assertTrue(itinerary.isExpected(event));
 
     event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, GOTHENBURG);
@@ -56,11 +66,11 @@ public class ItineraryTest extends TestCase {
     assertFalse(itinerary.isExpected(event));
 
     //Loaded to onto the wrong ship, correct location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, ghi);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, voyage);
     assertFalse(itinerary.isExpected(event));
 
     //Unloaded from the wrong ship in the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, HELSINKI, jkl);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, HELSINKI, voyage);
     assertFalse(itinerary.isExpected(event));
 
     event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, ROTTERDAM);

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

@@ -6,7 +6,7 @@ public class LegTest extends TestCase {
 
   public void testConstructor() throws Exception {
     try {
-      new Leg(null,null,null);
+      new Leg(null,null,null,null,null);
       fail("Should not accept null constructor arguments");
     } catch (IllegalArgumentException expected) {}
   }

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

@@ -15,7 +15,6 @@ public class RouteSpecificationTest extends TestCase {
   }
 
   public void testIsSatisfiedBySuccess() {
-    // TODO
     RouteSpecification spec = RouteSpecification.forCargo(cargo, new Date());
     Itinerary itinerary = new Itinerary();
     assertTrue(spec.isSatisfiedBy(itinerary));

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementTest.java

@@ -9,40 +9,34 @@ import java.util.Date;
 public class CarrierMovementTest extends TestCase {
 
   public void testConstructor() throws Exception {
-    CarrierMovementId id = new CarrierMovementId("CAR001");
-
     try {
-      new CarrierMovement(null, null, null, new Date(), new Date());
+      new CarrierMovement(null, null, new Date(), new Date());
       fail("Should not accept null constructor arguments");
     } catch (IllegalArgumentException expected) {}
 
     try {
-      new CarrierMovement(id, null, null, new Date(), new Date());
+      new CarrierMovement(null, null, new Date(), new Date());
       fail("Should not accept null constructor arguments");
     } catch (IllegalArgumentException expected) {}
 
     try {
-      new CarrierMovement(id, STOCKHOLM, null, new Date(), new Date());
+      new CarrierMovement(STOCKHOLM, null, new Date(), new Date());
       fail("Should not accept null constructor arguments");
     } catch (IllegalArgumentException expected) {}
 
     // Legal
-    new CarrierMovement(id, STOCKHOLM, HAMBURG, new Date(), new Date());
+    new CarrierMovement(STOCKHOLM, HAMBURG, new Date(), new Date());
   }
 
   public void testSameValueAsEqualsHashCode() throws Exception {
-    CarrierMovementId id1 = new CarrierMovementId("CAR1");
-    CarrierMovementId id2a = new CarrierMovementId("CAR2");
-    CarrierMovementId id2b = new CarrierMovementId("CAR2");
-
-    CarrierMovement cm1 = new CarrierMovement(id1, STOCKHOLM, HAMBURG, new Date(), new Date());
-    CarrierMovement cm2 = new CarrierMovement(id1, STOCKHOLM, HAMBURG, new Date(), new Date());
-    CarrierMovement cm3 = new CarrierMovement(id2a, HAMBURG, STOCKHOLM, new Date(), new Date());
-    CarrierMovement cm4 = new CarrierMovement(id2b, HAMBURG, STOCKHOLM, new Date(), new Date());
-
-    assertTrue(cm1.sameIdentityAs(cm2));
-    assertFalse(cm2.sameIdentityAs(cm3));
-    assertTrue(cm3.sameIdentityAs(cm4));
+    CarrierMovement cm1 = new CarrierMovement(STOCKHOLM, HAMBURG, new Date(), new Date());
+    CarrierMovement cm2 = new CarrierMovement(STOCKHOLM, HAMBURG, new Date(), new Date());
+    CarrierMovement cm3 = new CarrierMovement(HAMBURG, STOCKHOLM, new Date(), new Date());
+    CarrierMovement cm4 = new CarrierMovement(HAMBURG, STOCKHOLM, new Date(), new Date());
+
+    assertTrue(cm1.sameValueAs(cm2));
+    assertFalse(cm2.sameValueAs(cm3));
+    assertTrue(cm3.sameValueAs(cm4));
     
     assertTrue(cm1.equals(cm2));
     assertFalse(cm2.equals(cm3));

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/SampleCarrierMovements.java

@@ -1,50 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-import se.citerus.dddsample.domain.model.location.Location;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-/**
- * Sample carrier movements, for test purposes.
- *
- */
-public class SampleCarrierMovements {
-
-  public static final CarrierMovement CM001 = createCarrierMovement("CM001", STOCKHOLM, HAMBURG);
-  public static final CarrierMovement CM002 = createCarrierMovement("CM002", HAMBURG, HONGKONG);
-  public static final CarrierMovement CM003 = createCarrierMovement("CM003", HONGKONG, NEWYORK);
-  public static final CarrierMovement CM004 = createCarrierMovement("CM004", NEWYORK, CHICAGO);
-  public static final CarrierMovement CM005 = createCarrierMovement("CM005", CHICAGO, HAMBURG);
-  public static final CarrierMovement CM006 = createCarrierMovement("CM006", HAMBURG, HANGZOU);
-
-  private static CarrierMovement createCarrierMovement(String id, Location from, Location to) {
-    return new CarrierMovement(
-      new CarrierMovementId(id), from, to,  new Date(), new Date());
-  }
-
-  public static final Map<CarrierMovementId, CarrierMovement> ALL = new HashMap();
-
-  static {
-    for (Field field : SampleCarrierMovements.class.getDeclaredFields()) {
-      if (field.getType().equals(CarrierMovement.class)) {
-        try {
-          CarrierMovement carrierMovement = (CarrierMovement) field.get(null);
-          ALL.put(carrierMovement.carrierMovementId(), carrierMovement);
-        } catch (IllegalAccessException e) {
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  public static List<CarrierMovement> getAll() {
-    return new ArrayList(ALL.values());
-  }
-
-  public static CarrierMovement lookup(CarrierMovementId carrierMovementId) {
-    return ALL.get(carrierMovementId);
-  }
-  
-}

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/SampleVoyages.java

@@ -0,0 +1,51 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import se.citerus.dddsample.domain.model.location.Location;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * Sample carrier movements, for test purposes.
+ *
+ */
+public class SampleVoyages {
+
+  public static final Voyage CM001 = createVoyage("CM001", STOCKHOLM, HAMBURG);
+  public static final Voyage CM002 = createVoyage("CM002", HAMBURG, HONGKONG);
+  public static final Voyage CM003 = createVoyage("CM003", HONGKONG, NEWYORK);
+  public static final Voyage CM004 = createVoyage("CM004", NEWYORK, CHICAGO);
+  public static final Voyage CM005 = createVoyage("CM005", CHICAGO, HAMBURG);
+  public static final Voyage CM006 = createVoyage("CM006", HAMBURG, HANGZOU);
+
+  private static Voyage createVoyage(String id, Location from, Location to) {
+    return new Voyage(new VoyageNumber(id), new Schedule(Arrays.asList(
+      new CarrierMovement(from, to, new Date(), new Date())
+    )));
+  }
+
+  public static final Map<VoyageNumber, Voyage> ALL = new HashMap();
+
+  static {
+    for (Field field : SampleVoyages.class.getDeclaredFields()) {
+      if (field.getType().equals(Voyage.class)) {
+        try {
+          Voyage voyage = (Voyage) field.get(null);
+          ALL.put(voyage.voyageNumber(), voyage);
+        } catch (IllegalAccessException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+  }
+
+  public static List<Voyage> getAll() {
+    return new ArrayList(ALL.values());
+  }
+
+  public static Voyage lookup(VoyageNumber voyageNumber) {
+    return ALL.get(voyageNumber);
+  }
+  
+}

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactoryTest.java

@@ -2,22 +2,22 @@ package se.citerus.dddsample.domain.model.handling;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.persistence.CarrierMovementRepositoryInMem;
 import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
+import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-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 static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.CM001;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.domain.service.UnknownCargoException;
 import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownTrackingIdException;
+import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
 import java.util.Date;
 
@@ -25,7 +25,7 @@ public class HandlingEventFactoryTest extends TestCase {
 
   HandlingEventFactory factory;
   CargoRepository cargoRepository;
-  CarrierMovementRepository carrierMovementRepository;
+  VoyageRepository voyageRepository;
   LocationRepository locationRepository;
   TrackingId trackingId;
   Cargo cargo;
@@ -33,9 +33,9 @@ public class HandlingEventFactoryTest extends TestCase {
   protected void setUp() throws Exception {
 
     cargoRepository = createMock(CargoRepository.class);
-    carrierMovementRepository = new CarrierMovementRepositoryInMem();
+    voyageRepository = new VoyageRepositoryInMem();
     locationRepository = new LocationRepositoryInMem();
-    factory = new HandlingEventFactory(cargoRepository, carrierMovementRepository, locationRepository);
+    factory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
 
 
 
@@ -48,15 +48,15 @@ public class HandlingEventFactoryTest extends TestCase {
 
     replay(cargoRepository);
 
-    CarrierMovementId carrierMovementId = CM001.carrierMovementId();
+    VoyageNumber voyageNumber = CM001.voyageNumber();
     UnLocode unLocode = STOCKHOLM.unLocode();
     HandlingEvent handlingEvent = factory.createHandlingEvent(
-      new Date(100), trackingId, carrierMovementId, unLocode, Type.LOAD
+      new Date(100), trackingId, voyageNumber, unLocode, Type.LOAD
     );
 
     assertNotNull(handlingEvent);
     assertEquals(STOCKHOLM, handlingEvent.location());
-    assertEquals(CM001, handlingEvent.carrierMovement());
+    assertEquals(CM001, handlingEvent.voyage());
     assertEquals(cargo, handlingEvent.cargo());
     assertEquals(new Date(100), handlingEvent.completionTime());
     assertTrue(handlingEvent.registrationTime().before(new Date(System.currentTimeMillis() + 1)));
@@ -74,7 +74,7 @@ public class HandlingEventFactoryTest extends TestCase {
 
     assertNotNull(handlingEvent);
     assertEquals(STOCKHOLM, handlingEvent.location());
-    assertEquals(CarrierMovement.NONE, handlingEvent.carrierMovement());
+    assertEquals(Voyage.NONE, handlingEvent.voyage());
     assertEquals(cargo, handlingEvent.cargo());
     assertEquals(new Date(100), handlingEvent.completionTime());
     assertTrue(handlingEvent.registrationTime().before(new Date(System.currentTimeMillis() + 1)));
@@ -88,7 +88,7 @@ public class HandlingEventFactoryTest extends TestCase {
     UnLocode invalid = new UnLocode("NOEXT");
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.carrierMovementId(), invalid, Type.LOAD
+        new Date(100), trackingId, CM001.voyageNumber(), invalid, Type.LOAD
       );
       fail("Expected UnknownLocationException");
     } catch (UnknownLocationException expected) {}
@@ -100,12 +100,12 @@ public class HandlingEventFactoryTest extends TestCase {
     replay(cargoRepository);
 
     try {
-      CarrierMovementId invalid = new CarrierMovementId("XXX");
+      VoyageNumber invalid = new VoyageNumber("XXX");
       factory.createHandlingEvent(
         new Date(100), trackingId, invalid, STOCKHOLM.unLocode(), Type.LOAD
       );
-      fail("Expected UnknownCarrierMovementIdException");
-    } catch (UnknownCarrierMovementIdException expected) {}
+      fail("Expected UnknownVoyageException");
+    } catch (UnknownVoyageException expected) {}
   }
 
   public void testCreateHandlingEventUnknownTrackingId() throws Exception {
@@ -115,10 +115,10 @@ public class HandlingEventFactoryTest extends TestCase {
 
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.carrierMovementId(), STOCKHOLM.unLocode(), Type.LOAD
+        new Date(100), trackingId, CM001.voyageNumber(), STOCKHOLM.unLocode(), Type.LOAD
       );
-      fail("Expected UnknownTrackingIdException");
-    } catch (UnknownTrackingIdException expected) {}
+      fail("Expected UnknownCargoException");
+    } catch (UnknownCargoException expected) {}
   }
 
   protected void tearDown() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventTest.java

@@ -3,9 +3,9 @@ package se.citerus.dddsample.domain.model.handling;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements;
-import static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.CM003;
-import static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.CM004;
+import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM003;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM004;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
@@ -89,8 +89,8 @@ public class HandlingEventTest extends TestCase {
     Date timeOccured = new Date();
     Date timeRegistered = new Date();
 
-    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleCarrierMovements.CM005);
-    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleCarrierMovements.CM005);
+    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005);
+    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005);
 
     // Two handling events are not equal() even if all non-uuid fields are identical
     assertTrue(ev1.equals(ev2));

dddsample/src/test/java/se/citerus/dddsample/domain/service/HandlingEventServiceTest.java

@@ -5,9 +5,9 @@ import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements;
+import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
@@ -22,7 +22,7 @@ public class HandlingEventServiceTest extends TestCase {
   private HandlingEventServiceImpl service;
   private DomainEventNotifier domainEventNotifier;
   private CargoRepository cargoRepository;
-  private CarrierMovementRepository carrierMovementRepository;
+  private VoyageRepository voyageRepository;
   private HandlingEventRepository handlingEventRepository;
   private LocationRepository locationRepository;
   private HandlingEventFactory handlingEventFactory;
@@ -33,16 +33,16 @@ public class HandlingEventServiceTest extends TestCase {
 
   protected void setUp() throws Exception{
     cargoRepository = createMock(CargoRepository.class);
-    carrierMovementRepository = createMock(CarrierMovementRepository.class);
+    voyageRepository = createMock(VoyageRepository.class);
     handlingEventRepository = createMock(HandlingEventRepository.class);
     locationRepository = createMock(LocationRepository.class);
     domainEventNotifier = createMock(DomainEventNotifier.class);
     service = new HandlingEventServiceImpl(handlingEventRepository, domainEventNotifier);
-    handlingEventFactory = new HandlingEventFactory(cargoRepository, carrierMovementRepository, locationRepository);
+    handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
   }
 
   protected void tearDown() throws Exception {
-    verify(cargoRepository, carrierMovementRepository, handlingEventRepository, domainEventNotifier);
+    verify(cargoRepository, voyageRepository, handlingEventRepository, domainEventNotifier);
   }
 
   public void testRegisterEvent() throws Exception {
@@ -51,8 +51,8 @@ public class HandlingEventServiceTest extends TestCase {
     final TrackingId trackingId = new TrackingId("ABC");
     expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
 
-    final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
-    expect(carrierMovementRepository.find(carrierMovementId)).andReturn(SampleCarrierMovements.CM001);
+    final VoyageNumber voyageNumber = new VoyageNumber("AAA_BBB");
+    expect(voyageRepository.find(voyageNumber)).andReturn(SampleVoyages.CM001);
 
     final UnLocode unLocode = new UnLocode("SESTO");
     expect(locationRepository.find(unLocode)).andReturn(STOCKHOLM);
@@ -61,9 +61,9 @@ public class HandlingEventServiceTest extends TestCase {
     handlingEventRepository.save(isA(HandlingEvent.class));
     domainEventNotifier.cargoWasHandled(isA(HandlingEvent.class));
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
 
-    final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, carrierMovementId, unLocode, HandlingEvent.Type.LOAD);
+    final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, voyageNumber, unLocode, HandlingEvent.Type.LOAD);
     service.register(event);
   }
 
@@ -78,7 +78,7 @@ public class HandlingEventServiceTest extends TestCase {
 
     expect(locationRepository.find(STOCKHOLM.unLocode())).andReturn(STOCKHOLM);
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
 
     final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, STOCKHOLM.unLocode(), HandlingEvent.Type.CLAIM);
     service.register(event);
@@ -88,21 +88,21 @@ public class HandlingEventServiceTest extends TestCase {
   public void testRegisterEventInvalidCarrier() throws Exception {
     final Date date = new Date();
 
-    final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
-    expect(carrierMovementRepository.find(carrierMovementId)).andReturn(null);
+    final VoyageNumber voyageNumber = new VoyageNumber("AAA_BBB");
+    expect(voyageRepository.find(voyageNumber)).andReturn(null);
 
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, CHICAGO, STOCKHOLM));
 
     expect(locationRepository.find(MELBOURNE.unLocode())).andReturn(MELBOURNE);
     
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
     
     try {
-      final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, carrierMovementId, MELBOURNE.unLocode(), HandlingEvent.Type.UNLOAD);
+      final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, voyageNumber, MELBOURNE.unLocode(), HandlingEvent.Type.UNLOAD);
       service.register(event);
       fail("Should not be able to register an event with non-existing carrier movement");
-    } catch (UnknownCarrierMovementIdException expected) {}
+    } catch (UnknownVoyageException expected) {}
   }
   
   public void testRegisterEventInvalidCargo() throws Exception {
@@ -113,13 +113,13 @@ public class HandlingEventServiceTest extends TestCase {
 
     expect(locationRepository.find(HONGKONG.unLocode())).andReturn(HONGKONG);
     
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
     
     try {
       final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.CLAIM);
       service.register(event);
       fail("Should not be able to register an event with non-existing cargo");
-    } catch (UnknownTrackingIdException expected) {}
+    } catch (UnknownCargoException expected) {}
   }
   
   public void testRegisterEventInvalidLocation() throws Exception {
@@ -130,7 +130,7 @@ public class HandlingEventServiceTest extends TestCase {
     UnLocode wayOff = new UnLocode("XXYYY");
     expect(locationRepository.find(wayOff)).andReturn(null);
     
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
     
     try {
       final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, wayOff, HandlingEvent.Type.CLAIM);

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java

@@ -5,9 +5,9 @@ import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
 import se.citerus.dddsample.application.routing.ExternalRoutingService;
 import se.citerus.dddsample.domain.model.cargo.*;
-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.SampleVoyages;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
@@ -23,15 +23,15 @@ import java.util.List;
 public class RoutingServiceTest extends TestCase {
 
   private ExternalRoutingService routingService;
-  private CarrierMovementRepository carrierMovementRepository;
+  private VoyageRepository voyageRepository;
 
   protected void setUp() throws Exception {
     routingService = new ExternalRoutingService();
     LocationRepository locationRepository = new LocationRepositoryInMem();
     routingService.setLocationRepository(locationRepository);
 
-    carrierMovementRepository = createMock(CarrierMovementRepository.class);
-    routingService.setCarrierMovementRepository(carrierMovementRepository);
+    voyageRepository = createMock(VoyageRepository.class);
+    routingService.setCarrierMovementRepository(voyageRepository);
 
     GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO(createMock(DataSource.class)) {
       public List<String> listLocations() {
@@ -49,10 +49,9 @@ public class RoutingServiceTest extends TestCase {
     Cargo cargo = new Cargo(trackingId, HONGKONG, HELSINKI);
     RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
 
-    expect(carrierMovementRepository.find(isA(CarrierMovementId.class))).
-      andStubReturn(new CarrierMovement(new CarrierMovementId("CM"), CHICAGO, HAMBURG, new Date(), new Date()));
+    expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.CM002);
     
-    replay(carrierMovementRepository);
+    replay(voyageRepository);
 
     List<Itinerary> candidates = routingService.fetchRoutesForSpecification(routeSpecification);
     assertNotNull(candidates);
@@ -63,19 +62,19 @@ public class RoutingServiceTest extends TestCase {
       assertFalse(legs.isEmpty());
 
       // Cargo origin and start of first leg should match
-      assertEquals(cargo.origin(), legs.get(0).from());
+      assertEquals(cargo.origin(), legs.get(0).loadLocation());
 
       // Cargo final destination and last leg stop should match
-      Location lastLegStop = legs.get(legs.size() - 1).to();
+      Location lastLegStop = legs.get(legs.size() - 1).unloadLocation();
       assertEquals(cargo.destination(), lastLegStop);
 
       for (int i = 0; i < legs.size() - 1; i++) {
         // Assert that all legs are conencted
-        assertEquals(legs.get(i).to(), legs.get(i + 1).from());
+        assertEquals(legs.get(i).unloadLocation(), legs.get(i + 1).loadLocation());
       }
     }
 
-    verify(carrierMovementRepository);
+    verify(voyageRepository);
   }
 
 }

dddsample/src/test/java/se/citerus/dddsample/domain/service/TrackingScenarioTest.java

@@ -3,10 +3,10 @@ package se.citerus.dddsample.domain.service;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
+import se.citerus.dddsample.domain.model.cargo.Delivery;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.CM001;
-import static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.CM002;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM002;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.UNLOAD;
@@ -25,12 +25,12 @@ public class TrackingScenarioTest extends TestCase {
 
     Cargo cargo = populateCargo();
 
-    DeliveryHistory deliveryHistory = cargo.deliveryHistory();
+    Delivery delivery = cargo.deliveryHistory();
 
-    List<HandlingEvent> handlingEvents = deliveryHistory.eventsOrderedByCompletionTime();
+    List<HandlingEvent> handlingEvents = delivery.history();
 
     assertEquals(4, handlingEvents.size());
-    final HandlingEvent event = deliveryHistory.lastEvent();
+    final HandlingEvent event = delivery.lastEvent();
 
     assertEquals(UNLOAD, event.type());
 

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

@@ -6,8 +6,7 @@ import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.CHICAGO;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
@@ -22,19 +21,22 @@ public class TrackingServiceTest extends TestCase {
 
   TrackingServiceImpl cargoService;
   CargoRepository cargoRepository;
+  DomainEventNotifier domainEventNotifier;
 
   protected void setUp() throws Exception {
     cargoRepository = createMock(CargoRepository.class);
-    cargoService = new TrackingServiceImpl(cargoRepository);
+    domainEventNotifier = createMock(DomainEventNotifier.class);
+    cargoService = new TrackingServiceImpl(domainEventNotifier, cargoRepository);
   }
 
   public void testTrackingScenario() {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, CHICAGO);
 
     HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, STOCKHOLM);
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), STOCKHOLM, CHICAGO, new Date(), new Date());
-    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, STOCKHOLM, carrierMovement);
-    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, CHICAGO, carrierMovement);
+
+    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, STOCKHOLM, SampleVoyages.CM001);
+    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, CHICAGO, SampleVoyages.CM002);
+
     // Add out of order to verify ordering in DTO
     List<HandlingEvent> eventList = Arrays.asList(loaded, unloaded, claimed);
 
@@ -50,7 +52,7 @@ public class TrackingServiceTest extends TestCase {
 
     assertEquals(cargo, trackedCargo);
 
-    List<HandlingEvent> events = trackedCargo.deliveryHistory().eventsOrderedByCompletionTime();
+    List<HandlingEvent> events = trackedCargo.deliveryHistory().history();
     assertEquals(3, events.size());
 
     // Claim happened first