Made persistence configuration less intrusive by going with defaults everywhere, making it easier on the eyes. Empty default constructors are pushed to the bottom of the class.

Introduced CarrierId and embedded the DeliveryHistory in Cargo, aligning the persistence with the model as described in the DDD book.

Location.NULL changed name to Location.UNKNOWN.

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

@@ -5,7 +5,9 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 
 
 /**
@@ -13,27 +15,19 @@ import javax.persistence.*;
  * of convenience operation for finding current destination etc.
  */
 @Entity
-@Table(name = "cargo")
 public class Cargo {
 
   @EmbeddedId
   private TrackingId trackingId;
 
-  @ManyToOne(fetch = FetchType.EAGER)
-  @JoinColumn(name = "origin_location_fk")
+  @ManyToOne
   private Location origin;
-
-  @ManyToOne(fetch = FetchType.EAGER)
-  @JoinColumn(name = "final_destination_location_fk")
+  
+  @ManyToOne
   private Location finalDestination;
 
-  @OneToOne(fetch = FetchType.LAZY)
-  @JoinColumn(name = "delivery_history_fk")
   private DeliveryHistory history;
 
-  // Needed by Hibernate
-  Cargo() {}
-
   public Cargo(TrackingId trackingId, Location origin, Location finalDestination) {
     this.trackingId = trackingId;
     this.origin = origin;
@@ -55,11 +49,11 @@ public class Cargo {
   }
 
   public Location getCurrentLocation() {
-    HandlingEvent lastEvent = history.last();
+    HandlingEvent lastEvent = history.lastEvent();
     
     // If we have no last event, we have not even received the package. Return unknown location
     if (lastEvent == null) {
-      return Location.NULL;
+      return Location.UNKNOWN;
     }
    
     Location location = lastEvent.getLocation();
@@ -67,7 +61,7 @@ public class Cargo {
     // If the last handling event has no idea of where the cargo is due to lack of CarrierMovement (like for CLAIM or RECEIVE events)
     // location must be calculated based on event type and origin or final destination
     // TODO: Maybe we need to refactor HandlingEvent.
-    if (location == Location.NULL){
+    if (location == Location.UNKNOWN){
       location = (lastEvent.getType() == HandlingEvent.Type.CLAIM) ? finalDestination : origin;
     }
       
@@ -116,5 +110,7 @@ public class Cargo {
     .toHashCode();
   }
   
+  // Needed by Hibernate
+  Cargo() {}
   
 }

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

@@ -0,0 +1,35 @@
+package se.citerus.dddsample.domain;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import javax.persistence.Embeddable;
+import java.io.Serializable;
+
+/**
+ * Identifies a particular carrier (vehicle).
+ */
+@Embeddable
+public class CarrierId implements Serializable {
+
+  private String id;
+
+  public CarrierId(String id) {
+    this.id = id;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    return EqualsBuilder.reflectionEquals(this, obj);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+
+}

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

@@ -1,27 +1,32 @@
 package se.citerus.dddsample.domain;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
 
 @Entity
-@Table(name = "carrier_movement")
 public class CarrierMovement {
 
-  @Id
-  private Long id;
+  @EmbeddedId
+  private CarrierId carrierId;
 
-  @ManyToOne(fetch = FetchType.EAGER)
-  @JoinColumn(name = "from_location_fk")
-  private final Location from;
+  @ManyToOne
+  private Location from;
 
-  @ManyToOne(fetch = FetchType.EAGER)
-  @JoinColumn(name = "to_location_fk")
-  private final Location to;
+  @ManyToOne
+  private Location to;
 
-  public CarrierMovement(Location from, Location to) {
+  public CarrierMovement(CarrierId carrierId, Location from, Location to) {
+    this.carrierId = carrierId;
     this.from = from;
     this.to = to;
   }
 
+  public CarrierId carrierId() {
+    return carrierId;
+  }
+
   public Location from() {
     return from;
   }
@@ -30,4 +35,7 @@ public class CarrierMovement {
     return to;
   }
 
+  // Needed by Hibernate
+  CarrierMovement() {}
+
 }

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

@@ -2,31 +2,30 @@ package se.citerus.dddsample.domain;
 
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.hibernate.annotations.Sort;
-import org.hibernate.annotations.SortType;
 
-import javax.persistence.*;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import javax.persistence.Embeddable;
+import javax.persistence.OneToMany;
+import java.util.*;
 
 /**
  * A wrapper class that holds a sorted set of HandlingEvents. The set can not contain events with the same timestamp.
  * 
  */
-@Entity
-@Table(name = "delivery_history")
+@Embeddable
 public class DeliveryHistory {
 
-  @Id
-  private Long id;
+  @OneToMany
+  private final Set<HandlingEvent> events = new HashSet<HandlingEvent>();
 
-  @OneToMany(fetch = FetchType.EAGER)
-  @JoinColumn(name = "delivery_history_fk")
-  @Sort(type = SortType.NATURAL)
-  private final SortedSet<HandlingEvent> events = new TreeSet<HandlingEvent>();
+  private static final HandlingEventByTimeComparator HANDLING_EVENT_COMPARATOR = new HandlingEventByTimeComparator();
 
-  public SortedSet<HandlingEvent> getEvents() {
-    return events;
+  /**
+   * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
+   */
+  public List<HandlingEvent> eventsOrderedByTime() {
+    List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
+    Collections.sort(eventList, HANDLING_EVENT_COMPARATOR);
+    return Collections.unmodifiableList(eventList);
   }
 
   /**
@@ -35,18 +34,27 @@ public class DeliveryHistory {
    * @throws IllegalArgumentException if an event is not unique. Uniquness are evaluated by checking that compareTo() not returns 0.
    * @param event
    */
-  public void addEvent(HandlingEvent event) {
-    if (!events.add(event)){
-      throw new IllegalArgumentException("HandlingEvent are not evaluated to be unique");
-    }
+  public void addEvent(HandlingEvent... event) {
+      events.addAll(Arrays.asList(event));
   }
 
-  public HandlingEvent last() {
-    return events.isEmpty() ? null : events.last();
+  public HandlingEvent lastEvent() {
+    if (events.isEmpty()) {
+      return null;
+    } else {
+      List<HandlingEvent> orderedEvents = eventsOrderedByTime();
+      return orderedEvents.get(orderedEvents.size() - 1);
+    }
   }
 
   @Override
   public String toString() {
     return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
   }
+
+  private static class HandlingEventByTimeComparator implements Comparator<HandlingEvent> {
+    public int compare(HandlingEvent o1, HandlingEvent o2) {
+      return o1.getTime().compareTo(o2.getTime());
+    }
+  }
 }

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

@@ -17,21 +17,17 @@ import java.util.Set;
  * 
  */
 @Entity
-@Table(name = "handling_events")
-public class HandlingEvent implements Comparable<HandlingEvent> {
+public class HandlingEvent {
 
   @Id
   private Long id;
 
-  @Enumerated(value = EnumType.STRING)
-  @Column(name = "type")
+  @Enumerated
   private Type type;
 
-  @ManyToOne(fetch = FetchType.EAGER)
-  @JoinColumn(name = "carrier_movement_fk")
+  @ManyToOne
   private CarrierMovement carrierMovement;
   
-  @Column(name = "time")
   private Date time;
 
   @Transient /*TODO: Change to many-to-many if we decide on that approach*/
@@ -44,8 +40,9 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
   // Exclude the id field from equals() and hashcode()
   private static final String[] excludedFields = {"id"};
 
-  // Needed by Hibernate
-  HandlingEvent() {}
+  public HandlingEvent(Date time, Type type) {
+    this(time, type, null);
+  }
 
   public HandlingEvent(Date time, Type type, CarrierMovement carrierMovement) {
     this.time = time;
@@ -70,8 +67,8 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
    * Returns the Location of the Cargo. The location is calculated based on the following rules:
    * <br>For
    * <ul>
-   * <li> RECEIVE events: Location.NULL is returned. This basically means that the cargo is at its origin but not yet loaded on a CarrierMovment
-   * <li> CLAIM events: Location.NULL is returned. This means that the cargo is at its final destination and has been unloaded and claimed by the customer.
+   * <li> RECEIVE events: Location.UNKNOWN is returned. This basically means that the cargo is at its origin but not yet loaded on a CarrierMovment
+   * <li> CLAIM events: Location.UNKNOWN is returned. This means that the cargo is at its final destination and has been unloaded and claimed by the customer.
    * <li> LOAD events: The from Location is returned.
    * <li> UNLOAD events: The to Location is returned.
    * </ul> 
@@ -79,7 +76,7 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
    * @return The Location
    */
   public Location getLocation() {
-    Location location = Location.NULL;
+    Location location = Location.UNKNOWN;
     
     //My gosh! A switch statement....
     switch (type) {
@@ -103,7 +100,7 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
   /**
    * Register a set of Cargos
    * 
-   * @param cargos
+   * @param cargosToRegister
    */
   public void register(Set<Cargo> cargosToRegister) {
     this.cargos.addAll(cargosToRegister);
@@ -112,8 +109,7 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
   public Set<Cargo> getRegisterdCargos(){
     return cargos;
   }
-  
-  
+
   @Override
   public boolean equals(Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj, excludedFields);
@@ -121,15 +117,14 @@ public class HandlingEvent implements Comparable<HandlingEvent> {
 
   @Override
   public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this);
-  }
-
-  public int compareTo(HandlingEvent o) {
-    return time.compareTo(o.getTime());
+    return HashCodeBuilder.reflectionHashCode(this, excludedFields);
   }
 
   public static Type parseType(String type) {
     return Type.valueOf(type);
   }
 
+  // Needed by Hibernate
+  HandlingEvent() {}
+
 }

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

@@ -3,31 +3,24 @@ package se.citerus.dddsample.domain;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 @Entity
-@Table(name = "locations")
 public class Location {
   /**
-   * The NULL Location object
+   * Special Location object that marks an unknown location.
    */
-  public static final Location NULL = new Location("Unknown");
+  public static final Location UNKNOWN = new Location("Unknown");
 
   @Id
   private Long id;
 
-  @Column(name = "unlocode")
   private String unlocode;
 
   // Exclude the id field from equals() and hashcode()
   private static final String[] excludedFields = {"id"};
 
-  // Needed by Hibernate
-  Location() {}
-
   public Location(String unlocode) {
     this.unlocode = unlocode;
   }
@@ -38,7 +31,7 @@ public class Location {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == NULL || obj == NULL) {
+    if (this == UNKNOWN || obj == UNKNOWN) {
       return this == obj;
     }
     return EqualsBuilder.reflectionEquals(this, obj, excludedFields);
@@ -54,4 +47,7 @@ public class Location {
     return unlocode;
   }
 
+  // Needed by Hibernate
+  Location() {}
+
 }

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

@@ -3,7 +3,6 @@ package se.citerus.dddsample.domain;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import java.io.Serializable;
 
@@ -17,11 +16,8 @@ public class TrackingId implements Serializable {
 
   private static final long serialVersionUID = 6273117599327914522L;
 
-  @Column(name = "tracking_id")
   private String id;
 
-  TrackingId() {}
-
   public TrackingId(String id) {
     this.id = id;
   }

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierRepositoryInMem.java

@@ -1,10 +1,11 @@
 package se.citerus.dddsample.repository;
 
-import java.util.HashMap;
-
+import se.citerus.dddsample.domain.CarrierId;
 import se.citerus.dddsample.domain.CarrierMovement;
 import se.citerus.dddsample.domain.Location;
 
+import java.util.HashMap;
+
 public class CarrierRepositoryInMem implements CarrierRepository {
   private HashMap<String, CarrierMovement> carriers;
 
@@ -14,11 +15,16 @@ public class CarrierRepositoryInMem implements CarrierRepository {
   }
 
   private void setup() {
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHKG"));
-    final CarrierMovement melbourneToTokyo = new CarrierMovement(new Location("AUMEL"), new Location("JPTOK"));
-    final CarrierMovement tokyoToLosAngeles = new CarrierMovement(new Location("JPTOK"), new Location("USLA"));
-    final CarrierMovement stockholmToHelsinki = new CarrierMovement(new Location("SESTO"), new Location("FIHEL"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
+    final CarrierMovement melbourneToTokyo = new CarrierMovement(
+            new CarrierId("CAR_003"), new Location("AUMEL"), new Location("JPTOK"));
+    final CarrierMovement tokyoToLosAngeles = new CarrierMovement(
+            new CarrierId("CAR_004"), new Location("JPTOK"), new Location("USLA"));
+    final CarrierMovement stockholmToHelsinki = new CarrierMovement(
+            new CarrierId("CAR_005"), new Location("SESTO"), new Location("FIHEL"));
     
     carriers.put("SESTO_DEHAM", stockholmToHamburg);
     carriers.put("DEHAM_CNHKG", hamburgToHongKong);

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepositoryInMem.java

@@ -1,5 +1,10 @@
 package se.citerus.dddsample.repository;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.domain.HandlingEvent.Type;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -8,16 +13,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.domain.HandlingEvent.Type;
-
 public class HandlingEventRepositoryInMem implements HandlingEventRepository{
   private HashMap<String, HandlingEvent> eventDB;
   private CarrierRepository carrierRepository;
@@ -64,7 +59,9 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("SESTO"), new Location("FIHEL"));
     registerEvent(cargoABC, "2008-01-01", HandlingEvent.Type.RECEIVE, null);
     
-    final CarrierMovement stockholmToHelsinki = new CarrierMovement(new Location("SESTO"), new Location("FIHEL"));
+    final CarrierMovement stockholmToHelsinki = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("FIHEL"));
+
     registerEvent(cargoABC, "2008-01-02", HandlingEvent.Type.LOAD, stockholmToHelsinki);
     registerEvent(cargoABC, "2008-01-03", HandlingEvent.Type.UNLOAD, stockholmToHelsinki);
     registerEvent(cargoABC, "2008-01-05", HandlingEvent.Type.CLAIM, null);

dddsample/src/main/resources/context-persistence.xml

@@ -21,7 +21,6 @@
       <list>
         <value>se.citerus.dddsample.domain.Cargo</value>
         <value>se.citerus.dddsample.domain.Location</value>
-        <value>se.citerus.dddsample.domain.DeliveryHistory</value>
         <value>se.citerus.dddsample.domain.HandlingEvent</value>
         <value>se.citerus.dddsample.domain.CarrierMovement</value>
       </list>

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

@@ -17,10 +17,10 @@ public class CargoRepositoryTest extends AbstractTransactionalDataSourceSpringCo
 
   protected void onSetUpInTransaction() throws Exception {
     String[] testData = {
-            "INSERT INTO locations (id, unlocode) VALUES (1, 'SESTO')",
-            "INSERT INTO locations (id, unlocode) VALUES (2, 'CNHKG')",
+            "INSERT INTO Location (id, unlocode) VALUES (1, 'SESTO')",
+            "INSERT INTO Location (id, unlocode) VALUES (2, 'CNHKG')",
 
-            "INSERT INTO cargo (tracking_id, origin_location_fk, final_destination_location_fk) " +
+            "INSERT INTO Cargo (id, origin_id, finalDestination_id) " +
                     "VALUES ('XYZ', 1, 2)"
     };
     jdbcTemplate.batchUpdate(testData);

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

@@ -14,7 +14,7 @@ public class CargoTest extends TestCase {
     Location origin = new Location("SESTO");
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, destination);
 
-    assertEquals(Location.NULL, cargo.getCurrentLocation());
+    assertEquals(Location.UNKNOWN, cargo.getCurrentLocation());
   }
   
   public void testCurrentLocationReceived() throws Exception {
@@ -85,12 +85,14 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoOffHongKong() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
     cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
     cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
@@ -101,12 +103,14 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoOnHamburg() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
     cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
 
@@ -116,17 +120,20 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoOffMelbourne() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
     cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
     cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
-    final CarrierMovement hongKongToMelbourne = new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
+    final CarrierMovement hongKongToMelbourne = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.LOAD, hongKongToMelbourne));
     cargo.handle(new HandlingEvent(getDate("2007-12-07"), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
@@ -137,17 +144,20 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoOnHongKong() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
     cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHGK"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
     cargo.handle(new HandlingEvent(getDate("2007-12-04"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
-    final CarrierMovement hongKongToMelbourne = new CarrierMovement(new Location("CNHGK"), new Location("AUMEL"));
+    final CarrierMovement hongKongToMelbourne = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.LOAD, hongKongToMelbourne));
 

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

@@ -1,24 +1,29 @@
 package se.citerus.dddsample.domain;
 
+import junit.framework.TestCase;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-
-import junit.framework.TestCase;
+import java.util.List;
 
 public class DeliveryHistoryTest extends TestCase {
-  public void testAddEventUnique() throws Exception {
+
+  public void testEvensOrderedByTime() throws Exception {
     DeliveryHistory dh = new DeliveryHistory();
-    
-    DateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+    assertTrue(dh.eventsOrderedByTime().isEmpty());
+
+    DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+    HandlingEvent he1 = new HandlingEvent(df.parse("2010-01-03"), HandlingEvent.Type.RECEIVE);
+    HandlingEvent he2 = new HandlingEvent(df.parse("2010-01-01"), HandlingEvent.Type.LOAD);
+    HandlingEvent he3 = new HandlingEvent(df.parse("2010-01-04"), HandlingEvent.Type.CLAIM);
+    HandlingEvent he4 = new HandlingEvent(df.parse("2010-01-02"), HandlingEvent.Type.UNLOAD);
+    dh.addEvent(he1, he2, he3, he4);
 
-    dh.addEvent(new HandlingEvent(f.parse("2010-01-01"), HandlingEvent.Type.RECEIVE, null));
-    
-    // Expect exception to be thrown when unique events are added (e.g. same timestamp)
-    try {
-      dh.addEvent(new HandlingEvent(f.parse("2010-01-01"), HandlingEvent.Type.LOAD, null));
-      assertFalse(true);
-    } catch (RuntimeException e) {
-      assertTrue(true);
-    }
+    List<HandlingEvent> orderEvents = dh.eventsOrderedByTime();
+    assertEquals(4, orderEvents.size());
+    assertSame(he2, orderEvents.get(0));
+    assertSame(he4, orderEvents.get(1));
+    assertSame(he1, orderEvents.get(2));
+    assertSame(he3, orderEvents.get(3));
   }
 }

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

@@ -1,18 +1,19 @@
 package se.citerus.dddsample.domain;
 
+import junit.framework.TestCase;
+import se.citerus.dddsample.domain.HandlingEvent.Type;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import se.citerus.dddsample.domain.HandlingEvent.Type;
-import junit.framework.TestCase;
-
 public class HandlingEventTest extends TestCase {
   public void testCurrentLocationLoadEvent() throws Exception {
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
-    CarrierMovement cm = new CarrierMovement(locationAAA, locationBBB);
+    CarrierId carrierId = new CarrierId("CAR_001");
+    CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
     HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.LOAD, cm);
     
@@ -22,7 +23,8 @@ public class HandlingEventTest extends TestCase {
   public void testCurrentLocationUnloadEvent() throws Exception {
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
-    CarrierMovement cm = new CarrierMovement(locationAAA, locationBBB);
+    CarrierId carrierId = new CarrierId("CAR_001");
+    CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
     HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.UNLOAD, cm);
     
@@ -32,12 +34,12 @@ public class HandlingEventTest extends TestCase {
   public void testCurrentLocationReceivedEvent() throws Exception {
     HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.RECEIVE, null);
 
-    assertEquals(Location.NULL, ev.getLocation());
+    assertEquals(Location.UNKNOWN, ev.getLocation());
   }
   public void testCurrentLocationClaimedEvent() throws Exception {
     HandlingEvent ev = new HandlingEvent(null, HandlingEvent.Type.CLAIM, null);
 
-    assertEquals(Location.NULL, ev.getLocation());
+    assertEquals(Location.UNKNOWN, ev.getLocation());
   }
   
   public void testParseType() throws Exception {
@@ -60,7 +62,8 @@ public class HandlingEventTest extends TestCase {
     Date date = Calendar.getInstance().getTime();
     Location locationAAA = new Location("AAA");
     Location locationBBB = new Location("BBB");
-    CarrierMovement cm = new CarrierMovement(locationAAA, locationBBB);
+    CarrierId carrierId = new CarrierId("CAR_001");
+    CarrierMovement cm = new CarrierMovement(carrierId, locationAAA, locationBBB);
     
     Cargo cargo1 = new Cargo(new TrackingId("ABC"), new Location("A"), new Location("C"));
     Cargo cargo2 = new Cargo(new TrackingId("CBA"), new Location("C"), new Location("A"));

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

@@ -19,13 +19,13 @@ public class LocationTest extends TestCase {
     assertFalse(location.equals(null));
 
     // Special NULL location is equal to itself
-    assertTrue(Location.NULL.equals(Location.NULL));
+    assertTrue(Location.UNKNOWN.equals(Location.UNKNOWN));
 
     // No other location should be equal to the NULL location
-    assertFalse(new Location(null).equals(Location.NULL));
-    assertFalse(new Location("").equals(Location.NULL));
-    assertFalse(new Location("   ").equals(Location.NULL));
-    assertFalse(new Location("   FOO  BAR ").equals(Location.NULL));
+    assertFalse(new Location(null).equals(Location.UNKNOWN));
+    assertFalse(new Location("").equals(Location.UNKNOWN));
+    assertFalse(new Location("   ").equals(Location.UNKNOWN));
+    assertFalse(new Location("   FOO  BAR ").equals(Location.UNKNOWN));
   }
 
 }

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

@@ -6,7 +6,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.SortedSet;
+import java.util.List;
 
 public class TrackingScenarioTest extends TestCase {
 
@@ -16,10 +16,11 @@ public class TrackingScenarioTest extends TestCase {
 
     DeliveryHistory deliveryHistory = cargo.getDeliveryHistory();
 
-    SortedSet<HandlingEvent> handlingEvents = deliveryHistory.getEvents();
+    List<HandlingEvent> handlingEvents = deliveryHistory.eventsOrderedByTime();
 
     assertEquals(4, handlingEvents.size());
-    final HandlingEvent event = handlingEvents.last();
+    final HandlingEvent event = deliveryHistory.lastEvent();
+
     assertSame(HandlingEvent.Type.UNLOAD, event.getType());
     assertFalse(cargo.atFinalDestiation());
     assertEquals("CNHKG", cargo.getCurrentLocation().unlocode());
@@ -29,12 +30,14 @@ public class TrackingScenarioTest extends TestCase {
   private Cargo populateCargo() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-    final CarrierMovement stockholmToHamburg = new CarrierMovement(new Location("SESTO"), new Location("DEHAM"));
+    final CarrierMovement stockholmToHamburg = new CarrierMovement(
+            new CarrierId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-01"), HandlingEvent.Type.LOAD, stockholmToHamburg));
     cargo.handle(new HandlingEvent(getDate("2007-12-02"), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
-    final CarrierMovement hamburgToHongKong = new CarrierMovement(new Location("DEHAM"), new Location("CNHKG"));
+    final CarrierMovement hamburgToHongKong = new CarrierMovement(
+            new CarrierId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
 
     cargo.handle(new HandlingEvent(getDate("2007-12-03"), HandlingEvent.Type.LOAD, hamburgToHongKong));
     cargo.handle(new HandlingEvent(getDate("2007-12-05"), HandlingEvent.Type.UNLOAD, hamburgToHongKong));

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

@@ -1,20 +1,16 @@
 package se.citerus.dddsample.service;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 import junit.framework.TestCase;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.TrackingId;
+import static org.easymock.EasyMock.*;
+import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
-import static org.easymock.EasyMock.*;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 public class HandlingEventServiceTest extends TestCase {
   private HandlingEventServiceImpl service;
@@ -24,7 +20,8 @@ public class HandlingEventServiceTest extends TestCase {
   
   private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("ABCFROM"), new Location("ABCTO"));
   private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XYZFROM"), new Location("XYZTO"));
-  private final CarrierMovement cmAAA_BBB = new CarrierMovement(new Location("AAA"), new Location("BBB"));
+  private final CarrierMovement cmAAA_BBB = new CarrierMovement(
+          new CarrierId("CAR_001"), new Location("AAA"), new Location("BBB"));
 
   protected void setUp() throws Exception{
     service = new HandlingEventServiceImpl();