Tried to make the domain classes more internally consistent and created test classes for those domain classes that didn't have one.

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

@@ -2,6 +2,7 @@ package se.citerus.dddsample.domain;
 
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang.Validate;
 
 import javax.persistence.*;
 
@@ -33,12 +34,14 @@ public class Cargo {
 
   //TODO Remove this constructor
   public Cargo(TrackingId trackingId, Location origin, Location destination) {
+    Validate.noNullElements(new Object[] {trackingId, origin, destination});
     this.trackingId = trackingId;
     this.origin = origin;
     this.destination = destination;
   }
 
   public Cargo(TrackingId trackingId) {
+    Validate.notNull(trackingId);
     this.trackingId = trackingId;
   }
 
@@ -130,11 +133,6 @@ public class Cargo {
     return this.itinerary;
   }
 
-  @Override
-  public String toString() {
-    return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
-  }
-
   /**
    * Entities compare by identity, therefore the trackingId field is the only basis of comparison. For persistence we
    * have an id field, but it is not used for identiy comparison.
@@ -151,7 +149,8 @@ public class Cargo {
 
   /**
    * @param object to compare
-   * @return True if tracking ids are equal.
+   * @return True if they have the same identity
+   * @see #sameIdentityAs(Cargo)
    */
   @Override
   public boolean equals(Object object) {
@@ -170,7 +169,12 @@ public class Cargo {
     return trackingId.hashCode();
   }
 
-  // Needed by Hibernate
-  protected Cargo() {
+  @Override
+  public String toString() {
+    return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+  }
+
+  Cargo() {
+    // Needed by Hibernate
   }
 }

dddsample/src/main/java/se/citerus/dddsample/domain/CarrierMovement.java

@@ -1,5 +1,8 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.Validate;
+
 import javax.persistence.*;
 
 
@@ -23,6 +26,7 @@ public class CarrierMovement {
   private Location to;
 
   public CarrierMovement(CarrierMovementId carrierMovementId, Location from, Location to) {
+    Validate.noNullElements(new Object[] {carrierMovementId, from, to});
     this.carrierMovementId = carrierMovementId;
     this.from = from;
     this.to = to;
@@ -52,14 +56,11 @@ public class CarrierMovement {
    * Compare this behavior to the value object {@link se.citerus.dddsample.domain.Leg#sameValueAs(Leg)}
    *
    * @param other The other cargo.
-   * @return <code>true</code> if the given carrier movement's and this carrier movement's carrierId is the same,
+   * @return <code>true</code> if the given carrier movement's and this carrier movement's carrier id are the same,
    *         regardles of other attributes.
    */
   public boolean sameIdentityAs(CarrierMovement other) {
-    if (carrierMovementId != null ? !carrierMovementId.equals(other.carrierMovementId) : other.carrierMovementId != null)
-      return false;
-
-    return true;
+    return carrierMovementId.equals(other.carrierMovementId);
   }
 
   @Override
@@ -72,13 +73,11 @@ public class CarrierMovement {
     return sameIdentityAs(that);
   }
 
+  /**
+   * @return Hashcode of carrier movement id.
+   */
   @Override
   public int hashCode() {
-    int result;
-    result = (id != null ? id.hashCode() : 0);
-    result = 31 * result + (carrierMovementId != null ? carrierMovementId.hashCode() : 0);
-    result = 31 * result + (from != null ? from.hashCode() : 0);
-    result = 31 * result + (to != null ? to.hashCode() : 0);
-    return result;
+    return carrierMovementId.hashCode();
   }
 }

dddsample/src/main/java/se/citerus/dddsample/domain/CarrierMovementId.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.domain;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.Validate;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
@@ -17,6 +18,7 @@ public class CarrierMovementId {
   private String id;
 
   public CarrierMovementId(String id) {
+    Validate.notNull(id);
     this.id = id;
   }
 

dddsample/src/main/java/se/citerus/dddsample/domain/DeliveryHistory.java

@@ -64,27 +64,27 @@ public class DeliveryHistory {
 
   public StatusCode status() {
     if (lastEvent() == null)
-      return StatusCode.notReceived;
+      return StatusCode.NOT_RECIEVED;
 
     HandlingEvent.Type type = lastEvent().type();
     if (type == HandlingEvent.Type.LOAD)
-      return StatusCode.onBoardCarrier;
+      return StatusCode.ONBOARD_CARRIER;
 
     if (type == HandlingEvent.Type.UNLOAD)
-      return StatusCode.inPort;
+      return StatusCode.IN_PORT;
 
     if (type == HandlingEvent.Type.RECEIVE)
-      return StatusCode.inPort;
+      return StatusCode.IN_PORT;
 
     if (type == HandlingEvent.Type.CLAIM)
-      return StatusCode.claimed;
+      return StatusCode.CLAIMED;
 
     //TODO: What about Type.CUSTOMS?
     return null;
   }
 
   public Location currentLocation() {
-    if (status().equals(StatusCode.inPort)) {
+    if (status().equals(StatusCode.IN_PORT)) {
       return lastEvent().location();
     } else {
       return null;
@@ -92,11 +92,13 @@ public class DeliveryHistory {
   }
 
   public CarrierMovement currentCarrierMovement() {
-    if (status().equals(StatusCode.onBoardCarrier)) {
+    if (status().equals(StatusCode.ONBOARD_CARRIER)) {
       return lastEvent().carrierMovement();
     } else {
       return null;
     }
   }
 
+  // TODO: what about equals, hashCode, toString?
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/HandlingEvent.java

@@ -1,5 +1,9 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.Validate;
+
 import javax.persistence.*;
 import java.util.Comparator;
 import java.util.Date;
@@ -75,25 +79,6 @@ public class HandlingEvent {
 
 
   /**
-   * Constructor for events that do not have a carrier movement associated.
-   *
-   * @param cargo            cargo
-   * @param completionTime   completion time, the reported time that the event actually happened (e.g. the receive took place).
-   * @param registrationTime registration time, the time the message is received
-   * @param type             type of event. Legal values are CLAIM, RECEIVE and CUSTOMS
-   * @param location         where the event took place
-   */
-  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type, Location location) {
-    this.registrationTime = registrationTime;
-    this.completionTime = completionTime;
-    this.type = type;
-    this.cargo = cargo;
-    this.location = location;
-
-    validateType();
-  }
-
-    /**
    * Constructor for events that have a carrier movement associated. The location where
    * the event took place is derived from the carrier movement: if the type of event is LOAD,
    * the location is the starting point of the movement, if the type is UNLOAD the location
@@ -107,6 +92,7 @@ public class HandlingEvent {
    * @param carrierMovement  carrier movement.
    */
   public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type, Location location, CarrierMovement carrierMovement) {
+    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location});
     this.registrationTime = registrationTime;
     this.completionTime = completionTime;
     this.type = type;
@@ -166,26 +152,24 @@ public class HandlingEvent {
    * @return <code>true</code> if the given handling event and this event are regarded as the same.
    */
   public boolean sameEventAs(HandlingEvent other) {
-    if (cargo != null ? !cargo.equals(other.cargo) : other.cargo != null) return false;
-    if (carrierMovement != null ? !carrierMovement.equals(other.carrierMovement) : other.carrierMovement != null)
-      return false;
-    if (completionTime != null ? !completionTime.equals(other.completionTime) : other.completionTime != null)
-      return false;
-    if (location != null ? !location.equals(other.location) : other.location != null) return false;
-    if (type != other.type) return false;
-
-    return true;
+    return other != null && new EqualsBuilder().
+      append(this.cargo, other.cargo).
+      append(this.carrierMovement, other.carrierMovement).
+      append(this.completionTime, other.completionTime).
+      append(this.location, other.location).
+      append(this.type, other.type).
+      isEquals();
   }
 
   @Override
   public int hashCode() {
-    int result;
-    result = (type != null ? type.hashCode() : 0);
-    result = 31 * result + (carrierMovement != null ? carrierMovement.hashCode() : 0);
-    result = 31 * result + (location != null ? location.hashCode() : 0);
-    result = 31 * result + (completionTime != null ? completionTime.hashCode() : 0);
-    result = 31 * result + (cargo != null ? cargo.hashCode() : 0);
-    return result;
+    return new HashCodeBuilder(13,41).
+      append(cargo).
+      append(carrierMovement).
+      append(completionTime).
+      append(location).
+      append(type).
+      toHashCode();
   }
 
   /**

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

@@ -79,10 +79,12 @@ public class Itinerary {
     return true;
   }
 
-  private boolean sameValueAs(Itinerary other) {
-    if (!legs.equals(other.legs)) return false;
-
-    return true;
+  /**
+   * @param other itinerary to compare
+   * @return <code>true</code> if the legs in this and the other itinerary are all equal.
+   */
+  public boolean sameValueAs(Itinerary other) {
+    return legs.equals(other.legs);
   }
 
   @Override

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

@@ -1,11 +1,21 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.Validate;
+
+/**
+ * An itinerary consists of one or more legs.
+ */
 public class Leg {
   private CarrierMovementId carrierMovementId;
   private Location from;
   private Location to;
 
   public Leg(CarrierMovementId carrierMovementId, Location from, Location to) {
+    Validate.noNullElements(new Object[] {carrierMovementId, from, to});
     this.carrierMovementId = carrierMovementId;
     this.from = from;
     this.to = to;
@@ -34,12 +44,11 @@ public class Leg {
    * @return <code>true</code> if the given leg's and this leg's attributes are the same.
    */
   public boolean sameValueAs(Leg other) {
-    if (carrierMovementId != null ? !carrierMovementId.equals(other.carrierMovementId) : other.carrierMovementId != null)
-      return false;
-    if (from != null ? !from.equals(other.from) : other.from != null) return false;
-    if (to != null ? !to.equals(other.to) : other.to != null) return false;
-
-    return true;
+    return other != null && new EqualsBuilder().
+      append(this.carrierMovementId, other.carrierMovementId).
+      append(this.from, other.from).
+      append(this.to, other.to).
+      isEquals();
   }
 
   @Override
@@ -54,10 +63,15 @@ public class Leg {
 
   @Override
   public int hashCode() {
-    int result;
-    result = (carrierMovementId != null ? carrierMovementId.hashCode() : 0);
-    result = 31 * result + (from != null ? from.hashCode() : 0);
-    result = 31 * result + (to != null ? to.hashCode() : 0);
-    return result;
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+
+  @Override
+  public String toString() {
+    return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+  }
+
+  Leg() {
+    // Needed by Hibernate
   }
 }

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

@@ -32,6 +32,7 @@ public class Location {
    * @throws IllegalArgumentException if the UN Locode or name is null
    */
   public Location(UnLocode unLocode, String name) {
+    Validate.noNullElements(new Object[] {unLocode, name});
     // TODO:
     // It shouldn't really be possible to create a new location -
     // it should only be looked up in the location repository.
@@ -101,11 +102,13 @@ public class Location {
    */
   @Override
   public String toString() {
+    // TODO: this is presentation logic and very inconsistent, move to DTO assembler
     return unLocode.idString() + " (" + name + ")";
   }
 
-  // Needed by Hibernate
+
   Location() {
+    // Needed by Hibernate
   }
 
 }

dddsample/src/main/java/se/citerus/dddsample/domain/StatusCode.java

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.domain;
 
 /**
- *
+ * These are the different status codes for a cargo.
  */
 public enum StatusCode {
-  notReceived, inPort, onBoardCarrier, claimed
+    NOT_RECIEVED, IN_PORT, ONBOARD_CARRIER, CLAIMED
 }

dddsample/src/main/java/se/citerus/dddsample/domain/TrackingId.java

@@ -40,7 +40,9 @@ public class TrackingId {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  // Needed by Hibernate
-  protected TrackingId() {}
+
+  TrackingId() {
+    // Needed by Hibernate
+  }
 
 }

dddsample/src/main/java/se/citerus/dddsample/domain/UnLocode.java

@@ -32,7 +32,7 @@ public class UnLocode {
   }
 
   private void validateArgs(String countryCode, String locationCode) {
-    Validate.noNullElements(Arrays.asList(countryCode, locationCode),
+    Validate.noNullElements(new Object[] {countryCode, locationCode},
             "Neither country code nor location code may be null");
     Validate.isTrue(countryCodePattern.matcher(countryCode).matches(),
       "\"" + countryCode + "\" is not a valid country code");
@@ -57,7 +57,7 @@ public class UnLocode {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  // Needed by Hibernate
   UnLocode() {
+    // Needed by Hibernate
   }
 }

dddsample/src/main/resources/messages_en.properties

@@ -1,4 +1,4 @@
-cargo.status.notReceived=Not received
-cargo.status.inPort=In port
-cargo.status.onBoardCarrier=Onboard carrier
-cargo.status.claimed=Claimed
+cargo.status.NOT_RECEIVED=Not received
+cargo.status.IN_PORT=In port
+cargo.status.ONBOARD_CARRIER=Onboard carrier
+cargo.status.CLAIMED=Claimed

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

@@ -86,7 +86,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoReceivedStockholm() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
 
-    HandlingEvent he = new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, stockholm);
+    HandlingEvent he = new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, stockholm, null);
     cargo.deliveryHistory().addEvent(he);
 
     return cargo;
@@ -95,7 +95,7 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoClaimedMelbourne() throws Exception {
     final Cargo cargo = populateCargoOffMelbourne();
 
-    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, melbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, melbourne, null));
 
     return cargo;
   }
@@ -200,13 +200,13 @@ public class CargoTest extends TestCase {
     CarrierMovement ghi = new CarrierMovement(new CarrierMovementId("GHI"), rotterdam, nyc);
 
     //Happy path
-    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai, null));
     handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, shanghai, abc));
     handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, rotterdam, abc));
     handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, rotterdam, def));
     handlingEvents.add(new HandlingEvent(cargo, new Date(90), new Date(100), HandlingEvent.Type.UNLOAD, goteborg, def));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(110), new Date(120), HandlingEvent.Type.CLAIM, goteborg));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(130), new Date(140), HandlingEvent.Type.CUSTOMS, goteborg));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(110), new Date(120), HandlingEvent.Type.CLAIM, goteborg, null));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(130), new Date(140), HandlingEvent.Type.CUSTOMS, goteborg, null));
 
     cargo.deliveryHistory().addAllEvents(handlingEvents);
     assertFalse(cargo.isMisdirected());
