Moved the HandlingEvent Comparator from DeliveryHistory to HandlingEvent

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

@@ -13,7 +13,7 @@ public class DeliveryHistory {
 
   private final Set<HandlingEvent> events;
 
-  private static final HandlingEventByTimeComparator HANDLING_EVENT_COMPARATOR = new HandlingEventByTimeComparator();
+ 
 
   public DeliveryHistory() {
     this(Collections.<HandlingEvent>emptySet());
@@ -37,7 +37,7 @@ public class DeliveryHistory {
    */
   public List<HandlingEvent> eventsOrderedByTime() {
     List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
-    Collections.sort(eventList, HANDLING_EVENT_COMPARATOR);
+    Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
     return Collections.unmodifiableList(eventList);
   }
 
@@ -58,9 +58,5 @@ public class DeliveryHistory {
     return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
   }
 
-  private static class HandlingEventByTimeComparator implements Comparator<HandlingEvent> {
-    public int compare(HandlingEvent o1, HandlingEvent o2) {
-      return o1.completionTime().compareTo(o2.completionTime());
-    }
-  }
+
 }

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

@@ -1,9 +1,16 @@
 package se.citerus.dddsample.domain;
 
-import javax.persistence.*;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.UUID;
 
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
 /**
  * HandlingEvent links the type of handling with a CarrierMovement.
  * 
@@ -14,6 +21,14 @@ import java.util.UUID;
  */
 @Entity
 public class HandlingEvent {
+  /**
+   * Comparator used to be able to sort HandlingEvents according to their completion time
+   */
+  public static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR = new Comparator<HandlingEvent>(){
+    public int compare(HandlingEvent o1, HandlingEvent o2) {
+      return o1.completionTime().compareTo(o2.completionTime());
+    }
+  };
 
   @Id
   private String id;

dddsample/src/main/java/se/citerus/dddsample/util/SampleDataGenerator.java

@@ -42,7 +42,7 @@ public class SampleDataGenerator implements ServletContextListener {
         {UUID.randomUUID().toString().getBytes(), new Timestamp(100), new Timestamp(101), "UNLOAD", 2, "CAR_005", "XYZ"},        
         {UUID.randomUUID().toString().getBytes(), new Timestamp(110), new Timestamp(111), "CLAIM", 2, null, "XYZ"},
             
-        //ZYX (AUMEL - USCHI - DEHAM - SESTO)
+        //ZYX (AUMEL - USCHI - DEHAM -)
         {UUID.randomUUID().toString().getBytes(), new Timestamp(0), new Timestamp(1), "RECEIVE", 2, null, "ZYX"},  
         {UUID.randomUUID().toString().getBytes(), new Timestamp(10), new Timestamp(11), "LOAD", 2, "CAR_007", "ZYX"},
         {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "UNLOAD", 7, "CAR_007", "ZYX"},
@@ -52,6 +52,8 @@ public class SampleDataGenerator implements ServletContextListener {
         
         //ABC
         {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "CLAIM", 2, null, "ABC"}
+        
+        //CBA
     };
     for (Object[] handlingEventArg : handlingEventArgs) {
       jdbcTemplate.update(handlingEventSql, handlingEventArg);

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

@@ -44,10 +44,10 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     DeliveryHistory dh = handlingEventRepository.findDeliveryHistory(new TrackingId("XYZ"));
 
     assertNotNull(dh);
-    assertEquals(1, dh.eventsOrderedByTime().size());
+    assertEquals(12, dh.eventsOrderedByTime().size());
     HandlingEvent lastEvent = dh.lastEvent();
     assertNotNull(lastEvent);
-    assertEquals("SESTO", lastEvent.location().unlocode());
+    assertEquals("AUMEL", lastEvent.location().unlocode());
     // TODO: the rest of the properties, and maybe a longer list of events
   }
 }