Removed the OR-mapped relation between DeliveryHistory and HandlingEvent, making DH a transient object. DH is populated by a repository call.

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

@@ -26,8 +26,8 @@ public class Cargo {
   @ManyToOne
   private Location finalDestination;
 
-  @Embedded
-  private DeliveryHistory deliveryHistory;
+  @Transient
+  private DeliveryHistory deliveryHistory = new DeliveryHistory();
 
   @OneToOne
   private Itinerary itinerary;
@@ -36,7 +36,6 @@ public class Cargo {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
-    this.deliveryHistory =  new DeliveryHistory();
   }
 
   /**

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

@@ -3,20 +3,14 @@ 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.
  *
  */
-@Embeddable
 public class DeliveryHistory {
 
-  @OneToMany
-  @JoinColumn(name = "cargo_id")
   private Set<HandlingEvent> events = new HashSet<HandlingEvent>();
 
   /**

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

@@ -10,16 +10,27 @@ import se.citerus.dddsample.domain.TrackingId;
 @Repository
 public class CargoRepositoryHibernate extends HibernateRepository implements CargoRepository {
 
+  HandlingEventRepository handlingEventRepository;
 
   public Cargo find(TrackingId trackingId) {
-    return (Cargo) getSession().
+    Cargo cargo = (Cargo) getSession().
             createQuery("from Cargo where trackingId = ?").
             setParameter(0, trackingId).
             uniqueResult();
+    /*
+        If this extra database call were a problem, you might want to use a different model.
+        For example, calculate the effect/status of the cargo and store it separate from the
+        handling events.
+     */
+    cargo.deliveryHistory().addAllEvents(handlingEventRepository.findEventsForCargo(trackingId));
+    return cargo;
   }
 
   public void save(Cargo cargo) {
     getSession().saveOrUpdate(cargo);
   }
 
+  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+    this.handlingEventRepository = handlingEventRepository;
+  }
 }

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

@@ -1,6 +1,9 @@
 package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
+
+import java.util.List;
 
 /**
  * Handling event repository.
@@ -15,4 +18,9 @@ public interface HandlingEventRepository {
    */
   void save(HandlingEvent event);
 
+  /**
+   * @param trackingId cargo tracking id
+   * @return All handling events for this cargo, ordered by completion time.
+   */
+  List<HandlingEvent> findEventsForCargo(TrackingId trackingId);
 }

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

@@ -2,6 +2,9 @@ package se.citerus.dddsample.repository;
 
 import org.springframework.stereotype.Repository;
 import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
+
+import java.util.List;
 
 /**
  * Hibernate implementation of HandlingEventRepository.
@@ -14,4 +17,11 @@ public class HandlingEventRepositoryHibernate extends HibernateRepository implem
     getSession().save(event);
   }
 
+  public List<HandlingEvent> findEventsForCargo(TrackingId tid) {
+    return getSession().createQuery(
+            "from HandlingEvent where cargo.trackingId = :tid order by completionTime").
+            setParameter("tid", tid).
+            list();
+  }
+
 }

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

@@ -8,10 +8,7 @@ import se.citerus.dddsample.domain.HandlingEvent.Type;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 public class HandlingEventRepositoryInMem implements HandlingEventRepository{
   private HashMap<String, HandlingEvent> eventDB;
@@ -111,6 +108,10 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     */
   }
 
+  public List<HandlingEvent> findEventsForCargo(TrackingId trackingId) {
+    return new ArrayList<HandlingEvent>(eventDB.values());
+  }
+
   public DeliveryHistory findDeliveryHistory(TrackingId trackingId) {
     return null;  //To change body of implemented methods use File | Settings | File Templates.
   }

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

@@ -18,6 +18,7 @@ public class HandlingEventServiceImpl implements HandlingEventService {
 
   @Transactional(readOnly = false)
   public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
+    // Carrier movement may be null for certain event types
     Validate.noNullElements(new Object[] {trackingId, unlocode, type});
 
     Cargo cargo = cargoRepository.find(trackingId);
@@ -28,23 +29,18 @@ public class HandlingEventServiceImpl implements HandlingEventService {
     Date registrationTime = new Date();
     HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
 
-    //DeliveryHistory deliveryHistory = deliveryHistoryRepository.findByTrackingId(trackingId);
-    //DeliveryHistory deliveryHistory = cargo.deliveryHistory();
-
-    //deliveryHistory.addEvent(event);
-    //deliveryHistoryRepository.save(deliveryHistory);
-
-    /*
-    HandlingEvent event;
-    if (carrierMovement != null) {
-      event = new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
-    } else {
-      event = new HandlingEvent(cargo, completionTime, registrationTime, type, location);
-    }
-    */
     handlingEventRepository.save(event);
 
-    //assert cargo.deliveryHistory().eventsOrderedByCompletionTime().contains(event); // <- FALSE here
+    /*
+      NOTE:
+        The cargo instance that's loaded and associated with the handling event is
+        in an inconsitent state, because the cargo delivery history's collection of
+        events does not contain the event created here. However, this is not a problem,
+        because cargo is in a different aggregate from handling event.
+        The rules of an aggregate dictate that all consistency rules within the aggregate
+        are enforced synchronously in the transaction, but consistency rules of other aggregates
+        are enforced by asynchronous updates, after the commit of this transaction.
+     */
   }
 
   private CarrierMovement findCarrierMovement(CarrierMovementId carrierMovementId) throws UnknownCarrierMovementIdException {

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

@@ -24,6 +24,7 @@
 
   <bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
+    <property name="handlingEventRepository" ref="handlingEventRepository"/>
   </bean>
 
   <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryHibernate">

dddsample/src/main/resources/hibernate.cfg.xml

@@ -15,7 +15,6 @@
     <mapping class="se.citerus.dddsample.domain.CarrierMovement"/>
     <mapping class="se.citerus.dddsample.domain.Itinerary"/>
     <mapping class="se.citerus.dddsample.domain.TrackingId"/>
-    <mapping class="se.citerus.dddsample.domain.DeliveryHistory"/>
     <mapping class="se.citerus.dddsample.domain.CarrierMovementId"/>
     <mapping class="se.citerus.dddsample.domain.UnLocode"/>
   </session-factory>

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

@@ -3,6 +3,7 @@ package se.citerus.dddsample.repository;
 import se.citerus.dddsample.domain.*;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
@@ -43,4 +44,9 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
     // TODO: the rest of the columns
   }
 
+  public void testFindEventsForCargo() throws Exception {
+    List<HandlingEvent> handlingEvents = handlingEventRepository.findEventsForCargo(new TrackingId("XYZ"));
+    assertEquals(12, handlingEvents.size());
+  }
+
 }