@@ -216,7 +216,7 @@ public class CargoTest extends TestCase {
     cargo = setUpCargoWithItinerary(shanghai, rotterdam, goteborg);
     handlingEvents = new ArrayList<HandlingEvent>();
 
-    handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, hangzhou));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, hangzhou, null));
     cargo.deliveryHistory().addAllEvents(handlingEvents);
     assertTrue(cargo.isMisdirected());
 
@@ -224,7 +224,7 @@ public class CargoTest extends TestCase {
     cargo = setUpCargoWithItinerary(shanghai, rotterdam, goteborg);
     handlingEvents = new ArrayList<HandlingEvent>();
 
-    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai, null));
     handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, shanghai, abc));
     handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, rotterdam, abc));
     handlingEvents.add(new HandlingEvent(cargo, new Date(70), new Date(80), HandlingEvent.Type.LOAD, rotterdam, ghi));
@@ -236,10 +236,10 @@ public class CargoTest extends TestCase {
     cargo = setUpCargoWithItinerary(shanghai, rotterdam, goteborg);
     handlingEvents = new ArrayList<HandlingEvent>();
 
-    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.RECEIVE, shanghai, null));
     handlingEvents.add(new HandlingEvent(cargo, new Date(30), new Date(40), HandlingEvent.Type.LOAD, shanghai, abc));
     handlingEvents.add(new HandlingEvent(cargo, new Date(50), new Date(60), HandlingEvent.Type.UNLOAD, rotterdam, abc));
