Made Cargo-HandlingEvent relation bidirectional again, with DeliveryHistory in the middle.

Restored Cargo.lastKnownLocation() and Cargo.hasArrived().

All entities have sequential identifiers with no domain meaning. Equals and hashcode rely on business logic unrelated to persistence state.

Removed findDeliveryHistory from HaEvRepo since it's now OR-mapped.

Improved javadoc.

dddsample/pom.xml

@@ -102,12 +102,22 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-webmvc</artifactId>
       <version>2.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
+      <artifactId>spring-orm</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
       <version>2.5</version>
     </dependency>
     <dependency>
@@ -142,6 +152,11 @@
       <version>1.1</version>
     </dependency>
     <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.2</version>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.8.0.7</version>

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

@@ -1,23 +1,23 @@
 package se.citerus.dddsample.domain;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 
 
 /**
- * A Cargo an entity identifed by TrackingId and is capable of getting its DeliveryHistory plus a number
- * of convenience operation for finding current destination etc.
+ * A Cargo.
+ *
  */
 @Entity
 public class Cargo {
 
-  @EmbeddedId
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  @Embedded
   private TrackingId trackingId;
 
   @ManyToOne
@@ -26,22 +26,61 @@ public class Cargo {
   @ManyToOne
   private Location finalDestination;
 
+  @Embedded
+  private DeliveryHistory deliveryHistory;
+
   public Cargo(TrackingId trackingId, Location origin, Location finalDestination) {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
+    this.deliveryHistory =  new DeliveryHistory();
   }
 
+  /**
+   * @return Tracking id.
+   */
   public TrackingId trackingId() {
-    return trackingId;
+    return this.trackingId;
   }
 
+  /**
+   * @return Origin location.
+   */
   public Location origin() {
-    return origin;
+    return this.origin;
   }
 
+  /**
+   * @return Final destination.
+   */
   public Location finalDestination() {
-    return finalDestination;
+    return this.finalDestination;
+  }
+
+  /**
+   * @return Delivery history.
+   */
+  public DeliveryHistory deliveryHistory() {
+    return this.deliveryHistory;
+  }
+
+  /**
+   * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
+   */
+  public Location lastKnownLocation() {
+    HandlingEvent lastEvent = deliveryHistory.lastEvent();
+    if (lastEvent != null) {
+      return lastEvent.location();
+    } else {
+      return Location.UNKNOWN;
+    }
+  }
+
+  /**
+   * @return True if the cargo has arrived at its final destination.
+   */
+  public boolean hasArrived() {
+    return finalDestination.equals(lastKnownLocation());
   }
 
   @Override
@@ -49,29 +88,27 @@ public class Cargo {
     return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
   }
 
+  /**
+   * @param object to compare
+   * @return True if tracking ids are equal.
+   */
   @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof Cargo)) {
+  public boolean equals(Object object) {
+    if (!(object instanceof Cargo)) {
       return false;
     }
-    Cargo rhs = (Cargo) obj;
-    return new EqualsBuilder()
-      .append(trackingId, rhs.trackingId)
-      .append(origin, rhs.origin)
-      .append(finalDestination, rhs.finalDestination)
-      .isEquals();
+    Cargo other = (Cargo) object;
+    return trackingId.equals(other.trackingId);
   }
 
+  /**
+   * @return Hash code of tracking id.
+   */
   @Override
   public int hashCode() {
-    return new HashCodeBuilder(7, 39)
-    .append(trackingId)
-    .append(origin)
-    .append(finalDestination)
-    .toHashCode();
+    return trackingId.hashCode();
   }
-  
+
   // Needed by Hibernate
   Cargo() {}
-  
 }

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

@@ -1,14 +1,20 @@
 package se.citerus.dddsample.domain;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 
 
