Added realistic voyages and replaced some of the older ones.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/SampleVoyages.java

  */
 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(1), new Date(2))
-    )));
-  }
-
-  // TODO CM00[1-6] and createVoyage are deprecated. Remove and refactor tests.
-
-  public final static Voyage v100 = new Voyage.Builder(new VoyageNumber("V100"), HONGKONG).
+  public final static Voyage pacific1 = new Voyage.Builder(new VoyageNumber("PAC1"), HONGKONG).
     addMovement(TOKYO, toDate("2009-03-03"), toDate("2009-03-05")).
     addMovement(LONGBEACH, toDate("2009-03-06"), toDate("2009-03-09")).
+    addMovement(SEATTLE, toDate("2009-03-10"), toDate("2009-03-12")).
+    addMovement(HONGKONG, toDate("2009-03-15"), toDate("2009-03-19")).
+    build();
+
+  public final static Voyage pacific2 = new Voyage.Builder(new VoyageNumber("PAC2"), SHANGHAI).
+    addMovement(LONGBEACH, toDate("2009-03-06"), toDate("2009-03-08")).
+    addMovement(SEATTLE, toDate("2009-03-10"), toDate("2009-03-14")).
+    addMovement(HANGZOU, toDate("2009-03-14"), toDate("2009-03-16")).
+    addMovement(SHANGHAI, toDate("2009-03-17"), toDate("2009-03-19")).
     build();
-  public final static Voyage v200 = new Voyage.Builder(new VoyageNumber("V200"), SHANGHAI).
-    addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-08")).
-    addMovement(ROTTERDAM, toDate("2009-03-10"), toDate("2009-03-14")).
-    addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-16")).
+
+  public final static Voyage continental1 = new Voyage.Builder(new VoyageNumber("CNT1"), LONGBEACH).
+    addMovement(DALLAS, toDate("2009-03-06"), toDate("2009-03-08")).
+    addMovement(CHICAGO, toDate("2009-03-09"), toDate("2009-03-10")).
+    addMovement(NEWYORK, toDate("2009-03-11"), toDate("2009-03-14")).
     build();