-    handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, rotterdam));
+    handlingEvents.add(new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, rotterdam, null));
 
     cargo.deliveryHistory().addAllEvents(handlingEvents);
     assertTrue(cargo.isMisdirected());

dddsample/src/test/java/se/citerus/dddsample/domain/CarrierMovementIdTest.java

@@ -0,0 +1,14 @@
+package se.citerus.dddsample.domain;
+
+import junit.framework.TestCase;
+
+public class CarrierMovementIdTest extends TestCase {
+
+  public void testConstructor() throws Exception {
+    try {
+      new CarrierMovementId(null);
+      fail("Should not accept null constructor argument");
+    } catch (IllegalArgumentException expected) {}
+  }
+
+}

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

@@ -0,0 +1,55 @@
+package se.citerus.dddsample.domain;
+
+import junit.framework.TestCase;
+
+public class CarrierMovementTest extends TestCase {
+
+  Location stockholm = new Location(new UnLocode("SE", "STO"), "Stockholm");
+  Location hamburg = new Location(new UnLocode("DE", "HAM"), "Hamburg");
+
+  public void testConstructor() throws Exception {
+    CarrierMovementId id = new CarrierMovementId("CAR001");
+
+    try {
+      new CarrierMovement(null, null, null);
+      fail("Should not accept null constructor arguments");
+    } catch (IllegalArgumentException expected) {}
+
+    try {
+      new CarrierMovement(id, null, null);
+      fail("Should not accept null constructor arguments");
+    } catch (IllegalArgumentException expected) {}
+
+    try {
+      new CarrierMovement(id, stockholm, null);
+      fail("Should not accept null constructor arguments");
+    } catch (IllegalArgumentException expected) {}
+
+    // Legal
+    new CarrierMovement(id, stockholm, hamburg);
+  }
+
+  public void testSameValueAsEqualsHashCode() throws Exception {
+    CarrierMovementId id1 = new CarrierMovementId("CAR1");
+    CarrierMovementId id2a = new CarrierMovementId("CAR2");
+    CarrierMovementId id2b = new CarrierMovementId("CAR2");
+
+    CarrierMovement cm1 = new CarrierMovement(id1, stockholm, hamburg);
+    CarrierMovement cm2 = new CarrierMovement(id1, stockholm, hamburg);
+    CarrierMovement cm3 = new CarrierMovement(id2a, hamburg, stockholm);
+    CarrierMovement cm4 = new CarrierMovement(id2b, hamburg, stockholm);
+
+    assertTrue(cm1.sameIdentityAs(cm2));
+    assertFalse(cm2.sameIdentityAs(cm3));
+    assertTrue(cm3.sameIdentityAs(cm4));
+    
+    assertTrue(cm1.equals(cm2));
+    assertFalse(cm2.equals(cm3));
+    assertTrue(cm3.equals(cm4));
+
+    assertTrue(cm1.hashCode() == cm2.hashCode());
+    assertFalse(cm2.hashCode() == cm3.hashCode());
+    assertTrue(cm3.hashCode() == cm4.hashCode());
+  }
+
+}

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