+/**
+ * A carrier movement is a vessel voyage from one location to another.
+ *
+ */
 @Entity
 public class CarrierMovement {
 
-  @EmbeddedId
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  @Embedded
   private CarrierMovementId carrierMovementId;
 
   @ManyToOne

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

@@ -3,21 +3,26 @@ 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;
 
 /**
- * Identifies a particular carrier (vehicle).
+ * Identifies a particular carrier movement, such as a flight number.
+ *
  */
 @Embeddable
-public class CarrierMovementId implements Serializable {
+public class CarrierMovementId {
 
+  @Column(name = "carrier_movement_id")
   private String id;
 
   public CarrierMovementId(String id) {
     this.id = id;
   }
 
+  /**
+   * @return String representation of this carrier movement id.
+   */
   public String idString() {
     return id;
   }
@@ -32,6 +37,7 @@ public class CarrierMovementId implements Serializable {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  // needed by hibernate
-  public CarrierMovementId() {}
+  // Needed by hibernate
+  CarrierMovementId() {}
+
 }

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

@@ -3,25 +3,21 @@ package se.citerus.dddsample.domain;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
+import javax.persistence.Embeddable;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
 import java.util.*;
 
 /**
- * The delivery history of a cargo. This is a value object.
+ * The delivery history of a cargo.
  *
  */
+@Embeddable
 public class DeliveryHistory {
 
-  private final Set<HandlingEvent> events;
-
- 
-
-  public DeliveryHistory() {
-    this(Collections.<HandlingEvent>emptySet());
-  }
-
-  public DeliveryHistory(Collection<HandlingEvent> events) {
-    this.events = new HashSet<HandlingEvent>(events);
-  }
+  @OneToMany
+  @JoinColumn(name = "cargo_id")
+  private Set<HandlingEvent> events = new HashSet<HandlingEvent>();
 
   /**
    * Adds the HandlingEvent to the sorted set.
@@ -35,7 +31,7 @@ public class DeliveryHistory {
   /**
    * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
    */
-  public List<HandlingEvent> eventsOrderedByTime() {
+  public List<HandlingEvent> eventsOrderedByCompletionTime() {
     List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
     Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
     return Collections.unmodifiableList(eventList);
@@ -48,7 +44,7 @@ public class DeliveryHistory {
     if (events.isEmpty()) {
       return null;
     } else {
-      List<HandlingEvent> orderedEvents = eventsOrderedByTime();
+      List<HandlingEvent> orderedEvents = eventsOrderedByCompletionTime();
       return orderedEvents.get(orderedEvents.size() - 1);
     }
   }
@@ -58,5 +54,7 @@ public class DeliveryHistory {
     return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
   }
 
+  // Needed by Hibernate
+  DeliveryHistory() {}
 
 }

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

@@ -1,15 +1,10 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+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.
@@ -24,14 +19,15 @@ 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 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;
+  @GeneratedValue
+  private Long id;
 
   @Enumerated(EnumType.STRING)
   private Type type;
@@ -47,7 +43,7 @@ public class HandlingEvent {
   private Date registrationTime;
 
   @ManyToOne
-  @JoinColumn
+  @JoinColumn(name = "cargo_id")
   private Cargo cargo;
 
   public enum Type {
@@ -55,7 +51,6 @@ public class HandlingEvent {
   }
 
   private HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type) {
-    this.id = UUID.randomUUID().toString();
     this.registrationTime = registrationTime;
     this.completionTime = completionTime;
     this.type = type;
@@ -100,7 +95,7 @@ public class HandlingEvent {
     }
   }
 
-  public String id() {
+  public Long id() {
     return this.id;
   }
 
@@ -128,19 +123,42 @@ public class HandlingEvent {
     return this.cargo;
   }
 
+  /**
+   * @param object to compare
+   * @return True if location, completion time and type are equal.
+   */
   @Override
-  public boolean equals(Object obj) {
-    return (obj instanceof HandlingEvent) &&
-            sameIdentityAs((HandlingEvent) obj);
-  }
-
-  public boolean sameIdentityAs(HandlingEvent other) {
-    return other != null && id.equals(other.id);
+  public boolean equals(Object object) {
+    if (object == null) {
+      return false;
+    }
+    if (!(object instanceof HandlingEvent)) {
+      return false;
+    }
+    HandlingEvent other = (HandlingEvent) object;
+    return this.location.equals(other.location) &&
+           this.completionTime.equals(other.completionTime) &&
+           this.type.equals(other.type);
   }
 
+  /**
+   * @return Hash code calculated from the same properties as equals().
+   */
   @Override
   public int hashCode() {
-    return id.hashCode();
+    return new HashCodeBuilder(7, 39).
+            append(this.location).
+            append(this.completionTime).
+            append(this.type).
+            toHashCode();
+  }
+
+  /**
+   * @param other to compare
+   * @return True if the ids are equal.
+   */
+  public boolean sameIdentityAs(HandlingEvent other) {
+    return other != null && id.equals(other.id);
   }
 
   // Needed by Hibernate

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

@@ -1,8 +1,5 @@
 package se.citerus.dddsample.domain;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -20,28 +17,42 @@ public class Location {
 
   private String unlocode;
 
-  // Exclude the id field from equals() and hashcode()
-  private static final String[] excludedFields = {"id"};
-
   public Location(String unlocode) {
     this.unlocode = unlocode;
   }
 
+  /**
+   * @return United Nations Location Code for this location.
+   */
   public String unlocode() {
     return unlocode;
   }
 
+  /**
+   * @param object to compare
+   * @return True if unlocodes are equal.
+   */
   @Override
-  public boolean equals(Object obj) {
-    if (this == UNKNOWN || obj == UNKNOWN) {
-      return this == obj;
+  public boolean equals(Object object) {
+    if (object == null) {
+      return false;
+    }
+    if (this == UNKNOWN || object == UNKNOWN) {
+      return this == object;
+    }
+    if (!(object instanceof Location)) {
+      return false;
     }
-    return EqualsBuilder.reflectionEquals(this, obj, excludedFields);
+    Location other = (Location) object;
+    return this.unlocode.equals(other.unlocode);
   }
 
+  /**
+   * @return Hash code of unlocode.
+   */
   @Override
   public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this, excludedFields);
+    return unlocode.hashCode();
   }
 
   @Override

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

@@ -3,25 +3,26 @@ 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;
 
 /**
- * TrackingId is a simple ID wrapper which implements Serializable for easier
- * integration with persistence frameworks.
- * 
+ * Identifies a particular cargo.
+ *
  */
 @Embeddable
-public class TrackingId implements Serializable {
-
-  private static final long serialVersionUID = 6273117599327914522L;
+public class TrackingId {
 
+  @Column(name = "tracking_id")
   private String id;
 
   public TrackingId(String id) {
     this.id = id;
   }
 
+  /**
+   * @return String representation of this tracking id.
+   */
   public String idString() {
     return id;
   }

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

@@ -12,7 +12,10 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
 
 
   public Cargo find(TrackingId trackingId) {
-    return (Cargo) getSession().get(Cargo.class, trackingId);
+    return (Cargo) getSession().
+            createQuery("from Cargo where trackingId = ?").
+            setParameter(0, trackingId).
+            uniqueResult();
   }
 
   public void save(Cargo cargo) {

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

@@ -12,7 +12,10 @@ import se.citerus.dddsample.domain.CarrierMovementId;
 public class CarrierMovementRepositoryHibernate extends HibernateRepository implements CarrierMovementRepository {
 
   public CarrierMovement find(CarrierMovementId carrierMovementId) {
-    return (CarrierMovement) getSession().get(CarrierMovement.class, carrierMovementId);
+    return (CarrierMovement) getSession().
+            createQuery("from CarrierMovement where carrierMovementId = ?").
+            setParameter(1, carrierMovementId).
+            uniqueResult();
   }
 
 }

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

@@ -1,8 +1,6 @@
 package se.citerus.dddsample.repository;
 
-import se.citerus.dddsample.domain.DeliveryHistory;
 import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
 
 /**
  * Handling event repository.
@@ -17,10 +15,4 @@ public interface HandlingEventRepository {
    */
   void save(HandlingEvent event);
 
-  /**
-   * @param trackingId cargo tracking id
-   * @return The delivery history of the cargo with the given tracking id.
-   */
-  DeliveryHistory findDeliveryHistory(TrackingId trackingId);
-
 }

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

@@ -1,11 +1,7 @@
 package se.citerus.dddsample.repository;
 
 import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.DeliveryHistory;
 import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
-
-import java.util.List;
 
 /**
  * Hibernate implementation of HandlingEventRepository.
@@ -18,12 +14,4 @@ public class HandlingEventRepositoryHibernate extends HibernateRepository implem
     getSession().save(event);
   }
 
-  public DeliveryHistory findDeliveryHistory(TrackingId trackingId) {
-    List list = getSession().createQuery(
-            "from HandlingEvent he where he.cargo.trackingId = :tid").
-            setParameter("tid", trackingId).
-            list();
-    return new DeliveryHistory(list);
-  }
-
 }

dddsample/src/main/java/se/citerus/dddsample/service/CargoServiceImpl.java

@@ -1,9 +1,11 @@
 package se.citerus.dddsample.service;
 
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.CarrierMovement;
+import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.HandlingEventRepository;
 import se.citerus.dddsample.service.dto.CargoWithHistoryDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
 
@@ -11,7 +13,6 @@ import java.util.List;
 
 public class CargoServiceImpl implements CargoService {
   private CargoRepository cargoRepository;
-  private HandlingEventRepository handlingEventRepository;
 
   @Transactional(readOnly = true)
   public CargoWithHistoryDTO find(String trackingId) {
@@ -20,8 +21,7 @@ public class CargoServiceImpl implements CargoService {
     if (cargo == null) {
       return null;
     }
-    DeliveryHistory deliveryHistory = handlingEventRepository.findDeliveryHistory(tid);
-    HandlingEvent lastEvent = deliveryHistory.lastEvent();
+    HandlingEvent lastEvent = cargo.deliveryHistory().lastEvent();
     String currentLocation;
     if (lastEvent != null) {
       currentLocation = lastEvent.location().unlocode();
@@ -34,7 +34,7 @@ public class CargoServiceImpl implements CargoService {
             cargo.finalDestination().unlocode(),
             currentLocation
     );
-    final List<HandlingEvent> events = deliveryHistory.eventsOrderedByTime();
+    final List<HandlingEvent> events = cargo.deliveryHistory().eventsOrderedByCompletionTime();
     for (HandlingEvent event : events) {
       CarrierMovement cm = event.carrierMovement();
       String carrierIdString = (cm == null) ? "" : cm.carrierId().idString();
@@ -52,8 +52,4 @@ public class CargoServiceImpl implements CargoService {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
 }

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

@@ -2,6 +2,10 @@ package se.citerus.dddsample.util;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -9,115 +13,121 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.sql.DataSource;
 import java.sql.Timestamp;
-import java.util.UUID;
 
 /**
  * Provides sample data.
  */
 public class SampleDataGenerator implements ServletContextListener {
 
-  public static void loadSampleData(JdbcTemplate jdbcTemplate) {
-    loadLocationData(jdbcTemplate);
-    loadCargoData(jdbcTemplate);
-    loadCarrierMovementData(jdbcTemplate);
-    loadHandlingEventData(jdbcTemplate);
-  }
-
   private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
     String handlingEventSql =
-      "insert into HandlingEvent (id, completionTime, registrationTime, type, location_id, carrierMovement_id, cargo_id) " +
-      "values (?, ?, ?, ?, ?, ?, ?)";
+      "insert into HandlingEvent (completionTime, registrationTime, type, location_id, carrierMovement_id, cargo_id) " +
+      "values (?, ?, ?, ?, ?, ?)";
     Object[][] handlingEventArgs = {
         //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(0), new Timestamp(1), "RECEIVE", 1, null, "XYZ"},  
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(10), new Timestamp(11), "LOAD", 1, "CAR_001", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "UNLOAD", 5, "CAR_001", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(30), new Timestamp(31), "LOAD", 5, "CAR_002", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(40), new Timestamp(41), "UNLOAD", 6, "CAR_002", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(50), new Timestamp(51), "LOAD", 6, "CAR_003", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(60), new Timestamp(61), "UNLOAD", 3, "CAR_003", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(70), new Timestamp(71), "LOAD", 3, "CAR_004", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(80), new Timestamp(81), "UNLOAD", 4, "CAR_004", "XYZ"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(90), new Timestamp(91), "LOAD", 4, "CAR_005", "XYZ"},
-        {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"},
-            
+        {ts(0),     ts((1)),    "RECEIVE",  1,  null,  1},
+        {ts((10)),  ts((11)),   "LOAD",     1,  1,     1},
+        {ts((20)),  ts((21)),   "UNLOAD",   5,  1,     1},
+        {ts((30)),  ts((31)),   "LOAD",     5,  2,     1},
+        {ts((40)),  ts((41)),   "UNLOAD",   6,  2,     1},
+        {ts((50)),  ts((51)),   "LOAD",     6,  3,     1},
+        {ts((60)),  ts((61)),   "UNLOAD",   3,  3,     1},
+        {ts((70)),  ts((71)),   "LOAD",     3,  4,     1},
+        {ts((80)),  ts((81)),   "UNLOAD",   4,  4,     1},
+        {ts((90)),  ts((91)),   "LOAD",     4,  5,     1},
+        {ts((100)), ts((101)),  "UNLOAD",   2,  5,     1},
+        {ts((110)), ts((111)),  "CLAIM",    2,  null,  1},
+
         //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"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(30), new Timestamp(31), "LOAD", 7, "CAR_008", "ZYX"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(40), new Timestamp(41), "UNLOAD", 6, "CAR_008", "ZYX"},
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(50), new Timestamp(51), "LOAD", 6, "CAR_009", "ZYX"},
-        
+        {ts((0)),   ts((1)),    "RECEIVE",  2,  null,  3},
+        {ts((10)),  ts((11)),   "LOAD",     2,  7,     3},
+        {ts((20)),  ts((21)),   "UNLOAD",   7,  7,     3},
+        {ts((30)),  ts((31)),   "LOAD",     7,  8,     3},
+        {ts((40)),  ts((41)),   "UNLOAD",   6,  8,     3},
+        {ts((50)),  ts((51)),   "LOAD",     6,  9,     3},
+
         //ABC
-        {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "CLAIM", 2, null, "ABC"}
-        
+        {ts((20)),  ts((21)),   "CLAIM",    2,  null,  2}
+
         //CBA
     };
-    for (Object[] handlingEventArg : handlingEventArgs) {
-      jdbcTemplate.update(handlingEventSql, handlingEventArg);
-    }
+    executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
   }
 
   private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
-    String carrierMovementSql = "insert into CarrierMovement (id, from_id, to_id) values (?,?,?)";
+    String carrierMovementSql = "insert into CarrierMovement (id, carrier_movement_id, from_id, to_id) values (?,?,?,?)";
     Object[][] carrierMovementArgs = {
      // SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL
-      {"CAR_001",1,5}, 
-      {"CAR_002",5,6},
-      {"CAR_003",6,3},
-      {"CAR_004",3,4},
-      {"CAR_005",4,2},
-      
+      {1, "CAR_001",1,5},
+      {2, "CAR_002",5,6},
+      {3, "CAR_003",6,3},
+      {4, "CAR_004",3,4},
+      {5, "CAR_005",4,2},
+
       // FIHEL - SESTO
-      {"CAR_006",5,1},
-      
+      {6, "CAR_006",5,1},
+
       // AUMEL - USCHI - DEHAM - SESTO
-      {"CAR_007",2,7}, 
-      {"CAR_008",7,6},
-      {"CAR_009",6,1}
+      {7, "CAR_007",2,7},
+      {8, "CAR_008",7,6},
+      {9, "CAR_009",6,1}
     };
-    for (Object[] carrierMovementArg : carrierMovementArgs) {
-      jdbcTemplate.update(carrierMovementSql, carrierMovementArg);
-    }
+    executeUpdate(jdbcTemplate, carrierMovementSql, carrierMovementArgs);
   }
 
   private static void loadCargoData(JdbcTemplate jdbcTemplate) {
-    String cargoSql = "insert into Cargo (id, origin_id, finalDestination_id) values (?, ?, ?)";
+    String cargoSql = "insert into Cargo (id, tracking_id, origin_id, finalDestination_id) values (?, ?, ?, ?)";
     Object[][] cargoArgs = {
-      {"XYZ",1,2},
-      {"ABC",1,5},
-      {"ZYX",2,1},
-      {"CBA",5,1}
+      {1, "XYZ",1,2},
+      {2, "ABC",1,5},
+      {3, "ZYX",2,1},
+      {4, "CBA",5,1}
     };
-    for (Object[] cargoArg : cargoArgs) {
-      jdbcTemplate.update(cargoSql, cargoArg);
-    }
+    executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
   }
 
   private static void loadLocationData(JdbcTemplate jdbcTemplate) {
     String locationSql = "insert into Location (id, unlocode) values (?, ?)";
     Object[][] locationArgs = {
-      {1L, "SESTO"},
-      {2L, "AUMEL"},
-      {3L, "CNHKG"},
-      {4L, "JPTOK"},
-      {5L, "FIHEL"},
-      {6L, "DEHAM"},
-      {7L, "USCHI"}
+      {1, "SESTO"},
+      {2, "AUMEL"},
+      {3, "CNHKG"},
+      {4, "JPTOK"},
+      {5, "FIHEL"},
+      {6, "DEHAM"},
+      {7, "USCHI"}
     };
-    for (Object[] locationArg : locationArgs) {
-      jdbcTemplate.update(locationSql, locationArg);
-    }
+    executeUpdate(jdbcTemplate, locationSql, locationArgs);
   }
 
   public void contextInitialized(ServletContextEvent event) {
     WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
     DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
-    loadSampleData(new JdbcTemplate(dataSource));
+    PlatformTransactionManager transactionManager = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
+    loadSampleData(new JdbcTemplate(dataSource), new TransactionTemplate(transactionManager));
   }
 
   public void contextDestroyed(ServletContextEvent event) {}
 
+  public static void loadSampleData(final JdbcTemplate jdbcTemplate, TransactionTemplate transactionTemplate) {
+    transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+      protected void doInTransactionWithoutResult(TransactionStatus status) {
+        loadLocationData(jdbcTemplate);
+        loadCargoData(jdbcTemplate);
+        loadCarrierMovementData(jdbcTemplate);
+        loadHandlingEventData(jdbcTemplate);
+      }
+    });
+  }
+
+  private static void executeUpdate(JdbcTemplate jdbcTemplate, String sql, Object[][] args) {
+    for (Object[] arg : args) {
+      jdbcTemplate.update(sql, arg);
+    }
+  }
+
+  private static Timestamp ts(int time) {
+    return new Timestamp(time);
+  }
+
 }

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

@@ -8,11 +8,13 @@
     <property name="location" value="classpath:jdbc.properties"/>
   </bean>
 
-  <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     <property name="url" value="${jdbc.url}"/>
     <property name="driverClassName" value="${jdbc.driverClassName}"/>
     <property name="username" value="${jdbc.username}"/>
     <property name="password" value="${jdbc.password}"/>
+    <property name="initialSize" value="4"/>
+    <property name="defaultAutoCommit" value="false"/>
   </bean>
 
   <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">

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

@@ -15,7 +15,6 @@
 
   <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="handlingEventRepository" ref="handlingEventRepository"/>
   </bean>
 
   <bean id="handlingEventService" class="se.citerus.dddsample.service.HandlingEventServiceImpl">

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

@@ -9,48 +9,54 @@ import java.util.Date;
 
 public class CargoTest extends TestCase {
 
-  public void testCurrentLocationUnknownWhenNoEvents() throws Exception {
+  // TODO:
+  // it seems that events are not added to the system by cargo.deliveryHistory().addEvent(),
+  // but rather new HandlingEvents are stored and associated with its cargo. This test should
+  // work against the repositories or the service layer. The delivery history of a cargo should be
+  // read-only from the cargo end. // PeBa
+
+  public void testlastKnownLocationUnknownWhenNoEvents() throws Exception {
     Location destination = new Location("AUMEL");
     Location origin = new Location("SESTO");
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, destination);
 
-//    assertEquals(Location.UNKNOWN, cargo.currentLocation());
+    assertEquals(Location.UNKNOWN, cargo.lastKnownLocation());
   }
   
-  public void testCurrentLocationReceived() throws Exception {
+  public void testlastKnownLocationReceived() throws Exception {
     Cargo cargo = populateCargoReceivedStockholm();
 
-//    assertEquals(new Location("SESTO"), cargo.currentLocation());
+    assertEquals(new Location("SESTO"), cargo.lastKnownLocation());
   }
 
-  public void testCurrentLocationClaimed() throws Exception {
+  public void testlastKnownLocationClaimed() throws Exception {
     Cargo cargo = populateCargoClaimedMelbourne();
 
-//    assertEquals(new Location("AUMEL"), cargo.currentLocation());
+    assertEquals(new Location("AUMEL"), cargo.lastKnownLocation());
   }
   
-  public void testCurrentLocationUnloaded() throws Exception {
+  public void testlastKnownLocationUnloaded() throws Exception {
     Cargo cargo = populateCargoOffHongKong();
 
-//    assertEquals(new Location("CNHGK"), cargo.currentLocation());
+    assertEquals(new Location("CNHGK"), cargo.lastKnownLocation());
   }
 
-  public void testCurrentLocationloaded() throws Exception {
+  public void testlastKnownLocationloaded() throws Exception {
     Cargo cargo = populateCargoOnHamburg();
 
-//    assertEquals(new Location("DEHAM"), cargo.currentLocation());
+    assertEquals(new Location("DEHAM"), cargo.lastKnownLocation());
   }
 
   public void testAtFinalLocation() throws Exception {
     Cargo cargo = populateCargoOffMelbourne();
 
-//    assertTrue(cargo.atFinalDestiation());
+    assertTrue(cargo.hasArrived());
   }
 
   public void testNotAtFinalLocationWhenNotUnloaded() throws Exception {
     Cargo cargo = populateCargoOnHongKong();
 
-//    assertFalse(cargo.atFinalDestiation());
+    assertFalse(cargo.hasArrived());
   }
   
   public void testEquality() throws Exception {
@@ -59,16 +65,17 @@ public class CargoTest extends TestCase {
     Cargo c3 = new Cargo(new TrackingId("ABC"), new Location("A"), new Location("X"));
     Cargo c4 = new Cargo(new TrackingId("ABC"), new Location("A"), new Location("C"));
 
-    assertTrue("TrackingID, origin and finalDestnation should be equal if Cargos are considered equal", c1.equals(c4));
+    assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c4));
+    assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c3));
+    assertTrue("Cargos should be equal when TrackingIDs are equal", c3.equals(c4));
     assertFalse("Cargos are not equal when TrackingID differ", c1.equals(c2));
-    assertFalse("Cargos are not equal when Locations differ", c2.equals(c3));
   }
 
   // TODO: Generate test data some better way
   private Cargo populateCargoReceivedStockholm() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, null));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, new Location("SESTO")));
 
     return cargo;
   }
@@ -76,26 +83,25 @@ public class CargoTest extends TestCase {
   private Cargo populateCargoClaimedMelbourne() throws Exception {
     final Cargo cargo = populateCargoOffMelbourne();
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, null));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-09"), new Date(), HandlingEvent.Type.CLAIM, new Location("AUMEL")));
     
     return cargo;
   }
   
-  // TODO: Generate test data some better way
   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 CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     return cargo;
   }
@@ -106,13 +112,13 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
 
     return cargo;
   }
