Added check for adding HandlingEvents with the same timestamp. This will now cause a IllegalArgumentExcpetion to be thrown

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

@@ -6,6 +6,10 @@ import java.util.TreeSet;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
+/**
+ * A wrapper class that holds a sorted set of HandlingEvents. The set can not contain events with the same timestamp.
+ * 
+ */
 public class DeliveryHistory {
 
   private final SortedSet<HandlingEvent> events = new TreeSet<HandlingEvent>();
@@ -14,8 +18,16 @@ public class DeliveryHistory {
     return events;
   }
 
+  /**
+   * Adds the HandlingEvent to the sorted set.
+   * 
+   * @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) {
-    events.add(event);
+    if (!events.add(event)){
+      throw new IllegalArgumentException("HandlingEvent are not evaluated to be unique");
+    }
   }
 
   public HandlingEvent last() {

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

@@ -1,7 +1,5 @@
 package se.citerus.dddsample.repository;
 
-import se.citerus.dddsample.domain.*;
-
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -9,9 +7,14 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
 
+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;
+
 /**
  * CargoRepositoryInMem implement the CargoRepository interface but is a test
  * class not intended for usage in real application.

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

@@ -0,0 +1,24 @@
+package se.citerus.dddsample.domain;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import junit.framework.TestCase;
+
+public class DeliveryHistoryTest extends TestCase {
+  public void testAddEventUnique() throws Exception {
+    DeliveryHistory dh = new DeliveryHistory();
+    
+    DateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+
+    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);
+    }
+  }
+}