@@ -8,19 +8,21 @@ import java.util.*;
 
 public class DeliveryHistoryTest extends TestCase {
   private Location ham = new Location(new UnLocode("DE", "HAM"), "Hamburg");
+  private Location from = new Location(new UnLocode("FR", "OMX"), "From");
+  private Location to = new Location(new UnLocode("TO", "XXX"), "To");
+  private Cargo cargo = new Cargo(new TrackingId("XYZ"), from, to);
+
 
   public void testEvensOrderedByTimeOccured() throws Exception {
     DeliveryHistory dh = new DeliveryHistory();
     assertTrue(dh.eventsOrderedByCompletionTime().isEmpty());
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    final Location from = new Location(new UnLocode("FR", "OMX"), "From");
-    final Location to = new Location(new UnLocode("TO", "XXX"), "To");
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), from, to);
-    HandlingEvent he1 = new HandlingEvent(null, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, to);
-    HandlingEvent he2 = new HandlingEvent(null, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, to, carrierMovement);
-    HandlingEvent he3 = new HandlingEvent(null, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, from);
-    HandlingEvent he4 = new HandlingEvent(null, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, from, carrierMovement);
+    HandlingEvent he1 = new HandlingEvent(cargo, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, to, null);
+    HandlingEvent he2 = new HandlingEvent(cargo, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, to, carrierMovement);
+    HandlingEvent he3 = new HandlingEvent(cargo, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, from, null);
+    HandlingEvent he4 = new HandlingEvent(cargo, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, from, carrierMovement);
     dh.addAllEvents(Arrays.asList(he1, he2, he3, he4));
 
     List<HandlingEvent> orderEvents = dh.eventsOrderedByCompletionTime();