@@ -123,20 +129,20 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-07"), new Date(), HandlingEvent.Type.UNLOAD, hongKongToMelbourne));
 
     return cargo;
   }
@@ -147,19 +153,19 @@ public class CargoTest extends TestCase {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholmToHamburg));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, stockholmToHamburg));
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("DEHAM"), new Location("CNHGK"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburgToHongKong));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-04"), new Date(), HandlingEvent.Type.UNLOAD, hamburgToHongKong));
 
     final CarrierMovement hongKongToMelbourne = new CarrierMovement(
             new CarrierMovementId("CAR_001"), new Location("CNHGK"), new Location("AUMEL"));
 
-//    cargo.handle(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
+    cargo.deliveryHistory().addEvent(new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.LOAD, hongKongToMelbourne));
 
     return cargo;
   }

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

@@ -11,7 +11,7 @@ public class DeliveryHistoryTest extends TestCase {
 
   public void testEvensOrderedByTimeOccured() throws Exception {
     DeliveryHistory dh = new DeliveryHistory();
-    assertTrue(dh.eventsOrderedByTime().isEmpty());
+    assertTrue(dh.eventsOrderedByCompletionTime().isEmpty());
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
     CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), new Location("FROM"), new Location("TO"));
@@ -21,7 +21,7 @@ public class DeliveryHistoryTest extends TestCase {
     HandlingEvent he4 = new HandlingEvent(null, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, carrierMovement);
     dh.addEvent(he1, he2, he3, he4);
 
-    List<HandlingEvent> orderEvents = dh.eventsOrderedByTime();
+    List<HandlingEvent> orderEvents = dh.eventsOrderedByCompletionTime();
     assertEquals(4, orderEvents.size());
     assertSame(he2, orderEvents.get(0));
     assertSame(he4, orderEvents.get(1));

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

@@ -102,10 +102,13 @@ public class HandlingEventTest extends TestCase {
     HandlingEvent ev2 = new HandlingEvent(null, timeOccured, timeRegistered, LOAD, cm);
 
     // Two handling events are not equal() even if all non-uuid fields are identical
-    assertFalse(ev1.equals(ev2));
-    assertFalse(ev2.equals(ev1));
+    assertTrue(ev1.equals(ev2));
+    assertTrue(ev2.equals(ev1));
 
     assertTrue(ev1.equals(ev1));
+
+    assertFalse(ev2.equals(null));
+    assertFalse(ev2.equals(new Object()));
   }
 
 }

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

