Merged patch from Eric that has started exploration of the customs aspect (zones, handling etc) and made sample voyages and locations more realistic.

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java

@@ -3,6 +3,7 @@ package se.citerus.dddsample.domain.model.cargo;
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingHistory;
+import se.citerus.dddsample.domain.model.location.CustomsZone;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 import se.citerus.dddsample.domain.shared.Entity;
@@ -10,38 +11,37 @@ import se.citerus.dddsample.domain.shared.Entity;
 /**
  * A Cargo. This is the central class in the domain model,
  * and it is the root of the Cargo-Itinerary-Leg-Delivery-RouteSpecification aggregate.
- *
+ * <p/>
  * A cargo is identified by a unique tracking id, and it always has an origin
  * and a route specification. The life cycle of a cargo begins with the booking procedure,
  * when the tracking id is assigned. During a (short) period of time, between booking
  * and initial routing, the cargo has no itinerary.
- *
+ * <p/>
  * The booking clerk requests a list of possible routes, matching the route specification,
  * and assigns the cargo to one route. The route to which a cargo is assigned is described
  * by an itinerary.
- *
+ * <p/>
  * A cargo can be re-routed during transport, on demand of the customer, in which case
  * a new route is specified for the cargo and a new route is requested. The old itinerary,
  * being a value object, is discarded and a new one is attached.
- *
+ * <p/>
  * It may also happen that a cargo is accidentally misrouted, which should notify the proper
  * personnel and also trigger a re-routing procedure.
- *
+ * <p/>
  * When a cargo is handled, the status of the delivery changes. Everything about the delivery
  * of the cargo is contained in the Delivery value object, which is replaced whenever a cargo
  * is handled by an asynchronous event triggered by the registration of the handling event.
- *
+ * <p/>
  * The delivery can also be affected by routing changes, i.e. when a the route specification
  * changes, or the cargo is assigned to a new route. In that case, the delivery update is performed
  * synchronously within the cargo aggregate.
- *
+ * <p/>
  * The life cycle of a cargo ends when the cargo is claimed by the customer.
- *
+ * <p/>
  * The cargo aggregate, and the entre domain model, is built to solve the problem
  * of booking and tracking cargo. All important business rules for determining whether
  * or not a cargo is misdirected, what the current status of the cargo is (on board carrier,
  * in port etc), are captured in this aggregate.
- *
  */
 public class Cargo implements Entity<Cargo> {
 
@@ -64,7 +64,7 @@ public class Cargo implements Entity<Cargo> {
 
   /**
    * The tracking id is the identity of this entity, and is unique.
-   * 
+   *
    * @return Tracking id.
    */
   public TrackingId trackingId() {
@@ -91,7 +91,7 @@ public class Cargo implements Entity<Cargo> {
   public RouteSpecification routeSpecification() {
     return routeSpecification;
   }
-  
+
   /**
    * Specifies a new route for this cargo.
    *
@@ -118,6 +118,15 @@ public class Cargo implements Entity<Cargo> {
     this.delivery = delivery.updateOnRouting(this.routeSpecification, this.itinerary);
   }
 
+  public CustomsZone customsZone() {
+    return routeSpecification.destination().customsZone();
+  }
+
+  public Location customsClearancePoint() {
+    return customsZone().entryPoint(itinerary.locations());
+  }
+
+
   /**
    * Updates all aspects of the cargo aggregate status
    * based on the current route specification, itinerary and handling of the cargo.
@@ -136,7 +145,7 @@ public class Cargo implements Entity<Cargo> {
   public void deriveDeliveryProgress(final HandlingHistory handlingHistory) {
     Validate.isTrue(this.sameIdentityAs(handlingHistory.cargo()),
       "Handling history must refer to this cargo, " + this + ". " +
-      "Given handlig history refers to cargo " + handlingHistory.cargo());
+        "Given handlig history refers to cargo " + handlingHistory.cargo());
 
     // Delivery is a value object, so we can simply discard the old one
     // and replace it with a new

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

@@ -17,8 +17,7 @@ import java.util.Iterator;
 
 /**
  * The actual transportation of the cargo, as opposed to
- * the customer requirement (RouteSpecification) and the plan (Itinerary). 
- *
+ * the customer requirement (RouteSpecification) and the plan (Itinerary).
  */
 public class Delivery implements ValueObject<Delivery> {
 
@@ -31,7 +30,7 @@ public class Delivery implements ValueObject<Delivery> {
   private boolean isUnloadedAtDestination;
   private RoutingStatus routingStatus;
   private Date calculatedAt;
-  private HandlingEvent lastEvent;
+  private HandlingEvent lastEvent; //TODO This field would be better named lastPhysicalHandling
 
   private static final Date ETA_UNKOWN = null;
   private static final HandlingActivity NO_ACTIVITY = null;
@@ -42,7 +41,7 @@ public class Delivery implements ValueObject<Delivery> {
    * but no additional handling of the cargo has been performed.
    *
    * @param routeSpecification route specification
-   * @param itinerary itinerary
+   * @param itinerary          itinerary
    * @return An up to date delivery
    */
   Delivery updateOnRouting(RouteSpecification routeSpecification, Itinerary itinerary) {
@@ -59,29 +58,27 @@ public class Delivery implements ValueObject<Delivery> {
    * as well as its route specification and itinerary.
    *
    * @param routeSpecification route specification
-   * @param itinerary itinerary
-   * @param handlingHistory delivery history
+   * @param itinerary          itinerary
+   * @param handlingHistory    delivery history
    * @return An up to date delivery.
    */
   static Delivery derivedFrom(RouteSpecification routeSpecification, Itinerary itinerary, HandlingHistory handlingHistory) {
     Validate.notNull(routeSpecification, "Route specification is required");
     Validate.notNull(handlingHistory, "Delivery history is required");
 
-    final HandlingEvent lastEvent = handlingHistory.mostRecentlyCompletedEvent();
-
-    return new Delivery(lastEvent, itinerary, routeSpecification);
+    return new Delivery(handlingHistory.mostRecentPhysicalHandling(), itinerary, routeSpecification);
   }
 
   /**
    * Internal constructor.
    *
-   * @param lastEvent last event
-   * @param itinerary itinerary
-   * @param routeSpecification route specification
+   * @param lastPhysicalHandling last event
+   * @param itinerary            itinerary
+   * @param routeSpecification   route specification
    */
-  private Delivery(HandlingEvent lastEvent, Itinerary itinerary, RouteSpecification routeSpecification) {
+  private Delivery(HandlingEvent lastPhysicalHandling, Itinerary itinerary, RouteSpecification routeSpecification) {
     this.calculatedAt = new Date();
-    this.lastEvent = lastEvent;
+    this.lastEvent = lastPhysicalHandling;
 
     this.misdirected = calculateMisdirectionStatus(itinerary);
     this.routingStatus = calculateRoutingStatus(itinerary, routeSpecification);
@@ -184,7 +181,6 @@ public class Delivery implements ValueObject<Delivery> {
         return ONBOARD_CARRIER;
       case UNLOAD:
       case RECEIVE:
-      case CUSTOMS:
         return IN_PORT;
       case CLAIM:
         return CLAIMED;

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -6,14 +6,10 @@ import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * An itinerary.
- *
  */
 public class Itinerary implements ValueObject<Itinerary> {
 
@@ -38,6 +34,10 @@ public class Itinerary implements ValueObject<Itinerary> {
     this.legs = legs;
   }
 
+  public Itinerary(Leg... legs) {
+    this(Arrays.asList(legs));
+  }
+
   /**
    * @return the legs of this itinerary, as an <b>immutable</b> list.
    */
@@ -52,31 +52,29 @@ public class Itinerary implements ValueObject<Itinerary> {
    * @return <code>true</code> if the event is expected
    */
   public boolean isExpected(final HandlingEvent event) {
-    if (legs.isEmpty()) {
+    if (isEmpty()) {
       return false;
     }
 
     if (event.type() == HandlingEvent.Type.RECEIVE) {
-      //Check that the first leg's origin is the event's location
-      final Leg leg = legs.get(0);
-      return (leg.loadLocation().equals(event.location()));
+      return (firstLeg().loadLocation().equals(event.location()));
     }
 
     if (event.type() == HandlingEvent.Type.LOAD) {
-      //Check that the there is one leg with same load location and voyage
+      //Check that the there is a leg with same load location and voyage
       for (Leg leg : legs) {
         if (leg.loadLocation().sameIdentityAs(event.location()) &&
-            leg.voyage().sameIdentityAs(event.voyage()))
+          leg.voyage().sameIdentityAs(event.voyage()))
           return true;
       }
       return false;
     }
 
     if (event.type() == HandlingEvent.Type.UNLOAD) {
-      //Check that the there is one leg with same unload location and voyage
+      //Check that the there is a leg with same unload location and voyage
       for (Leg leg : legs) {
-        if (leg.unloadLocation().equals(event.location()) &&
-            leg.voyage().equals(event.voyage()))
+        if (leg.unloadLocation().sameIdentityAs(event.location()) &&
+          leg.voyage().sameIdentityAs(event.voyage()))
           return true;
       }
       return false;
@@ -88,19 +86,23 @@ public class Itinerary implements ValueObject<Itinerary> {
       return (leg.unloadLocation().equals(event.location()));
     }
 
-    //HandlingEvent.Type.CUSTOMS;
-    return true;
+    if (event.type() == HandlingEvent.Type.CUSTOMS) {
+      //Check that the customs location fits the rule of the customs zone
+      //TODO Answering this properly requires Cargo's destination. Can't be answered at itinerary level.
+    }
+    return false;
+
   }
 
   /**
    * @return The initial departure location.
    */
   Location initialDepartureLocation() {
-     if (legs.isEmpty()) {
-       return Location.UNKNOWN;
-     } else {
-       return legs.get(0).loadLocation();
-     }
+    if (legs.isEmpty()) {
+      return Location.UNKNOWN;
+    } else {
+      return legs.get(0).loadLocation();
+    }
   }
 
   /**
@@ -118,35 +120,28 @@ public class Itinerary implements ValueObject<Itinerary> {
    * @return Date when cargo arrives at final destination.
    */
   Date finalArrivalDate() {
-    final Leg lastLeg = lastLeg();
+    if (isEmpty()) return new Date(END_OF_DAYS.getTime());
+    return new Date(lastLeg().unloadTime().getTime());
+  }
 
-    if (lastLeg == null) {
-      return new Date(END_OF_DAYS.getTime());
-    } else {
-      return new Date(lastLeg.unloadTime().getTime());
-    }
+  private boolean isEmpty() {
+    return legs.isEmpty();
   }
 
   /**
-   * @return The last leg on the itinerary.
+   * @return The first leg on the itinerary.
    */
-  Leg lastLeg() {
-    if (legs.isEmpty()) {
-      return null;
-    } else {
-      return legs.get(legs.size() - 1);
-    }
+  Leg firstLeg() {
+    if (isEmpty()) return null;
+    return legs.get(0);
   }
 
   /**
-   * @return The first leg on the itinerary.
+   * @return The last leg on the itinerary.
    */
-  Leg firstLeg() {
-    if (legs.isEmpty()) {
-      return null;
-    } else {
-      return legs.get(0);
-    }
+  Leg lastLeg() {
+    if (isEmpty()) return null;
+    return legs.get(legs.size() - 1);
   }
 
   /**
@@ -167,6 +162,15 @@ public class Itinerary implements ValueObject<Itinerary> {
     return new Itinerary(newLegsList);
   }
 
+  public List<Location> locations() {
+    List<Location> result = new ArrayList<Location>();
+    result.add(firstLeg().loadLocation());
+    for (Leg leg : legs) {
+      result.add(leg.unloadLocation());
+    }
+    return result;
+  }
+
   /**
    * @param other itinerary to compare
    * @return <code>true</code> if the legs in this and the other itinerary are all equal.

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.voyage.CarrierMovement;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
@@ -21,9 +20,10 @@ public class Leg implements ValueObject<Leg> {
   private Date loadTime;
   private Date unloadTime;
 
+  // TODO remove this ctor
   public Leg(Voyage voyage, Location loadLocation, Location unloadLocation, Date loadTime, Date unloadTime) {
-    Validate.noNullElements(new Object[] {voyage, loadLocation, unloadLocation, loadTime, unloadTime});
-    
+    Validate.noNullElements(new Object[]{voyage, loadLocation, unloadLocation, loadTime, unloadTime});
+
     this.voyage = voyage;
     this.loadLocation = loadLocation;
     this.unloadLocation = unloadLocation;
@@ -31,30 +31,27 @@ public class Leg implements ValueObject<Leg> {
     this.unloadTime = unloadTime;
   }
 
-  public Leg(final Voyage voyage, final Location loadLocation, final Location unloadLocation) {
+  /**
+   * This simple factory takes the Leg's times from the state of the
+   * Voyage as of the time of construction.
+   * A fuller version might also factor operational time
+   * in the port. For example, average unload time of the
+   * unloadLocation could be added to the eta of the vessel
+   * schedule, providing an estimated unload time.
+   * In a real system, the estimation of the unload time
+   * might be more complex.
+   *
+   * @param voyage         voyage
+   * @param loadLocation   load location
+   * @param unloadLocation unload location
+   * @return A leg on this voyage between the given locations.
+   */
+  public static Leg deriveLeg(Voyage voyage, Location loadLocation, Location unloadLocation) {
     Validate.notNull(voyage, "Voyage is required");
     Validate.notNull(loadLocation, "Load location is required");
     Validate.notNull(unloadLocation, "Unload location is required");
     Validate.isTrue(!loadLocation.sameIdentityAs(unloadLocation));
-
-    CarrierMovement loadCm = null, unloadCm = null;
-    for (CarrierMovement carrierMovement : voyage.schedule().carrierMovements()) {
-      if (unloadCm == null && carrierMovement.departureLocation().sameIdentityAs(loadLocation)) {
-        loadCm = carrierMovement;
-      }
-      if (loadCm != null && carrierMovement.arrivalLocation().sameIdentityAs(unloadLocation)) {
-        unloadCm = carrierMovement;
-      }
-    }
-
-    Validate.notNull(loadCm, "Load location is not valid for this voyage");
-    Validate.notNull(unloadCm, "Unload location is not valid for this voyage");
-
-    this.voyage = voyage;
-    this.loadLocation = loadCm.departureLocation();
-    this.loadTime = loadCm.departureTime();
-    this.unloadLocation = unloadCm.arrivalLocation();
-    this.unloadTime = unloadCm.arrivalTime();
+    return new Leg(voyage, loadLocation, unloadLocation, voyage.schedule().departureTimeAt(loadLocation), voyage.schedule().arrivalTimeAt(unloadLocation));
   }
 
   public Voyage voyage() {
@@ -82,7 +79,7 @@ public class Leg implements ValueObject<Leg> {
    * @return A new leg with the same load and unload locations, but with updated load/unload times.
    */
   Leg withRescheduledVoyage(final Voyage voyage) {
-    return new Leg(voyage, loadLocation, unloadLocation);
+    return Leg.deriveLeg(voyage, loadLocation, unloadLocation);
   }
 
   @Override
@@ -120,7 +117,7 @@ public class Leg implements ValueObject<Leg> {
   @Override
   public String toString() {
     return "Load in " + loadLocation + " at " + loadTime +
-           ", unload in " + unloadLocation + " at " + unloadTime;
+      ", unload in " + unloadLocation + " at " + unloadTime;
   }
 
   Leg() {

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingHistory.java

@@ -9,7 +9,6 @@ import static java.util.Collections.sort;
 
 /**
  * The handling history of a cargo.
- *
  */
 public class HandlingHistory implements ValueObject<HandlingHistory> {
 
@@ -46,7 +45,7 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
       final Cargo nextCargo = it.next().cargo();
       Validate.isTrue(firstCargo.sameIdentityAs(nextCargo),
         "A handling history can only contain handling events for a unique cargo. " +
-        "First event is for cargo " + firstCargo + ", also discovered cargo " + nextCargo
+          "First event is for cargo " + firstCargo + ", also discovered cargo " + nextCargo
       );
     }
 
@@ -65,6 +64,20 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
   }
 
   /**
+   * @return Filter a list of handling events, returning only the LOAD and UNLOAD events.
+   */
+  public List<HandlingEvent> physicalHandlingEvents(List<HandlingEvent> unfilteredEvents) {
+    final List<HandlingEvent> filtered = new ArrayList<HandlingEvent>();
+    for (HandlingEvent event : unfilteredEvents) {
+      if (event.type().equals(HandlingEvent.Type.RECEIVE)) filtered.add(event);
+      if (event.type().equals(HandlingEvent.Type.LOAD)) filtered.add(event);
+      if (event.type().equals(HandlingEvent.Type.UNLOAD)) filtered.add(event);
+      if (event.type().equals(HandlingEvent.Type.CLAIM)) filtered.add(event);
+    }
+    return Collections.unmodifiableList(filtered);
+  }
+
+  /**
    * @return Most recently completed event, or null if the handling history is empty.
    */
   public HandlingEvent mostRecentlyCompletedEvent() {
@@ -77,6 +90,18 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
   }
 
   /**
+   * @return Most recently completed load or unload, or null if there have been none.
+   */
+  public HandlingEvent mostRecentPhysicalHandling() {
+    final List<HandlingEvent> loadsAndUnloads = physicalHandlingEvents(distinctEventsByCompletionTime());
+    if (loadsAndUnloads.isEmpty()) {
+      return null;
+    } else {
+      return loadsAndUnloads.get(loadsAndUnloads.size() - 1);
+    }
+  }
+
+  /**
    * @return The cargo to which this handling history refers.
    */
   public Cargo cargo() {

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/CustomsZone.java

@@ -0,0 +1,124 @@
+package se.citerus.dddsample.domain.model.location;
+
+import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.shared.Entity;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * A geographical zone within which there are no customs restrictions or checks.
+ */
+public class CustomsZone implements Entity<CustomsZone> {
+
+  private String code;
+  private String name;
+
+  // TODO: Find out what the standards are for this, if any. For now:
+  // For CustomsZone code, we are using the "country code" portion of the UnLocode,
+  // except within economic areas that are not countries, such as the EU. Then we make one up.
+  // Country code is exactly two letters, so we'll use 2 letters.
+  private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z]{2}");
+
+  /**
+   * Constructor.
+   *
+   * @param code code
+   * @param name name
+   */
+  public CustomsZone(final String code, final String name) {
+    Validate.notNull(code, "Code is required");
+    Validate.isTrue(VALID_PATTERN.matcher(code).matches(),
+      code + " is not a valid CustomsZone code (does not match pattern)");
+    Validate.notNull(name, "Name is required");
+    this.code = code.toUpperCase();
+    this.name = name;
+  }
+
+  /**
+   * Where would a Cargo enter this CustomsZone if it were
+   * following this route. Note that specific voyages, etc do not
+   * matter, only the sequence of Locations.
+   *
+   * @param route
+   * @return
+   */
+  public Location entryPoint(List<Location> route) {
+    for (Location location : route) {
+      if (this.includes(location)) return location;
+    }
+    return null; //The route does not enter this CustomsZone
+  }
+
+  /**
+   * Convenience method for testing. Usage in application would be
+   * entryPoint(List<Location) route)
+   *
+   * @param route
+   * @return
+   */
+  public Location entryPoint(Location... route) {
+    return entryPoint(Arrays.asList(route));
+  }
+
+  /**
+   * If the rules of the CustomsZone were different or more complex,
+   * this is where that rule would be expressed. For the example, we'll
+   * just use the basic rule -- customs clearance is at the entry point.
+   *
+   * @param route
+   * @return
+   */
+//   public Location clearancePoint(List<Location> route) {
+//     return entryPoint(route);
+//   }
+
+  /**
+   * Convenience method for testing. Usage in application would be
+   * clearancePoint(List<Location) route)
+   *
+   * @param route
+   * @return
+   */
+//   @SuppressWarnings("unchecked")
+//   public Location clearancePoint(Location ... route) {
+//     return clearancePoint(Arrays.asList(route));
+//   }
+//
+
+
+  /**
+   * @return Code, always upper case.
+   */
+  public String code() {
+    return code;
+  }
+
+  /**
+   * @return The name.
+   */
+  public String name() {
+    return name;
+  }
+
+  @Override
+  public String toString() {
+    return code + "[" + name + "]";
+  }
+
+  @Override
+  public boolean sameIdentityAs(CustomsZone other) {
+    return code.equals(other.code);
+  }
+
+  CustomsZone() {
+    // Needed by Hibernate
+  }
+
+  public boolean includes(Location location) {
+    return this.sameIdentityAs(location.customsZone());
+  }
+
+
+}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/Location.java

@@ -1,46 +1,49 @@
 package se.citerus.dddsample.domain.model.location;
 
-import java.util.TimeZone;
-
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.domain.shared.Entity;
 
+import java.util.TimeZone;
+
 /**
  * A location is our model is stops on a journey, such as cargo
  * origin or destination, or carrier movement endpoints.
- *
+ * <p/>
  * It is uniquely identified by a UN Locode.
- *
  */
 public final class Location implements Entity<Location> {
 
   private UnLocode unLocode;
   private String name;
   private TimeZone timeZone;
+  private CustomsZone customsZone;
 
   /**
    * Special Location object that marks an unknown location.
    */
   public static final Location UNKNOWN = new Location(
-    new UnLocode("XXXXX"), "Unknown location", TimeZone.getTimeZone("Zulu")
+    new UnLocode("XXXXX"), "Unknown location", TimeZone.getTimeZone("Zulu"), null
   );
 
   /**
    * Package-level constructor, visible for test only.
    *
-   * @param unLocode UN Locode
- * @param name     location name
- * @param timeZone TODO
+   * @param unLocode    UN Locode
+   * @param name        location name
+   * @param timeZone
+   * @param customsZone
    * @throws IllegalArgumentException if the UN Locode or name is null
    */
-  Location(final UnLocode unLocode, final String name, TimeZone timeZone) {
-	Validate.notNull(unLocode);
+  Location(final UnLocode unLocode, final String name, final TimeZone timeZone, final CustomsZone customsZone) {
+    Validate.notNull(unLocode);
     Validate.notNull(name);
     Validate.notNull(timeZone);
-    
+//    Validate.notNull(customsZone);
+
     this.unLocode = unLocode;
     this.name = name;
     this.timeZone = timeZone;
+    this.customsZone = customsZone;
   }
 
   /**
@@ -58,8 +61,15 @@ public final class Location implements Entity<Location> {
   }
 
   /**
+   * @return Customs zone of this location.
+   */
+  public CustomsZone customsZone() {
+    return customsZone;
+  }
+
+  /**
    * @param object to compare
-   * @return Since this is an entiy this will be true iff UN locodes are equal.
+   * @return Since this is an entity this will be true iff UN locodes are equal.
    */
   @Override
   public boolean equals(final Object object) {
@@ -100,8 +110,8 @@ public final class Location implements Entity<Location> {
 
   private Long id;
 
-public TimeZone timeZone() {
-	return timeZone;
-}
+  public TimeZone timeZone() {
+    return timeZone;
+  }
 
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/SampleLocations.java

@@ -5,31 +5,38 @@ import java.util.*;
 
 /**
  * Sample locations, for test purposes.
- * 
  */
 public class SampleLocations {
-  private static final TimeZone CHINA =  TimeZone.getTimeZone("Asia/Shanghai");
-  private static final TimeZone CENTRAL_EUROPE =  TimeZone.getTimeZone("Europe/Stockholm");
-  private static final TimeZone JAPAN =  TimeZone.getTimeZone("Asia/Tokyo");
-  private static final TimeZone EASTERN =  TimeZone.getTimeZone("America/New_York");
-  private static final TimeZone PACIFIC =  TimeZone.getTimeZone("America/Los Angeles");
-  private static final TimeZone CENTRAL =  TimeZone.getTimeZone("America/Chicago");
-  private static final TimeZone EASTERN_AUSTRALIA =  TimeZone.getTimeZone("Australia/Melbourne");
-
-  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong",  CHINA);
-  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne", EASTERN_AUSTRALIA);
-  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm",  CENTRAL_EUROPE);
-  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki",  CENTRAL_EUROPE);
-  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago", CENTRAL);
-  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo", JAPAN);
-  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg", CENTRAL_EUROPE);
-  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai", CHINA);
-  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam", CENTRAL_EUROPE);
-  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg", CENTRAL_EUROPE);
-  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou", CHINA);
-  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York", EASTERN);
-  public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas", CENTRAL);
-  public static final Location LONG_BEACH = new Location(new UnLocode("USLBC"), "Long Beach", PACIFIC);
+  private static final TimeZone CHINA = TimeZone.getTimeZone("Asia/Shanghai");
+  private static final TimeZone CENTRAL_EUROPE = TimeZone.getTimeZone("Europe/Stockholm");
+  private static final TimeZone JAPAN = TimeZone.getTimeZone("Asia/Tokyo");
+  private static final TimeZone EASTERN = TimeZone.getTimeZone("America/New_York");
+  private static final TimeZone CENTRAL = TimeZone.getTimeZone("America/Chicago");
+  private static final TimeZone PACIFIC = TimeZone.getTimeZone("America/Los_Angeles");
+  private static final TimeZone EASTERN_AUSTRALIA = TimeZone.getTimeZone("Australia/Melbourne");
+
+  public static final CustomsZone US = new CustomsZone("US", "United States");
+  public static final CustomsZone EU = new CustomsZone("EU", "European Union");
+  public static final CustomsZone CN = new CustomsZone("CN", "United States");
+  public static final CustomsZone AU = new CustomsZone("AU", "Australia");
+  public static final CustomsZone JN = new CustomsZone("JN", "Japan");
+
+  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong", CHINA, CN);
+  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne", EASTERN_AUSTRALIA, AU);
+  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm", CENTRAL_EUROPE, EU);
+  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki", CENTRAL_EUROPE, EU);
+  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago", CENTRAL, US);
+  public static final Location LONGBEACH = new Location(new UnLocode("USLBG"), "Long Beach", PACIFIC, US);
+  public static final Location OAKLAND = new Location(new UnLocode("USOAK"), "Oakland", PACIFIC, US);
+  public static final Location SEATTLE = new Location(new UnLocode("USSEA"), "Seattle", PACIFIC, US);
+  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo", JAPAN, JN);
+  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg", CENTRAL_EUROPE, EU);
+  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai", CHINA, CN);
+  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam", CENTRAL_EUROPE, EU);
+  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg", CENTRAL_EUROPE, EU);
+  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou", CHINA, CN);
+  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York", EASTERN, US);
+  public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas", CENTRAL, US);
 
   public static final Map<UnLocode, Location> ALL = new HashMap<UnLocode, Location>();
 

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

@@ -9,7 +9,6 @@ import java.util.*;
 
 /**
  * Sample carrier movements, for test purposes.
- *
  */
 public class SampleVoyages {
 
@@ -19,6 +18,7 @@ public class SampleVoyages {
   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())
@@ -29,32 +29,32 @@ public class SampleVoyages {
 
   public final static Voyage v100 = new Voyage.Builder(new VoyageNumber("V100"), HONGKONG).
     addMovement(TOKYO, toDate("2009-03-03"), toDate("2009-03-05")).
-    addMovement(LONG_BEACH, toDate("2009-03-06"), toDate("2009-03-09")).
+    addMovement(LONGBEACH, toDate("2009-03-06"), toDate("2009-03-09")).
     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")).
-      build();
-  public final static Voyage v250 = new Voyage.Builder(new VoyageNumber("V250"), LONG_BEACH).
-      addMovement(DALLAS, toDate("2009-03-06"), toDate("2009-03-08")).
-      addMovement(NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")).
-      build();
+    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")).
+    build();
+  public final static Voyage v250 = new Voyage.Builder(new VoyageNumber("V250"), 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 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();
+    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(HAMBURG, toDate("2009-03-20"), toDate("2009-03-22")).
-          build();
+    addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-15")).
+    addMovement(HELSINKI, toDate("2009-03-15"), toDate("2009-03-16")).
+    addMovement(HAMBURG, toDate("2009-03-20"), toDate("2009-03-22")).
+    build();
 
   /**
    * Voyage number 0100S (by ship)
-   *
+   * <p/>
    * Hongkong - Hangzou - Tokyo - Melbourne - New York
    */
   public static final Voyage HONGKONG_TO_NEW_YORK =
@@ -68,7 +68,7 @@ public class SampleVoyages {
 
   /**
    * Voyage number 0200T (by train)
-   *
+   * <p/>
    * New York - Chicago - Dallas
    */
   public static final Voyage NEW_YORK_TO_DALLAS =
@@ -79,7 +79,7 @@ public class SampleVoyages {
 
   /**
    * Voyage number 0300A (by airplane)
-   *
+   * <p/>
    * Dallas - Hamburg - Stockholm - Helsinki
    */
   public static final Voyage DALLAS_TO_HELSINKI =
@@ -91,7 +91,7 @@ public class SampleVoyages {
 
   /**
    * Voyage number 0301S (by ship)
-   *
+   * <p/>
    * Dallas - Hamburg - Stockholm - Helsinki, alternate route
    */
   public static final Voyage DALLAS_TO_HELSINKI_ALT =
@@ -101,9 +101,8 @@ public class SampleVoyages {
 
   /**
    * Voyage number 0400S (by ship)
-   *
+   * <p/>
    * Helsinki - Rotterdam - Shanghai - Hongkong
-   *
    */
   public static final Voyage HELSINKI_TO_HONGKONG =
     new Voyage.Builder(new VoyageNumber("0400S"), HELSINKI).
@@ -128,11 +127,11 @@ public class SampleVoyages {
   }
 
   public static List<Voyage> getAll() {
-    return new ArrayList(ALL.values());
+    return new ArrayList<Voyage>(ALL.values());
   }
 
   public static Voyage lookup(VoyageNumber voyageNumber) {
     return ALL.get(voyageNumber);
   }
-  
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/Schedule.java

@@ -2,18 +2,19 @@ package se.citerus.dddsample.domain.model.voyage;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
  * A voyage schedule.
- * 
  */
 public class Schedule implements ValueObject<Schedule> {
 
-  private List<CarrierMovement> carrierMovements = Collections.EMPTY_LIST;
+  private List<CarrierMovement> carrierMovements;
 
   public static final Schedule EMPTY = new Schedule();
 
@@ -32,6 +33,32 @@ public class Schedule implements ValueObject<Schedule> {
     return Collections.unmodifiableList(carrierMovements);
   }
 
+  /**
+   * @param location location of departure
+   * @return Date of departure from this location, or null if it's not part of the voyage.
+   */
+  public Date departureTimeAt(final Location location) {
+    for (CarrierMovement movement : carrierMovements) {
+      if (movement.departureLocation().sameIdentityAs(location)) {
+        return movement.departureTime();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * @param location location of arrival
+   * @return Date of arrival at this location, or null if it's not part of the voyage.
+   */
+  public Date arrivalTimeAt(final Location location) {
+    for (CarrierMovement movement : carrierMovements) {
+      if (movement.arrivalLocation().sameIdentityAs(location)) {
+        return movement.arrivalTime();
+      }
+    }
+    return null;
+  }
+
   @Override
   public boolean sameValueAs(final Schedule other) {
     return other != null && this.carrierMovements.equals(other.carrierMovements);
@@ -55,5 +82,4 @@ public class Schedule implements ValueObject<Schedule> {
   Schedule() {
     // Needed by Hibernate
   }
-
 }

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

@@ -11,20 +11,37 @@ import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 public class CargoTest extends TestCase {
 
-  private Voyage voyage;
-
-  protected void setUp() throws Exception {
-
-    voyage = new Voyage.Builder(new VoyageNumber("0123"), STOCKHOLM).
-      addMovement(HAMBURG, new Date(), new Date()).
-      addMovement(HONGKONG, new Date(), new Date()).
-      addMovement(MELBOURNE, new Date(), new Date()).
-      build();
-  }
+  private Voyage crazyVoyage = new Voyage.Builder(new VoyageNumber("0123"),
+    STOCKHOLM).
+    addMovement(HAMBURG, new Date(), new Date()).
+    addMovement(HONGKONG, new Date(), new Date()).
+    addMovement(MELBOURNE, new Date(), new Date()).
+    build();
+
+  private Voyage pacific = new Voyage.Builder(new VoyageNumber("4567"),
+    SHANGHAI).
+    addMovement(LONGBEACH, new Date(), new Date()).
+    addMovement(SEATTLE, new Date(), new Date()).
+    build();
+
+  private Voyage transcontinental = new Voyage.Builder(new VoyageNumber("4567"),
+    LONGBEACH).
+    addMovement(CHICAGO, new Date(), new Date()).
+    addMovement(NEWYORK, new Date(), new Date()).
+    build();
+
+  private Voyage northernRail = new Voyage.Builder(new VoyageNumber("8901"),
+    SEATTLE).
+    addMovement(CHICAGO, new Date(), new Date()).
+    addMovement(NEWYORK, new Date(), new Date()).
+    build();
 
   public void testConstruction() {
     TrackingId trackingId = new TrackingId("XYZ");
@@ -38,7 +55,7 @@ public class CargoTest extends TestCase {
     assertEquals(NOT_ROUTED, cargo.delivery().routingStatus());
     assertEquals(NOT_RECEIVED, cargo.delivery().transportStatus());
     assertEquals(Location.UNKNOWN, cargo.delivery().lastKnownLocation());
-    assertEquals(Voyage.NONE, cargo.delivery().currentVoyage());    
+    assertEquals(Voyage.NONE, cargo.delivery().currentVoyage());
   }
 
   public void testRoutingStatus() throws Exception {
@@ -55,7 +72,7 @@ public class CargoTest extends TestCase {
     cargo.specifyNewRoute(acceptOnlyGood);
 
     assertEquals(NOT_ROUTED, cargo.delivery().routingStatus());
-    
+
     cargo.assignToRoute(bad);
     assertEquals(MISROUTED, cargo.delivery().routingStatus());
 
@@ -112,7 +129,7 @@ public class CargoTest extends TestCase {
     assertFalse(cargo.delivery().isUnloadedAtDestination());
 
     // Adding an event unrelated to unloading at final destination
-    
+
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
     events.add(
       new HandlingEvent(cargo, new Date(10), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU));
@@ -147,7 +164,7 @@ public class CargoTest extends TestCase {
     Cargo cargo1 = new Cargo(new TrackingId("ABC"), sharedRouteSpec);
     Cargo cargo2 = new Cargo(new TrackingId("DEF"), sharedRouteSpec);
     assertFalse(cargo1.sameIdentityAs(cargo2));
-    
+
     HandlingHistory handlingHistoryOfCargo1 = HandlingHistory.fromEvents(Arrays.asList(
       new HandlingEvent(cargo1, toDate("2009-03-10"), toDate("2009-03-12"), HandlingEvent.Type.RECEIVE, HANGZOU)
     ));
@@ -187,11 +204,11 @@ public class CargoTest extends TestCase {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, crazyVoyage));
 
-    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, crazyVoyage));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
     return cargo;
@@ -201,9 +218,9 @@ public class CargoTest extends TestCase {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, crazyVoyage));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
     return cargo;
@@ -213,14 +230,14 @@ public class CargoTest extends TestCase {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, crazyVoyage));
 
-    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, crazyVoyage));
 
-    events.add(new HandlingEvent(cargo, toDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, MELBOURNE, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, MELBOURNE, crazyVoyage));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
     return cargo;
@@ -230,13 +247,13 @@ public class CargoTest extends TestCase {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, crazyVoyage));
 
-    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, voyage));
-    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, crazyVoyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, crazyVoyage));
 
-    events.add(new HandlingEvent(cargo, toDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, voyage));
+    events.add(new HandlingEvent(cargo, toDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, HONGKONG, crazyVoyage));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
     return cargo;
@@ -255,10 +272,10 @@ public class CargoTest extends TestCase {
     //Happy path
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
     events.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
-    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
-    events.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, voyage));
-    events.add(new HandlingEvent(cargo, new Date(90), new Date(100), HandlingEvent.Type.UNLOAD, GOTHENBURG, voyage));
+    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(90), new Date(100), HandlingEvent.Type.UNLOAD, GOTHENBURG, crazyVoyage));
     events.add(new HandlingEvent(cargo, new Date(110), new Date(120), HandlingEvent.Type.CLAIM, GOTHENBURG));
     events.add(new HandlingEvent(cargo, new Date(130), new Date(140), HandlingEvent.Type.CUSTOMS, GOTHENBURG));
 
@@ -277,9 +294,9 @@ public class CargoTest extends TestCase {
     cargo = setUpCargoWithItinerary(SHANGHAI, ROTTERDAM, GOTHENBURG);
 
     events.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
-    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
-    events.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, voyage));
+    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, ROTTERDAM, crazyVoyage));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
 
@@ -289,8 +306,8 @@ public class CargoTest extends TestCase {
     cargo = setUpCargoWithItinerary(SHANGHAI, ROTTERDAM, GOTHENBURG);
 
     events.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, SHANGHAI));
-    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, voyage));
-    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage));
+    events.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, SHANGHAI, crazyVoyage));
+    events.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, ROTTERDAM, crazyVoyage));
     events.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, ROTTERDAM));
 
     cargo.deriveDeliveryProgress(HandlingHistory.fromEvents(events));
@@ -298,13 +315,57 @@ public class CargoTest extends TestCase {
     assertTrue(cargo.delivery().isMisdirected());
   }
 
+  public void testCustomsClearancePoint() {
+    //cargo destination NYC
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"),
+      new RouteSpecification(SHANGHAI, NEWYORK, new Date()));
+
+    //SHA-LGB-NYC
+    cargo.assignToRoute(new Itinerary(
+      Leg.deriveLeg(pacific, SHANGHAI, LONGBEACH),
+      Leg.deriveLeg(transcontinental, LONGBEACH, NEWYORK)));
+    assertEquals(LONGBEACH, cargo.customsClearancePoint());
+
+    //SHA-SEA-NYC
+    cargo.assignToRoute(new Itinerary(
+      Leg.deriveLeg(pacific, SHANGHAI, SEATTLE),
+      Leg.deriveLeg(northernRail, SEATTLE, NEWYORK)));
+    assertEquals(SEATTLE, cargo.customsClearancePoint());
+
+    //cargo destination LGB
+    //SHA-LGB
+    cargo.specifyNewRoute(new RouteSpecification(SHANGHAI, LONGBEACH, new Date()));
+    cargo.assignToRoute(new Itinerary(
+      Leg.deriveLeg(pacific, SHANGHAI, LONGBEACH)));
+    assertEquals(LONGBEACH, cargo.customsClearancePoint());
+
+    //Cargo destination HAMBURG
+    //SHA-LGB-NYC This itinerary does not take
+    // the cargo into its CustomsZone, so no clearancePoint.
+    cargo.specifyNewRoute(new RouteSpecification(SHANGHAI, HAMBURG, new Date()));
+    cargo.assignToRoute(new Itinerary(
+      Leg.deriveLeg(pacific, SHANGHAI, LONGBEACH),
+      Leg.deriveLeg(transcontinental, LONGBEACH, NEWYORK)));
+    assertNull(cargo.customsClearancePoint());
+
+    //Cargo destination NEWYORK on SHA-LGB-CHI
+    //This itinerary does not take the cargo to its destination,
+    //but it does enter the CustomsZone, so it has a clearancePoint.
+    cargo.specifyNewRoute(new RouteSpecification(SHANGHAI, NEWYORK, new Date()));
+    cargo.assignToRoute(new Itinerary(
+      Leg.deriveLeg(pacific, SHANGHAI, LONGBEACH),
+      Leg.deriveLeg(transcontinental, LONGBEACH, CHICAGO)));
+    assertEquals(LONGBEACH, cargo.customsClearancePoint());
+
+  }
+
   private Cargo setUpCargoWithItinerary(Location origin, Location midpoint, Location destination) {
     Cargo cargo = new Cargo(new TrackingId("CARGO1"), new RouteSpecification(origin, destination, new Date()));
 
     Itinerary itinerary = new Itinerary(
       Arrays.asList(
-        new Leg(voyage, origin, midpoint, new Date(), new Date()),
-        new Leg(voyage, midpoint, destination, new Date(), new Date())
+        new Leg(crazyVoyage, origin, midpoint, new Date(), new Date()),
+        new Leg(crazyVoyage, midpoint, destination, new Date(), new Date())
       )
     );
 

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

@@ -0,0 +1,21 @@
+package se.citerus.dddsample.domain.model.cargo;
+
+import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+
+public class CustomsZoneTest extends TestCase {
+
+  public void testIncludes() {
+    assertTrue(US.includes(DALLAS));
+    assertFalse(EU.includes(NEWYORK));
+  }
+
+  public void testEntryPoint() {
+    assertEquals(LONGBEACH, US.entryPoint(SHANGHAI, LONGBEACH, CHICAGO));
+  }
+
+  public void testClearancePoint() {
+    assertEquals(LONGBEACH, US.entryPoint(SHANGHAI, LONGBEACH, CHICAGO));
+  }
+
+}

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

@@ -2,6 +2,7 @@ package se.citerus.dddsample.domain.model.cargo;
 
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
@@ -13,10 +14,19 @@ import java.util.List;
 
 public class ItineraryTest extends TestCase {
 
-
-  Voyage voyage, wrongVoyage;
+  Voyage voyage, wrongVoyage, pacific, transcontinental;
 
   protected void setUp() throws Exception {
+
+    pacific = new Voyage.Builder(new VoyageNumber("4567"), SHANGHAI).
+      addMovement(LONGBEACH, new Date(), new Date()).
+      build();
+
+    transcontinental = new Voyage.Builder(new VoyageNumber("4567"), LONGBEACH).
+      addMovement(CHICAGO, new Date(), new Date()).
+      addMovement(NEWYORK, new Date(), new Date()).
+      build();
+
     voyage = new Voyage.Builder(new VoyageNumber("0123"), SHANGHAI).
       addMovement(ROTTERDAM, new Date(), new Date()).
       addMovement(GOTHENBURG, new Date(), new Date()).
@@ -28,7 +38,7 @@ public class ItineraryTest extends TestCase {
       build();
   }
 
-  public void testCargoOnTrack() {
+  public void testIfCargoIsOnTrack() {
 
     TrackingId trackingId = new TrackingId("CARGO1");
     RouteSpecification routeSpecification = new RouteSpecification(SHANGHAI, GOTHENBURG, new Date());
@@ -41,51 +51,53 @@ public class ItineraryTest extends TestCase {
       )
     );
 
+    // HandlingEvent.Load(cargo, RECEIVE, SHANGHAI, toDate("2009-05-03"))
     //Happy path
-    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, SHANGHAI);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent receiveShanghai = new HandlingEvent(cargo, new Date(), new Date(), RECEIVE, SHANGHAI);
+    assertTrue(itinerary.isExpected(receiveShanghai));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, SHANGHAI, voyage);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent loadShanghai = new HandlingEvent(cargo, new Date(), new Date(), LOAD, SHANGHAI, voyage);
+    assertTrue(itinerary.isExpected(loadShanghai));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, ROTTERDAM, voyage);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent unloadRotterdam = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, ROTTERDAM, voyage);
+    assertTrue(itinerary.isExpected(unloadRotterdam));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, voyage);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent loadRotterdam = new HandlingEvent(cargo, new Date(), new Date(), LOAD, ROTTERDAM, voyage);
+    assertTrue(itinerary.isExpected(loadRotterdam));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, GOTHENBURG, voyage);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent unloadGothenburg = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, GOTHENBURG, voyage);
+    assertTrue(itinerary.isExpected(unloadGothenburg));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, GOTHENBURG);
-    assertTrue(itinerary.isExpected(event));
+    HandlingEvent claimGothenburg = new HandlingEvent(cargo, new Date(), new Date(), CLAIM, GOTHENBURG);
+    assertTrue(itinerary.isExpected(claimGothenburg));
 
-    //Customs event changes nothing
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, GOTHENBURG);
-    assertTrue(itinerary.isExpected(event));
+    //TODO Customs event can only be interpreted properly by knowing the destination of the cargo.
+    // This can be inferred from the Itinerary, but it isn't definitive. So, do we answer based on
+    // the end of the itinerary (even though this would probably not be used in the app) or do we
+    // ignore this at itinerary level somehow and leave it purely as a cargo responsibility.
+    // (See customsClearancePoint tests in CargoTest)
+//    HandlingEvent customsGothenburg = new HandlingEvent(cargo, new Date(), new Date(), CUSTOMS, GOTHENBURG);
+//    assertTrue(itinerary.isExpected(customsGothenburg));
 
     //Received at the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU);
-    assertFalse(itinerary.isExpected(event));
+    HandlingEvent receiveHangzou = new HandlingEvent(cargo, new Date(), new Date(), RECEIVE, HANGZOU);
+    assertFalse(itinerary.isExpected(receiveHangzou));
 
     //Loaded to onto the wrong ship, correct location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, wrongVoyage);
-    assertFalse(itinerary.isExpected(event));
+    HandlingEvent loadRotterdam666 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, ROTTERDAM, wrongVoyage);
+    assertFalse(itinerary.isExpected(loadRotterdam666));
 
     //Unloaded from the wrong ship in the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, HELSINKI, wrongVoyage);
-    assertFalse(itinerary.isExpected(event));
+    HandlingEvent unloadHelsinki = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, HELSINKI, wrongVoyage);
+    assertFalse(itinerary.isExpected(unloadHelsinki));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, ROTTERDAM);
-    assertFalse(itinerary.isExpected(event));
+    HandlingEvent claimRotterdam = new HandlingEvent(cargo, new Date(), new Date(), CLAIM, ROTTERDAM);
+    assertFalse(itinerary.isExpected(claimRotterdam));
 
     //Unrouted Cargo shouldn't go anywhere or do anything
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, SHANGHAI);
-    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(event));
+    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(receiveShanghai));
+    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(loadShanghai));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, SHANGHAI, voyage);
-    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(event));
-    
   }
 
   public void testCreateItinerary() throws Exception {
@@ -105,4 +117,4 @@ public class ItineraryTest extends TestCase {
     }
   }
 