@@ -34,20 +36,20 @@ public class DeliveryHistoryTest extends TestCase {
   public void testCargoStatusFromLastHandlingEvent() {
     DeliveryHistory deliveryHistory = new DeliveryHistory();
 
-    assertEquals(StatusCode.notReceived, deliveryHistory.status());
+    assertEquals(StatusCode.NOT_RECIEVED, deliveryHistory.status());
 
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(10), null, HandlingEvent.Type.RECEIVE, ham));
-    assertEquals(StatusCode.inPort, deliveryHistory.status());
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, ham, null));
+    assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
 
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), ham, ham);
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(20), null, HandlingEvent.Type.LOAD, ham, carrierMovement));
-    assertEquals(StatusCode.onBoardCarrier, deliveryHistory.status());
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, ham, carrierMovement));
+    assertEquals(StatusCode.ONBOARD_CARRIER, deliveryHistory.status());
 
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(30), null, HandlingEvent.Type.UNLOAD, ham, carrierMovement));
-    assertEquals(StatusCode.inPort, deliveryHistory.status());
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(30), new Date(31), HandlingEvent.Type.UNLOAD, ham, carrierMovement));
+    assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
 
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(40), null, HandlingEvent.Type.CLAIM, ham));
-    assertEquals(StatusCode.claimed, deliveryHistory.status());
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(40), new Date(41), HandlingEvent.Type.CLAIM, ham, null));
+    assertEquals(StatusCode.CLAIMED, deliveryHistory.status());
   }
 
   public void testCurrentLocation() throws Exception {
@@ -55,11 +57,11 @@ public class DeliveryHistoryTest extends TestCase {
 
     assertNull(deliveryHistory.currentLocation());
 
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(10), null, HandlingEvent.Type.RECEIVE, ham));
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, ham, null));
     assertEquals(ham, deliveryHistory.currentLocation());
 
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), ham, ham);
-    deliveryHistory.addEvent(new HandlingEvent(null, new Date(20), null, HandlingEvent.Type.LOAD, ham, carrierMovement));
+    deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, ham, carrierMovement));
     assertNull(deliveryHistory.currentLocation());
   }
 

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