@@ -16,7 +16,7 @@ public class TrackingScenarioTest extends TestCase {
 
     DeliveryHistory deliveryHistory = populateDeliveryHistory(cargo);
 
-    List<HandlingEvent> handlingEvents = deliveryHistory.eventsOrderedByTime();
+    List<HandlingEvent> handlingEvents = deliveryHistory.eventsOrderedByCompletionTime();
 
     assertEquals(4, handlingEvents.size());
     final HandlingEvent event = deliveryHistory.lastEvent();

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

@@ -4,6 +4,7 @@ import org.hibernate.SessionFactory;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
+import org.springframework.transaction.support.TransactionTemplate;
 import se.citerus.dddsample.util.SampleDataGenerator;
 
 public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSourceSpringContextTests {
@@ -31,7 +32,7 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
 
   @Override
   protected void onSetUpInTransaction() throws Exception {
-    SampleDataGenerator.loadSampleData(jdbcTemplate);
+    SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
     sjt = new SimpleJdbcTemplate(jdbcTemplate);
   }
 

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

@@ -24,6 +24,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     assertEquals(trackingId, cargo.trackingId());
     assertEquals(origin, cargo.origin());
     assertEquals(finalDestination, cargo.finalDestination());
+    // TODO: verify delivery history
   }
 
   public void testSave() {
@@ -39,9 +40,9 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     flush();
 
-    Map<String, Object> map = jdbcTemplate.queryForMap("select * from Cargo where id = 'AAA'");
+    Map<String, Object> map = sjt.queryForMap("select * from Cargo where tracking_id = 'AAA'");
 
-    assertEquals("AAA", map.get("ID"));
+    assertEquals("AAA", map.get("TRACKING_ID"));
     // TODO: check origin/finalDestination ids
   }
 

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

@@ -1,6 +1,9 @@
 package se.citerus.dddsample.repository;
 
-import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.TrackingId;
 
 import java.util.Date;
 import java.util.Map;
@@ -33,21 +36,11 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     flush();
 
     Map<String,Object> result = sjt.queryForMap("select * from HandlingEvent where id = ?", event.id());
-    assertEquals("XYZ", result.get("CARGO_ID"));
+    assertEquals(1L, result.get("CARGO_ID"));
     assertEquals(new Date(10), result.get("COMPLETIONTIME"));
     assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
     assertEquals("CLAIM", result.get("TYPE"));
     // TODO: the rest of the columns
   }
 