-}
+}

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

@@ -13,12 +13,12 @@ public class LegTest {
 
   @Test(expected = IllegalArgumentException.class)
   public void testConstructor() throws Exception {
-    new Leg(null, null, null);
+    Leg.deriveLeg(null, null, null);
   }
 
   @Test
   public void legThatFollowsPartOfAVoyage() {
-    Leg chicagoToDallas = new Leg(voyage, CHICAGO, DALLAS);
+    Leg chicagoToDallas = Leg.deriveLeg(voyage, CHICAGO, DALLAS);
 
     assertEquals(chicagoToDallas.loadTime(), toDate("2008-10-24", "21:25"));
     assertEquals(chicagoToDallas.loadLocation(), CHICAGO);
@@ -28,7 +28,7 @@ public class LegTest {
 
   @Test
   public void legThatFollowsAnEntireVoyage() {
-    Leg chicagoToDallas = new Leg(voyage, NEWYORK, DALLAS);
+    Leg chicagoToDallas = Leg.deriveLeg(voyage, NEWYORK, DALLAS);
 
     assertEquals(chicagoToDallas.loadTime(), toDate("2008-10-24", "07:00"));
     assertEquals(chicagoToDallas.loadLocation(), NEWYORK);
@@ -38,17 +38,17 @@ public class LegTest {
 
   @Test(expected = IllegalArgumentException.class)
   public void locationsInWrongOrder() {
-    new Leg(voyage, DALLAS, CHICAGO);
+    Leg.deriveLeg(voyage, DALLAS, CHICAGO);
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void endLocationNotOnVoyage() {
-    new Leg(voyage, CHICAGO, HELSINKI);
+    Leg.deriveLeg(voyage, CHICAGO, HELSINKI);
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void startLocationNotOnVoyage() {
-    new Leg(voyage, HONGKONG, DALLAS);
+    Leg.deriveLeg(voyage, HONGKONG, DALLAS);
   }
 
 }

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

@@ -26,7 +26,7 @@ public class HandlingHistoryTest extends TestCase {
   protected void setUp() throws Exception {
     cargo = new Cargo(new TrackingId("ABC"), new RouteSpecification(SHANGHAI, DALLAS, toDate("2009-04-01")));
     cargo2 = new Cargo(new TrackingId("DEF"), new RouteSpecification(SHANGHAI, NEWYORK, toDate("2009-04-15")));
-    
+
     voyage = new Voyage.Builder(new VoyageNumber("X25"), HONGKONG).
       addMovement(SHANGHAI, new Date(), new Date()).
       addMovement(DALLAS, new Date(), new Date()).
@@ -39,16 +39,25 @@ public class HandlingHistoryTest extends TestCase {
 
   public void testDistinctEventsByCompletionTime() {
     handlingHistory = HandlingHistory.fromEvents(asList(event2, event1, event1duplicate));
-    
+
     assertEquals(asList(event1, event2), handlingHistory.distinctEventsByCompletionTime());
   }
 
   public void testMostRecentlyCompletedEvent() {
     handlingHistory = HandlingHistory.fromEvents(asList(event2, event1, event1duplicate));
-    
+
     assertEquals(event2, handlingHistory.mostRecentlyCompletedEvent());
   }
 
+  public void testMostRecentLoadOrUnload() {
+    // TODO
+    HandlingEvent event3Customs = new HandlingEvent(cargo, toDate("2009-03-11"), toDate("2009-03-11"), HandlingEvent.Type.CUSTOMS, DALLAS);
+    handlingHistory = HandlingHistory.fromEvents(asList(event2, event1, event1duplicate, event3Customs));
+
+    assertEquals(event3Customs, handlingHistory.mostRecentlyCompletedEvent());
+    assertEquals(event2, handlingHistory.mostRecentPhysicalHandling());
+  }
+
   public void testUniqueCargoOfEvents() {
     try {
       handlingHistory = HandlingHistory.fromEvents(asList(event1, event2, eventOfCargo2));

dddsample/src/test/java/se/citerus/dddsample/domain/model/location/LocationTest.java

@@ -1,24 +1,24 @@
 package se.citerus.dddsample.domain.model.location;
 
-import java.util.TimeZone;
-
 import junit.framework.TestCase;
 
+import java.util.TimeZone;
+
 public class LocationTest extends TestCase {
-	private static final TimeZone CET = TimeZone.getTimeZone("Europe/Amsterdam"); 
-	
+  private static final TimeZone CET = TimeZone.getTimeZone("Europe/Amsterdam");
+
   public void testEquals() {
-	  
+
     // Same UN locode - equal
-    assertTrue(new Location(new UnLocode("ATEST"),"test-name", CET).
-        equals(new Location(new UnLocode("ATEST"),"test-name", CET)));
+    assertTrue(new Location(new UnLocode("ATEST"), "test-name", CET, null).
+      equals(new Location(new UnLocode("ATEST"), "test-name", CET, null)));
 
     // Different UN locodes - not equal
-    assertFalse(new Location(new UnLocode("ATEST"),"test-name", CET).
-         equals(new Location(new UnLocode("TESTB"), "test-name", CET)));
+    assertFalse(new Location(new UnLocode("ATEST"), "test-name", CET, null).
+      equals(new Location(new UnLocode("TESTB"), "test-name", CET, null)));
 
     // Always equal to itself
-    Location location = new Location(new UnLocode("ATEST"),"test-name", CET);
+    Location location = new Location(new UnLocode("ATEST"), "test-name", CET, null);
     assertTrue(location.equals(location));
 
     // Never equal to null
@@ -28,9 +28,10 @@ public class LocationTest extends TestCase {
     assertTrue(Location.UNKNOWN.equals(Location.UNKNOWN));
 
     try {
-      new Location(null, null, null);
+      new Location(null, null, null, null);
       fail("Should not allow any null constructor arguments");
-    } catch (IllegalArgumentException expected) {}
+    } catch (IllegalArgumentException expected) {
+    }
   }
 
 }

dddsample/src/test/java/se/citerus/dddsample/domain/model/voyage/VoyageTest.java

@@ -1,40 +1,19 @@
 package se.citerus.dddsample.domain.model.voyage;
 
 import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
-public class VoyageTest extends TestCase {
-
-    public void testVoyageNumber() throws Exception {
-        //TODO: Test goes here...
-    }
-
-    public void testSchedule() throws Exception {
-        //TODO: Test goes here...
-    }
-
-    public void testHashCode() throws Exception {
-        //TODO: Test goes here...
-    }
+import java.util.Date;
 
-    public void testEquals() throws Exception {
-        //TODO: Test goes here...
-    }
-
-    public void testSameIdentityAs() throws Exception {
-        //TODO: Test goes here...
-    }
-
-    public void testToString() throws Exception {
-        //TODO: Test goes here...
-    }
-
-    public void testAddMovement() throws Exception {
-        //TODO: Test goes here...
-    }
+public class VoyageTest extends TestCase {
 
-    public void testBuild() throws Exception {
-        //TODO: Test goes here...
-    }
 
+  public void testSchedule() {
+    Voyage transcontinental = new Voyage.Builder(new VoyageNumber("4567"),
+      LONGBEACH).
+      addMovement(CHICAGO, new Date(), new Date()).
+      addMovement(NEWYORK, new Date(), new Date()).
+      build();
+  }
 
 }

dddsample/src/test/java/se/citerus/dddsample/scenario/CargoLifecycleScenarioTest.java

@@ -45,7 +45,7 @@ public class CargoLifecycleScenarioTest {
   /**
    * This is a domain service interface, whose implementation
    * is part of the infrastructure layer (remote call to external system).
-   *
+   * <p/>
    * It is stubbed in this test.
    */
   RoutingService routingService = new ScenarioStubRoutingService();
@@ -60,7 +60,7 @@ public class CargoLifecycleScenarioTest {
     // Route: Hongkong - Long Beach - New York - Stockholm
     routeCargoFromHongkongToStockholm();
     checkDeliveryAfterRouting();
-                                
+
 
     receiveInHongkong();
     checkDeliveryAfterReceiveInHongkong();
@@ -88,28 +88,28 @@ public class CargoLifecycleScenarioTest {
   }
 
   private void unloadInLongBeach() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-06"), v100, LONG_BEACH, UNLOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-06"), v100, LONGBEACH, UNLOAD);
   }
 
   private void checkDeliveryAfterUnloadInLongBeach() {
     Cargo cargo = cargoRepository.find(trackingId);
 
     assertThat(cargo.delivery().currentVoyage(), is(NONE));
-    assertThat(cargo.delivery().lastKnownLocation(), is(LONG_BEACH));
+    assertThat(cargo.delivery().lastKnownLocation(), is(LONGBEACH));
     assertThat(cargo.delivery().transportStatus(), is(IN_PORT));
-    assertThat(cargo.delivery().nextExpectedActivity(), is(new HandlingActivity(LOAD, LONG_BEACH, v250)));
+    assertThat(cargo.delivery().nextExpectedActivity(), is(new HandlingActivity(LOAD, LONGBEACH, v250)));
     assertFalse(cargo.delivery().isMisdirected());
   }
 
   private void loadInLongBeach() throws CannotCreateHandlingEventException {
-    createHandlingEventAndUpdateAggregates(toDate("2009-03-07"), v250, LONG_BEACH, LOAD);
+    createHandlingEventAndUpdateAggregates(toDate("2009-03-07"), v250, LONGBEACH, LOAD);
   }
 
   private void checkDeliveryAfterLoadInLongBeach() {
     Cargo cargo = cargoRepository.find(trackingId);
 
     assertThat(cargo.delivery().currentVoyage(), is(v250));
-    assertThat(cargo.delivery().lastKnownLocation(), is(LONG_BEACH));
+    assertThat(cargo.delivery().lastKnownLocation(), is(LONGBEACH));
     assertThat(cargo.delivery().transportStatus(), is(ONBOARD_CARRIER));
     assertThat(cargo.delivery().nextExpectedActivity(), is(new HandlingActivity(UNLOAD, NEWYORK, v250)));
     assertFalse(cargo.delivery().isMisdirected());
@@ -244,7 +244,7 @@ public class CargoLifecycleScenarioTest {
     assertThat(cargo.delivery().currentVoyage(), is(v100));
     assertThat(cargo.delivery().lastKnownLocation(), is(HONGKONG));
     assertThat(cargo.delivery().transportStatus(), is(ONBOARD_CARRIER));
-    assertThat(cargo.delivery().nextExpectedActivity(), is(new HandlingActivity(UNLOAD, LONG_BEACH, v100)));
+    assertThat(cargo.delivery().nextExpectedActivity(), is(new HandlingActivity(UNLOAD, LONGBEACH, v100)));
     assertFalse(cargo.delivery().isMisdirected());
   }
 
@@ -395,8 +395,8 @@ public class CargoLifecycleScenarioTest {
         // Hongkong - NYC - Chicago - Stockholm, initial routing
         return Arrays.asList(
           new Itinerary(Arrays.asList(
-            new Leg(v100, HONGKONG, LONG_BEACH, toDate("2009-03-03"), toDate("2009-03-09")),
-            new Leg(v250, LONG_BEACH, NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")),
+            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"))
           ))
         );

dddsample/src/test/java/se/citerus/dddsample/scenario/VoyageRescheduledScenarioTest.java

@@ -15,7 +15,6 @@ import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 
-import static java.util.Arrays.asList;
 import java.util.Date;
 
 public class VoyageRescheduledScenarioTest extends TestCase {
@@ -26,11 +25,11 @@ public class VoyageRescheduledScenarioTest extends TestCase {
     Voyage voyage2 = new Voyage(new VoyageNumber("V2"), NEW_YORK_TO_DALLAS.schedule());
     Voyage voyage3 = new Voyage(new VoyageNumber("V3"), DALLAS_TO_HELSINKI.schedule());
 
-    Itinerary itinerary = new Itinerary(asList(
-      new Leg(voyage1, HANGZOU, NEWYORK),
-      new Leg(voyage2, NEWYORK, DALLAS),
-      new Leg(voyage3, DALLAS, STOCKHOLM)
-    ));
+    Itinerary itinerary = new Itinerary(
+      Leg.deriveLeg(voyage1, HANGZOU, NEWYORK),
+      Leg.deriveLeg(voyage2, NEWYORK, DALLAS),
+      Leg.deriveLeg(voyage3, DALLAS, STOCKHOLM)
+    );
 
     Date oldDepartureTime = toDate("2008-10-24", "07:00");