@@ -12,9 +12,9 @@ public class HandlingEventTest extends TestCase {
   private final Location finalDestination = new Location(new UnLocode("TO","YYY"), "To");
   private final Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
   private final Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
+  private final Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
 
   public void testNewWithCarrierMovement() throws Exception {
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("C01"), origin, finalDestination);
 
     HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, origin, carrierMovement);
@@ -34,27 +34,23 @@ public class HandlingEventTest extends TestCase {
       // These event types requires a carrier movement association
     for (Type type : asList(LOAD, UNLOAD)) {
         try {
-          new HandlingEvent(cargo, new Date(), new Date(), type, origin);
+          new HandlingEvent(cargo, new Date(), new Date(), type, origin, null);
             fail("Handling event type " + type + " requires carrier movement");
         } catch (IllegalArgumentException expected) {}
     }
   }
 
   public void testNewWithLocation() throws Exception {
-    Location origin = this.origin;
-    Location finalDestination = this.finalDestination;
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
-
     Location location = new Location(new UnLocode("FO","OOO"), "Foo");
-    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), Type.CLAIM, location);
+    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), Type.CLAIM, location, null);
     assertEquals(location, e1.location());
   }
 
   public void testCurrentLocationLoadEvent() throws Exception {
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
-    
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), LOAD, a5, cm);
+
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), LOAD, a5, cm);
     
     assertEquals(a5, ev.location());
   }