-  public void testFindDeliveryHistory() {
-    DeliveryHistory dh = handlingEventRepository.findDeliveryHistory(new TrackingId("XYZ"));
-
-    assertNotNull(dh);
-    assertEquals(12, dh.eventsOrderedByTime().size());
-    HandlingEvent lastEvent = dh.lastEvent();
-    assertNotNull(lastEvent);
-    assertEquals("AUMEL", lastEvent.location().unlocode());
-    // TODO: the rest of the properties, and maybe a longer list of events
-  }
 }

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

@@ -71,6 +71,13 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
    */
   public void testCargoServiceFindByTrackingIdScenario() {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("ORIG"), new Location("DEST"));
+    HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, new Location("SESTO"));
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("MUGER"));
+    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, carrierMovement);
+    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, carrierMovement);
+    // Add out of order to verify ordering in DTO
+    cargo.deliveryHistory().addEvent(loaded, unloaded, claimed);
+
     final IAnswer<Cargo> cargoAnswer = new TransactionVerifyingAnswer<Cargo>() {
       public Cargo answerWithinTransaction() throws Throwable {
         return cargo;
@@ -78,22 +85,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
     };
     expect(cargoRepository.find(new TrackingId("XYZ"))).andAnswer(cargoAnswer);
 
-    final IAnswer<DeliveryHistory> deliveryHistoryAnswer = new TransactionVerifyingAnswer<DeliveryHistory>() {
-      protected DeliveryHistory answerWithinTransaction() throws Throwable {
-        DeliveryHistory dh = new DeliveryHistory();
-        HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, new Location("SESTO"));
-        CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("MUGER"));
-        HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, carrierMovement);
-        HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, carrierMovement);
-
-        // Add out of order to verify ordering in DTO
-        dh.addEvent(loaded, unloaded, claimed);
-        return dh;
-      }
-    };
-    expect(handlingEventRepository.findDeliveryHistory(new TrackingId("XYZ"))).andAnswer(deliveryHistoryAnswer);
-
-    replay(cargoRepository, handlingEventRepository);
+    replay(cargoRepository);
 
 
     // Tested call