-  public final static Voyage v250 = new Voyage.Builder(new VoyageNumber("V250"), LONGBEACH).
+
+  public final static Voyage continenal2 = new Voyage.Builder(new VoyageNumber("CNT2"), LONGBEACH).
     addMovement(DALLAS, toDate("2009-03-06"), toDate("2009-03-08")).
     addMovement(NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")).
     build();
+
+  public final static Voyage atlantic1 = new Voyage.Builder(new VoyageNumber("ATC1"), NEWYORK).
+      addMovement(ROTTERDAM, toDate("2009-03-15"), toDate("2009-03-18")).
+      addMovement(HAMBURG, toDate("2009-03-19"), toDate("2009-03-20")).
+      addMovement(HELSINKI, toDate("2009-03-21"), toDate("2009-03-22")).
+      addMovement(NEWYORK, toDate("2009-03-24"), toDate("2009-03-30")).
+      build();
+
+  public final static Voyage atlantic2 = new Voyage.Builder(new VoyageNumber("ATC2"), NEWYORK).
+      addMovement(ROTTERDAM, toDate("2009-03-17"), toDate("2009-03-20")).
+      addMovement(GOTHENBURG, toDate("2009-03-22"), toDate("2009-03-24")).
+      addMovement(STOCKHOLM, toDate("2009-03-25"), toDate("2009-03-26")).
+      addMovement(HELSINKI, toDate("2009-03-27"), toDate("2009-03-28")).
+      addMovement(NEWYORK, toDate("2009-03-31"), toDate("2009-04-04")).
+      build();
+
+
   public final static Voyage v300 = new Voyage.Builder(new VoyageNumber("V300"), TOKYO).
     addMovement(ROTTERDAM, toDate("2009-03-08"), toDate("2009-03-11")).
     addMovement(HAMBURG, toDate("2009-03-11"), toDate("2009-03-12")).
     addMovement(MELBOURNE, toDate("2009-03-14"), toDate("2009-03-18")).
     addMovement(TOKYO, toDate("2009-03-19"), toDate("2009-03-21")).
     build();
+
   public final static Voyage v400 = new Voyage.Builder(new VoyageNumber("V400"), HAMBURG).
     addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-15")).
     addMovement(HELSINKI, toDate("2009-03-15"), toDate("2009-03-16")).
       addMovement(NEWYORK, toDate("2008-10-14", "12:00"), toDate("2008-10-23", "23:10")).
       build();
 
-
   /**
    * Voyage number 0200T (by train)
    * <p/>
       addMovement(HONGKONG, toDate("2008-11-24", "07:00"), toDate("2008-11-28", "13:37")).
       build();
 
-  public static final Map<VoyageNumber, Voyage> ALL = new HashMap<VoyageNumber, Voyage>();
+  private static final Map<VoyageNumber, Voyage> ALL = new HashMap<VoyageNumber, Voyage>();
 
   static {
     for (Field field : SampleVoyages.class.getDeclaredFields()) {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/Voyage.java

 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.patterns.entity.EntitySupport;
+import sun.jvm.hotspot.runtime.PerfMemory;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/handling/HandlingEventServiceTest.java

 import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
+
+import se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 
 import java.util.Date;
 
   public void testRegisterEvent() throws Exception {
     expect(cargoRepository.find(cargo.trackingId())).andReturn(cargo);
-    expect(voyageRepository.find(CM001.voyageNumber())).andReturn(CM001);
+    expect(voyageRepository.find(SampleVoyages.pacific1.voyageNumber())).andReturn(SampleVoyages.pacific1);
     expect(locationRepository.find(STOCKHOLM.unLocode())).andReturn(STOCKHOLM);
     handlingEventRepository.store(isA(HandlingEvent.class));
     systemEvents.notifyOfHandlingEvent(isA(HandlingEvent.class));
 
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, systemEvents);
 
-    service.registerHandlingEvent(new Date(), cargo.trackingId(), CM001.voyageNumber(), STOCKHOLM.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE"));
+    service.registerHandlingEvent(new Date(), cargo.trackingId(), SampleVoyages.pacific1.voyageNumber(), STOCKHOLM.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE"));
   }
 
 }

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

 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 
     replay(cargoRepository);
 
-    VoyageNumber voyageNumber = CM001.voyageNumber();
+    VoyageNumber voyageNumber = SampleVoyages.pacific1.voyageNumber();
     UnLocode unLocode = STOCKHOLM.unLocode();
     HandlingEvent handlingEvent = factory.createHandlingEvent(
       new Date(100), trackingId, voyageNumber, unLocode, Type.LOAD, new OperatorCode("ABCDE")
 
     assertNotNull(handlingEvent);
     assertEquals(STOCKHOLM, handlingEvent.location());
-    assertEquals(CM001, handlingEvent.voyage());
+    assertEquals(SampleVoyages.pacific1, handlingEvent.voyage());
     assertEquals(cargo, handlingEvent.cargo());
     assertEquals(new Date(100), handlingEvent.completionTime());
     assertTrue(handlingEvent.registrationTime().before(new Date(System.currentTimeMillis() + 1)));
     UnLocode invalid = new UnLocode("NOEXT");
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.voyageNumber(), invalid, Type.LOAD, new OperatorCode("ABCDE")
+        new Date(100), trackingId, SampleVoyages.pacific1.voyageNumber(), invalid, Type.LOAD, new OperatorCode("ABCDE")
       );
       fail("Expected UnknownLocationException");
     } catch (UnknownLocationException expected) {
 
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.voyageNumber(), STOCKHOLM.unLocode(), Type.LOAD, new OperatorCode("ABCDE")
+        new Date(100), trackingId, SampleVoyages.pacific1.voyageNumber(), STOCKHOLM.unLocode(), Type.LOAD, new OperatorCode("ABCDE")
       );
       fail("Expected UnknownCargoException");
     } catch (UnknownCargoException expected) {

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

 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM003;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM004;
 
 import static java.util.Arrays.asList;
 import java.util.Date;
 
   public void testNewWithCarrierMovement() throws Exception {
 
-    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, HONGKONG, CM003, new OperatorCode("ABCDE"));
+    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, HONGKONG, SampleVoyages.continental1, new OperatorCode("ABCDE"));
     assertEquals(HONGKONG, e1.location());
 
-    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, NEWYORK, CM003, new OperatorCode("ABCDE"));
+    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, NEWYORK, SampleVoyages.continental1, new OperatorCode("ABCDE"));
     assertEquals(NEWYORK, e2.location());
 
     // These event types prohibit a carrier movement association
     for (HandlingEvent.Type type : asList(CLAIM, RECEIVE, CUSTOMS)) {
       try {
-        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, CM003, new OperatorCode("ABCDE"));
+        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, SampleVoyages.continental1, new OperatorCode("ABCDE"));
         fail("Handling event type " + type + " prohibits carrier movement");
       } catch (IllegalArgumentException expected) {
       }
 
   public void testCurrentLocationLoadEvent() throws Exception {
 
-    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), LOAD, CHICAGO, CM004, new OperatorCode("ABCDE"));
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), LOAD, CHICAGO, SampleVoyages.continenal2, new OperatorCode("ABCDE"));
 
     assertEquals(CHICAGO, ev.location());
   }
 
   public void testCurrentLocationUnloadEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, HAMBURG, CM004, new OperatorCode("ABCDE"));
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, HAMBURG, SampleVoyages.continenal2, new OperatorCode("ABCDE"));
 
     assertEquals(HAMBURG, ev.location());
   }
     Date timeOccured = new Date();
     Date timeRegistered = new Date();
 
-    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005, new OperatorCode("ABCDE"));
-    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005, new OperatorCode("ABCDE"));
+    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.atlantic1, new OperatorCode("ABCDE"));
+    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.atlantic1, new OperatorCode("ABCDE"));
 
     assertTrue(ev1.equals(ev2));
     assertTrue(ev2.equals(ev1));

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/scenario/CargoLifecycle.java

 
 
     // Loaded
-    cargo.handled(loadOnto(v100).in(HONGKONG));
+    cargo.handled(loadOnto(pacific1).in(HONGKONG));
 
-    assertThat(cargo.currentVoyage(), is(v100));
+    assertThat(cargo.currentVoyage(), is(pacific1));
     assertThat(cargo.lastKnownLocation(), is(HONGKONG));
     assertThat(cargo.transportStatus(), is(ONBOARD_CARRIER));
-    assertThat(cargo.nextExpectedActivity(), is(unloadOff(v100).in(LONGBEACH)));
+    assertThat(cargo.nextExpectedActivity(), is(unloadOff(pacific1).in(LONGBEACH)));
     assertFalse(cargo.isMisdirected());
 
 
 
 
     // Unloaded
-    cargo.handled(unloadOff(v100).in(LONGBEACH));
+    cargo.handled(unloadOff(pacific1).in(LONGBEACH));
 
     assertThat(cargo.currentVoyage(), is(NONE));
     assertThat(cargo.lastKnownLocation(), is(LONGBEACH));
     assertThat(cargo.transportStatus(), is(IN_PORT));
     assertFalse(cargo.isMisdirected());
-    assertThat(cargo.nextExpectedActivity(), is(loadOnto(v250).in(LONGBEACH)));
+    assertThat(cargo.nextExpectedActivity(), is(loadOnto(continental1).in(LONGBEACH)));
 
 
 
 
 
     // Unloaded in Rotterdam, wasn't supposed to happen
-    cargo.handled(unloadOff(v200).in(ROTTERDAM));
+    cargo.handled(unloadOff(pacific2).in(ROTTERDAM));
 
     // Misdirected
     assertTrue(cargo.isMisdirected());
   private static class ScenarioStubRoutingService implements RoutingService {
 
     private static final Itinerary itinerary1 = new Itinerary(asList(
-      new Leg(v100, HONGKONG, LONGBEACH, toDate("2009-03-03"), toDate("2009-03-09")),
-      new Leg(v250, LONGBEACH, NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")),
-      new Leg(v200, NEWYORK, STOCKHOLM, toDate("2009-03-07"), toDate("2009-03-11"))
+      new Leg(pacific1, HONGKONG, LONGBEACH, toDate("2009-03-03"), toDate("2009-03-09")),
+      new Leg(continental1, LONGBEACH, NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")),
+      new Leg(pacific2, NEWYORK, STOCKHOLM, toDate("2009-03-07"), toDate("2009-03-11"))
     ));
 
     private static final Itinerary itinerary2 = new Itinerary(asList(

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/scenario/CargoLifecycleScenarioTest.java

     loadInNewYork();
     checkDeliveryAfterLoadInNewYork();
 
-    unloadInStockholmOffOf(v200);
+    unloadInStockholmOffOf(pacific2);
     checkDeliveryAfterUnloadInStockholm();
 
     customsInStockholm();
   }
 
   private void unloadInLongBeach() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-06"), v100, LONGBEACH, UNLOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-06"), pacific1, LONGBEACH, UNLOAD);
   }
 
   private void checkDeliveryAfterUnloadInLongBeach() {
     assertThat(cargo.lastKnownLocation(), is(LONGBEACH));
     assertThat(cargo.transportStatus(), is(IN_PORT));
     assertFalse(cargo.isMisdirected());
-    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(LOAD, LONGBEACH, v250)));
+    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(LOAD, LONGBEACH, continental1)));
   }
 
   private void loadInLongBeach() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-07"), v250, LONGBEACH, LOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-07"), continental1, LONGBEACH, LOAD);
   }
 
   private void checkDeliveryAfterLoadInLongBeach() {
     Cargo cargo = cargoRepository.find(trackingId);
 
-    assertThat(cargo.currentVoyage(), is(v250));
+    assertThat(cargo.currentVoyage(), is(continental1));
     assertThat(cargo.lastKnownLocation(), is(LONGBEACH));
     assertThat(cargo.transportStatus(), is(ONBOARD_CARRIER));
     assertFalse(cargo.isMisdirected());
-    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, NEWYORK, v250)));
+    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, NEWYORK, continental1)));
   }
 
   private void unloadInNewYork() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-08"), v250, NEWYORK, UNLOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-08"), continental1, NEWYORK, UNLOAD);
   }
 
   private void checkDeliveryAfterUnloadInNewYork() {
     assertThat(cargo.currentVoyage(), is(NONE));
     assertThat(cargo.lastKnownLocation(), is(NEWYORK));
     assertThat(cargo.transportStatus(), is(IN_PORT));
-    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(LOAD, NEWYORK, v200)));
+    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(LOAD, NEWYORK, pacific2)));
     assertFalse(cargo.isMisdirected());
   }
 
   private void loadInNewYork() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-10"), v200, NEWYORK, LOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-10"), pacific2, NEWYORK, LOAD);
   }
 
   private void checkDeliveryAfterLoadInNewYork() {
     Cargo cargo = cargoRepository.find(trackingId);
 
-    assertThat(cargo.currentVoyage(), is(v200));
+    assertThat(cargo.currentVoyage(), is(pacific2));
     assertThat(cargo.lastKnownLocation(), is(NEWYORK));
     assertThat(cargo.transportStatus(), is(ONBOARD_CARRIER));
     assertFalse(cargo.isMisdirected());
-    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, STOCKHOLM, v200)));
+    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, STOCKHOLM, pacific2)));
   }
 
   @Test
   }
 
   public void loadInHongkong() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-03"), v100, HONGKONG, LOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-03"), pacific1, HONGKONG, LOAD);
   }
 
   private void checkDeliveryAfterLoadInHongKong() {
     // Check current state - should be ok
     Cargo cargo = cargoRepository.find(trackingId);
 
-    assertThat(cargo.currentVoyage(), is(v100));
+    assertThat(cargo.currentVoyage(), is(pacific1));
     assertThat(cargo.lastKnownLocation(), is(HONGKONG));
     assertThat(cargo.transportStatus(), is(ONBOARD_CARRIER));
-    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, LONGBEACH, v100)));
+    assertThat(cargo.nextExpectedActivity(), is(new HandlingActivity(UNLOAD, LONGBEACH, pacific1)));
     assertFalse(cargo.isMisdirected());
   }
 
   public void unloadInTokyo() throws CannotCreateHandlingEventException {
     // Cargo is now (incorrectly) unloaded in Tokyo
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-05"), v100, TOKYO, UNLOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-05"), pacific1, TOKYO, UNLOAD);
   }
 
   private void checkDeliveryAfterUnloadInTokyo() {
         // Hongkong - NYC - Chicago - Stockholm, initial routing
         return Arrays.asList(
           new Itinerary(Arrays.asList(
-            new Leg(v100, HONGKONG, LONGBEACH, toDate("2009-03-03"), toDate("2009-03-09")),
-            new Leg(v250, LONGBEACH, NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")),
-            new Leg(v200, NEWYORK, STOCKHOLM, toDate("2009-03-07"), toDate("2009-03-11"))
+            new Leg(pacific1, HONGKONG, LONGBEACH, toDate("2009-03-03"), toDate("2009-03-09")),
+            new Leg(continental1, LONGBEACH, NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")),
+            new Leg(pacific2, NEWYORK, STOCKHOLM, toDate("2009-03-07"), toDate("2009-03-11"))
           ))
         );
       } else {

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/CargoRepositoryTest.java

 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM004;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 
     Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
     Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(SampleVoyages.continenal2, legFrom, legTo, new Date(), new Date())));
 
     cargo.assignToRoute(newItinerary);
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingEventRepositoryTest.java

 package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
 
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
+
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
+
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.MELBOURNE;
+
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 
 import java.util.Date;
 import java.util.List;
   HandlingEventRepository handlingEventRepository;
   CargoRepository cargoRepository;
   LocationRepository locationRepository;
+  HandlingEventFactory handlingEventFactory;
+  VoyageRepository voyageRepository;
 
   public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
     this.locationRepository = locationRepository;
   }
 
+  public void setVoyageRepository(VoyageRepository voyageRepository) {
+    this.voyageRepository = voyageRepository;
+  }
+
   public void testSave() {
-    Location location = locationRepository.find(new UnLocode("SESTO"));
+    handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
+    UnLocode unLocode = new UnLocode("SESTO");
+    Location location = locationRepository.find(unLocode);
 
-    Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
+    TrackingId trackingId = new TrackingId("XYZ");
     Date completionTime = new Date(10);
-    Date registrationTime = new Date(20);
-    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
+    HandlingEvent event = handlingEventFactory.createHandlingEvent(completionTime, trackingId, null, unLocode, HandlingEvent.Type.CLAIM, null);
 
     handlingEventRepository.store(event);
 
     flush();
 
-    Map<String, Object> result = sjt.queryForMap("select * from HandlingEvent where id = ?", getLongId(event));
+    Map<String, Object> result = sjt.queryForMap("select * from HandlingEvent where sequenceNumber = ?", event.sequenceNumber());
     assertEquals(1L, result.get("CARGO_ID"));
     assertEquals(new Date(10), result.get("COMPLETIONTIME"));
-    assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
     assertEquals("CLAIM", result.get("TYPE"));
     // TODO: the rest of the columns
   }

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/routing/ExternalRoutingServiceTest.java

     RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-04-01"));
     Cargo cargo = new Cargo(trackingId, routeSpecification);
 
-    expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.CM002);
+    expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.pacific2);
 
     replay(voyageRepository);
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssemblerTest.java

 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
+
+import se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
   @Test
   public void toCargoRoutingDTO() throws Exception {
-    final Location origin = STOCKHOLM;
-    final Location destination = MELBOURNE;
+    final Location origin = HONGKONG;
+    final Location destination = LONGBEACH;
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(origin, destination, new Date()));
 
     final Itinerary itinerary = new Itinerary(
-      Arrays.asList(
-        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
-        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
-      )
+      Leg.deriveLeg(SampleVoyages.pacific1, HONGKONG, TOKYO),
+      Leg.deriveLeg(SampleVoyages.pacific1, TOKYO, LONGBEACH)
     );
 
     cargo.assignToRoute(itinerary);
     assertEquals(2, dto.getLegs().size());
 
     LegDTO legDTO = dto.getLegs().get(0);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("SESTO", legDTO.getFrom());
-    assertEquals("CNSHA", legDTO.getTo());
+    assertEquals("PAC1", legDTO.getVoyageNumber());
+    assertEquals("CNHKG", legDTO.getFrom());
+    assertEquals("JNTKO", legDTO.getTo());
 
     legDTO = dto.getLegs().get(1);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("NLRTM", legDTO.getFrom());
-    assertEquals("AUMEL", legDTO.getTo());
+    assertEquals("PAC1", legDTO.getVoyageNumber());
+    assertEquals("JNTKO", legDTO.getFrom());
+    assertEquals("USLBG", legDTO.getTo());
   }
 
   @Test
   public void toCargoDTONoItinerary() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HONGKONG, LONGBEACH, new Date()));
     final CargoRoutingDTO dto = DTOAssembler.toDTO(cargo);
 
     assertEquals("XYZ", dto.getTrackingId());
-    assertEquals("SESTO", dto.getOrigin());
-    assertEquals("AUMEL", dto.getFinalDestination());
+    assertEquals("CNHKG", dto.getOrigin());
+    assertEquals("USLBG", dto.getFinalDestination());
     assertTrue(dto.getLegs().isEmpty());
   }
 
   @Test
   public void toRouteCandidateDTO() throws Exception {
-    final Location origin = STOCKHOLM;
-    final Location destination = MELBOURNE;
-
     final Itinerary itinerary = new Itinerary(
-      Arrays.asList(
-        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
-        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
-      )
+      Leg.deriveLeg(SampleVoyages.pacific1, HONGKONG, TOKYO),
+      Leg.deriveLeg(SampleVoyages.pacific1, TOKYO, LONGBEACH)
     );
 
     final RouteCandidateDTO dto = DTOAssembler.toDTO(itinerary);
 
     assertEquals(2, dto.getLegs().size());
     LegDTO legDTO = dto.getLegs().get(0);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("SESTO", legDTO.getFrom());
-    assertEquals("CNSHA", legDTO.getTo());
+    assertEquals("PAC1", legDTO.getVoyageNumber());
+    assertEquals("CNHKG", legDTO.getFrom());
+    assertEquals("JNTKO", legDTO.getTo());
 
     legDTO = dto.getLegs().get(1);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("NLRTM", legDTO.getFrom());
-    assertEquals("AUMEL", legDTO.getTo());
+    assertEquals("PAC1", legDTO.getVoyageNumber());
+    assertEquals("JNTKO", legDTO.getFrom());
+    assertEquals("USLBG", legDTO.getTo());
   }
 
   @Test