@@ -62,19 +58,19 @@ public class HandlingEventTest extends TestCase {
   public void testCurrentLocationUnloadEvent() throws Exception {
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
-    
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), UNLOAD, b5, cm);
+
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, b5, cm);
     
     assertEquals(b5, ev.location());
   }
   
   public void testCurrentLocationReceivedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), RECEIVE, a5);
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), RECEIVE, a5, null);
 
     assertEquals(a5, ev.location());
   }
   public void testCurrentLocationClaimedEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(null, new Date(), new Date(), CLAIM, a5);
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), CLAIM, a5, null);
 
     assertEquals(a5, ev.location());
   }
@@ -101,8 +97,8 @@ public class HandlingEventTest extends TestCase {
     CarrierMovementId carrierMovementId = new CarrierMovementId("CAR_001");
     CarrierMovement cm = new CarrierMovement(carrierMovementId, a5, b5);
 
-    HandlingEvent ev1 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, a5, cm);
-    HandlingEvent ev2 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, a5, cm);
+    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, a5, cm);
+    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, a5, cm);
 
     // Two handling events are not equal() even if all non-uuid fields are identical
     assertTrue(ev1.equals(ev2));

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

@@ -33,7 +33,7 @@ public class ItineraryTest extends TestCase {
     );
 
     //Happy path
-    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, shanghai);
+    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, shanghai,null);
     assertTrue(itinerary.isExpected(event));
 
     event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, shanghai, abc);
@@ -48,15 +48,15 @@ public class ItineraryTest extends TestCase {
     event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, goteborg, def);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, goteborg);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, goteborg, null);
     assertTrue(itinerary.isExpected(event));
 
     //Customs event changes nothing
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, goteborg);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, goteborg, null);
     assertTrue(itinerary.isExpected(event));
 
     //Received at the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, hangzhou);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, hangzhou, null);
     assertFalse(itinerary.isExpected(event));
 
     //Loaded to onto the wrong ship, correct location
@@ -67,7 +67,7 @@ public class ItineraryTest extends TestCase {
     event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, longBeach, jkl);
     assertFalse(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, rotterdam);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, rotterdam, null);
     assertFalse(itinerary.isExpected(event));
 
   }

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

@@ -0,0 +1,13 @@
+package se.citerus.dddsample.domain;
+
+import junit.framework.TestCase;
+
+public class LegTest extends TestCase {
+
+  public void testConstructor() throws Exception {
+    try {
+      new Leg(null,null,null);
+      fail("Should not accept null constructor arguments");
+    } catch (IllegalArgumentException expected) {}
+  }
+}

dddsample/src/test/java/se/citerus/dddsample/domain/TrackingIdTest.java

@@ -0,0 +1,14 @@
+package se.citerus.dddsample.domain;
+
+import junit.framework.TestCase;
+
+public class TrackingIdTest extends TestCase {
+
+  public void testConstructor() throws Exception {
+    try {
+      new TrackingId(null);
+      fail("Should not accept null constructor arguments");
+    } catch (IllegalArgumentException expected) {}
+  }
+
+}

dddsample/src/test/java/se/citerus/dddsample/repository/HandlingEventRepositoryTest.java

@@ -30,7 +30,7 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     Cargo cargo = cargoRepository.find(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 = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location, null);
 
     handlingEventRepository.save(event);