Asynchronous update of the Cargo aggregate. Several properties of the Cargo aggregate are now calculated and persisted, on handling (asynchronously) and on changes to routing (synchronously, since that's inside the cargo aggregate).

Relation between Cargo and its complete delivery history (handling events) is now replaced by explicit repository lookup at the time of cargo status update.

The copy() method on value objects is removed.

All enums in the cargo are now value objects.

dddsample/src/main/java/se/citerus/dddsample/application/TrackingService.java

@@ -15,6 +15,7 @@ public interface TrackingService {
    * @param trackingId cargo tracking id
    */
   // TODO rename! The method updates the delivery status on handling
+  // TODO [Cargo]InspectionService is fine 
   void inspectCargo(TrackingId trackingId);
 
 }

dddsample/src/main/java/se/citerus/dddsample/application/impl/TrackingServiceImpl.java

@@ -9,20 +9,28 @@ import se.citerus.dddsample.application.TrackingService;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+
+import java.util.List;
 
 public class TrackingServiceImpl implements TrackingService {
 
   private final ApplicationEvents applicationEvents;
   private final CargoRepository cargoRepository;
+  private final HandlingEventRepository handlingEventRepository;
   private final Log logger = LogFactory.getLog(getClass());
 
-  public TrackingServiceImpl(final ApplicationEvents applicationEvents, final CargoRepository cargoRepository) {
+  public TrackingServiceImpl(final ApplicationEvents applicationEvents,
+                             final CargoRepository cargoRepository,
+                             final HandlingEventRepository handlingEventRepository) {
     this.applicationEvents = applicationEvents;
     this.cargoRepository = cargoRepository;
+    this.handlingEventRepository = handlingEventRepository;
   }
 
   @Override
-  @Transactional(readOnly = true)
+  @Transactional
   public void inspectCargo(final TrackingId trackingId) {
     Validate.notNull(trackingId, "Tracking ID is required");
 
@@ -32,7 +40,8 @@ public class TrackingServiceImpl implements TrackingService {
       return;
     }
 
-    // TODO cargo delivery status update would happen here
+    final List<HandlingEvent> deliveryHistory = handlingEventRepository.findEventsForCargo(trackingId);
+    cargo.updateStatus(deliveryHistory);
 
     if (cargo.isMisdirected()) {
       applicationEvents.cargoWasMisdirected(cargo);

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

@@ -120,16 +120,16 @@ public class SampleDataGenerator implements ServletContextListener {
 
   private static void loadCargoData(JdbcTemplate jdbcTemplate) {
     String cargoSql =
-      "insert into Cargo (id, tracking_id, origin_id, spec_origin_id, spec_destination_id, spec_arrival_deadline) " +
-      "values (?, ?, ?, ?, ?, ?)";
+      "insert into Cargo (id, tracking_id, origin_id, spec_origin_id, spec_destination_id, spec_arrival_deadline, transport_status, current_voyage_id, last_known_location_id, is_misdirected, routing_status) " +
+      "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
     Object[][] cargoArgs = {
-      {1, "XYZ", 1, 1, 2, ts(10)},
-      {2, "ABC", 1, 1, 5, ts(20)},
-      {3, "ZYX", 2, 2, 1, ts(30)},
-      {4, "CBA", 5, 5, 1, ts(40)},
-      {5, "FGH", 1, 3, 5, ts(50)},  // Cargo origin differs from spec origin
-      {6, "JKL", 6, 6, 4, ts(60)}
+      {1, "XYZ", 1, 1, 2, ts(10), "IN_PORT", null, 1, false, "ROUTED"},
+      {2, "ABC", 1, 1, 5, ts(20), "IN_PORT", null, 1, false, "ROUTED"},
+      {3, "ZYX", 2, 2, 1, ts(30), "IN_PORT", null, 1, false, "NOT_ROUTED"},
+      {4, "CBA", 5, 5, 1, ts(40), "IN_PORT", null, 1, false, "MISROUTED"},
+      {5, "FGH", 1, 3, 5, ts(50), "IN_PORT", null, 1, false, "ROUTED"},  // Cargo origin differs from spec origin
+      {6, "JKL", 6, 6, 4, ts(60), "IN_PORT", null, 1, true, "ROUTED"}
     };
     executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/ValueObject.java

@@ -16,11 +16,4 @@ public interface ValueObject<T> extends Serializable {
    */
   boolean sameValueAs(T other);
 
-  /**
-   * Value objects may be freely copied.
-   *
-   * @return A deep copy of this object.
-   */
-  T copy();
-
 }

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

@@ -7,21 +7,24 @@ import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * A Cargo. This is the central class in the domain model,
- * and it is the root of the Cargo-Itinerary-Leg-DeliveryHistory aggregate.
+ * and it is the root of the Cargo-Itinerary-Leg-Delivery-RouteSpecification aggregate.
  *
  * A cargo is identified by a unique tracking id, and it always has an origin
- * and a destination. The life cycle of a cargo begins with the booking procedure,
+ * and a route specification. The life cycle of a cargo begins with the booking procedure,
  * when the tracking id is assigned. During a (short) period of time, between booking
  * and initial routing, the cargo has no itinerary.
  *
- * The booking clerk requests a list of possible routes, matching a route specification,
- * and assigns the cargo to one route. An itinerary listing the legs of the route
- * is attached to the cargo.
+ * The booking clerk requests a list of possible routes, matching the route specification,
+ * and assigns the cargo to one route. The route to which a cargo is assigned is described
+ * by an itinerary.
  *
  * A cargo can be re-routed during transport, on demand of the customer, in which case
- * the destination is changed and a new route is requested. The old itinerary,
+ * a new route is specified for the cargo and a new route is requested. The old itinerary,
  * being a value object, is discarded and a new one is attached.
  *
  * It may also happen that a cargo is accidentally misrouted, which should notify the proper
@@ -42,6 +45,8 @@ public class Cargo implements Entity<Cargo> {
   private Itinerary itinerary;
   private Delivery delivery;
   private RouteSpecification routeSpecification;
+  private RoutingStatus routingStatus;
+  private boolean misdirected;
 
   // TODO origin can be taken from route spec on creation, even if the origin never changes
   public Cargo(final TrackingId trackingId, final Location origin, final RouteSpecification routeSpecification) {
@@ -52,9 +57,9 @@ public class Cargo implements Entity<Cargo> {
     this.trackingId = trackingId;
     this.origin = origin;
     this.routeSpecification = routeSpecification;
+    updateStatus(Collections.<HandlingEvent>emptyList());
   }
 
-
   /**
    * The tracking id is the identity of this entity, and is unique.
    * 
@@ -93,21 +98,16 @@ public class Cargo implements Entity<Cargo> {
   }
   
   /**
-   * @return True if the cargo has arrived at its destination.
-   */
-  public boolean hasArrived() {
-    return routeSpecification.destination().equals(delivery.lastKnownLocation());
-  }
-
-  /**
-   * Specifies a route for this cargo.
+   * Specifies a new route for this cargo.
    *
    * @param routeSpecification route specification.
    */
-  public void specifyRoute(RouteSpecification routeSpecification) {
+  public void specifyNewRoute(final RouteSpecification routeSpecification) {
     Validate.notNull(routeSpecification);
 
     this.routeSpecification = routeSpecification;
+    // Handling consistency within the Cargo aggregate synchronously
+    updateRoutingStatus();
   }
 
   /**
@@ -116,16 +116,12 @@ public class Cargo implements Entity<Cargo> {
    * @param itinerary an itinerary. May not be null.
    */
   public void assignToRoute(final Itinerary itinerary) {
-    Validate.notNull(itinerary);
-    this.itinerary = itinerary;
-  }
+    Validate.notNull(itinerary, "Itinerary is required for assignment");
 
-  /**
-   * @param delivery Cargo delivery history
-   */
-  void setDeliveryHistory(final Delivery delivery) {
-    Validate.notNull(delivery);
-    this.delivery = delivery;
+    this.itinerary = itinerary;
+    // Handling consistency within the Cargo aggregate synchronously
+    updateRoutingStatus();
+    updateIsMisdirected();
   }
 
   /**
@@ -140,44 +136,70 @@ public class Cargo implements Entity<Cargo> {
    * @return <code>true</code> if the cargo has been misdirected,
    */
   public boolean isMisdirected() {
+    return misdirected;
+  }
+
+  private void updateIsMisdirected() {
     final HandlingEvent lastEvent = delivery().lastEvent();
     if (lastEvent == null) {
-      return false;
+      misdirected = false;
     } else {
-      return !itinerary().isExpected(lastEvent);
+      misdirected = !itinerary().isExpected(lastEvent);
     }
   }
 
+
   /**
    * @return Routing status.
    */
   public RoutingStatus routingStatus() {
+    return routingStatus;
+  }
+
+  /**
+   * Updates the routing status.
+   */
+  private void updateRoutingStatus() {
     if (itinerary == null) {
-      return NOT_ROUTED;
+      routingStatus = NOT_ROUTED;
     } else {
       if (routeSpecification.isSatisfiedBy(itinerary)) {
-        return ROUTED;
+        routingStatus = ROUTED;
       } else {
-        return MISROUTED;
+        routingStatus = MISROUTED;
       }
     }
   }
 
   /**
-   * Does not take into account the possibility of the cargo having been
-   * (errouneously) loaded onto another carrier after it has been unloaded
-   * at the final destination.
-   *
    * @return True if the cargo has been unloaded at the final destination.
    */
   public boolean isUnloadedAtDestination() {
-    for (HandlingEvent event : delivery().history()) {
-      if (HandlingEvent.Type.UNLOAD.equals(event.type())
-        && routeSpecification.destination().equals(event.location())) {
-        return true;
-      }
-    }
-    return false;
+    final HandlingEvent lastEvent = delivery.lastEvent();
+    return lastEvent != null &&
+           HandlingEvent.Type.UNLOAD.sameValueAs(lastEvent.type()) &&
+           routeSpecification.destination().sameIdentityAs(lastEvent.location());
+  }
+
+  /**
+   * Updates all aspects of the cargo aggregate status
+   * based on the current route specification, itinerary and delivery history.
+   * <p/>
+   * When either of those three changes, i.e. when a new route is specified for the cargo,
+   * the cargo is assigned to a route or when the cargo is handled, the status must be
+   * re-calculated.
+   * <p/>
+   * {@link RouteSpecification} and {@link Itinerary} are both inside the Cargo
+   * aggregate, so changes to them cause the status to be updated <b>synchronously</b>,
+   * but changes to the delivery history (when a cargo is handled) cause the status update
+   * to happen <b>asynchronously</b> since {@link HandlingEvent} is in a different aggregate.
+   * @param handlingEvents
+   */
+  public void updateStatus(final List<HandlingEvent> handlingEvents) {
+    // Delivery is a value object, so we can simply discard the old one and replace with a new
+    delivery = Delivery.derivedFrom(handlingEvents);
+    updateRoutingStatus();
+    updateIsMisdirected();
   }
 
   @Override

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -28,7 +28,7 @@ public interface CargoRepository {
 
   /**
    * TODO
-   * this is too complex a procedure to belong in the repository -
+   * this might be too complex a procedure to belong in the repository -
    * introduce a TrackingIdFactory (or perhaps a CargoFactory).
    *
    * @return A new generated tracking Id.

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Delivery.java

@@ -1,12 +1,21 @@
 package se.citerus.dddsample.domain.model.cargo;
 
+import org.apache.commons.lang.Validate;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.ValueObject;
 import static se.citerus.dddsample.domain.model.cargo.TransportStatus.*;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import static java.util.Collections.EMPTY_SET;
+import static java.util.Collections.sort;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * The actual result of the cargo transportation, as opposed to
@@ -15,94 +24,117 @@ import java.util.*;
  */
 public class Delivery implements ValueObject<Delivery> {
 
-  private Set<HandlingEvent> events;
+  public static final Delivery EMPTY_DELIVERY = Delivery.derivedFrom(EMPTY_SET);
 
-  public static final Delivery EMPTY_DELIVERY = new Delivery(Collections.EMPTY_SET);
+  private TransportStatus transportStatus;
+  private Location lastKnownLocation;
+  private Voyage currentVoyage;
+  private HandlingEvent lastEvent;
 
-  Delivery(final Collection<HandlingEvent> events) {
-    this.events = new HashSet<HandlingEvent>(events);
+  /**
+   * @return Transport status
+   */
+  public TransportStatus transportStatus() {
+    return transportStatus;
+  }
+
+  /**
+   * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
+   */
+  public Location lastKnownLocation() {
+    return DomainObjectUtils.nullSafe(lastKnownLocation, Location.UNKNOWN);
+  }
+
+  /**
+   * @return Current voyage.
+   */
+  public Voyage currentVoyage() {
+    return DomainObjectUtils.nullSafe(currentVoyage, Voyage.NONE);
   }
 
   /**
-   * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
+   * @param handlingEvents handling events
+   * @return An up to date Delivery derived from this collection of handling events.
    */
-  public List<HandlingEvent> history() {
-    final List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
-    Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
-    return Collections.unmodifiableList(eventList);
+  static Delivery derivedFrom(final Collection<HandlingEvent> handlingEvents) {
+    Validate.notNull(handlingEvents, "Handling events are required");
+    
+    final List<HandlingEvent> eventsByCompletionTime =
+      new ArrayList<HandlingEvent>(new HashSet<HandlingEvent>(handlingEvents));
+    sort(eventsByCompletionTime, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
+
+    final Delivery delivery = new Delivery();
+    delivery.calculateLastEvent(eventsByCompletionTime);
+    delivery.calculateTransportStatus();
+    delivery.calculateLastKnownLocation();
+    delivery.calculateCurrentVoyage();
+    return delivery;
   }
 
   /**
    * @return The last event of the delivery history, or null is history is empty.
    */
-  public HandlingEvent lastEvent() {
-    if (events.isEmpty()) {
-      return null;
+  HandlingEvent lastEvent() {
+    return lastEvent;
+  }
+
+  private void calculateLastEvent(final List<HandlingEvent> handlingEvents) {
+    if (handlingEvents.isEmpty()) {
+      lastEvent =  null;
     } else {
-      final List<HandlingEvent> orderedEvents = history();
-      return orderedEvents.get(orderedEvents.size() - 1);
+      lastEvent = handlingEvents.get(handlingEvents.size() - 1);
     }
   }
 
-  /**
-   * @return
-   */
-  public TransportStatus transportStatus() {
-    if (lastEvent() == null)
-      return NOT_RECEIVED;
+  private void calculateTransportStatus() {
+    if (lastEvent == null) {
+      transportStatus = NOT_RECEIVED;
+      return;
+    }
 
-    final HandlingEvent.Type type = lastEvent().type();
-    
-    switch (type) {
+    switch (lastEvent.type()) {
       case LOAD:
-        return ONBOARD_CARRIER;
-
+        transportStatus = ONBOARD_CARRIER;
+        break;
       case UNLOAD:
       case RECEIVE:
       case CUSTOMS:
-        return IN_PORT;
-
+        transportStatus = IN_PORT;
+        break;
       case CLAIM:
-        return CLAIMED;
-
+        transportStatus = CLAIMED;
+        break;
       default:
-        return null;
+        transportStatus = UNKNOWN;
     }
   }
 
-  /**
-   * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
-   */
-  public Location lastKnownLocation() {
-    final HandlingEvent lastEvent = lastEvent();
+  private void calculateLastKnownLocation() {
     if (lastEvent != null) {
-      return lastEvent.location();
+      lastKnownLocation = lastEvent.location();
     } else {
-      return Location.UNKNOWN;
+      lastKnownLocation = null;
     }
   }
 
-  /**
-   * @return Current voyage.
-   */
-  public Voyage currentVoyage() {
-    if (transportStatus().equals(ONBOARD_CARRIER)) {
-      return lastEvent().voyage();
+  // TODO add currentCarrierMovement
+
+  private void calculateCurrentVoyage() {
+    if (transportStatus().equals(ONBOARD_CARRIER) && lastEvent != null) {
+      currentVoyage = lastEvent.voyage();
     } else {
-      return Voyage.NONE;
+      currentVoyage = null;
     }
   }
 
   @Override
   public boolean sameValueAs(Delivery other) {
-    return other != null && events.equals(other.events);
-  }
-
-  @Override
-  public Delivery copy() {
-    final Set<HandlingEvent> eventsCopy = new HashSet<HandlingEvent>(events);
-
-    return new Delivery(eventsCopy);
+    return other != null && new EqualsBuilder().
+      append(this.transportStatus, other.transportStatus).
+      append(this.lastKnownLocation, other.lastKnownLocation).
+      append(this.currentVoyage, other.currentVoyage).
+      append(this.lastEvent, other.lastEvent).
+      isEquals();
   }
 
   @Override
@@ -117,10 +149,16 @@ public class Delivery implements ValueObject<Delivery> {
 
   @Override
   public int hashCode() {
-    return events.hashCode();
+    return new HashCodeBuilder().
+      append(transportStatus).
+      append(lastKnownLocation).
+      append(currentVoyage).
+      append(lastEvent).
+      toHashCode();
   }
 
   Delivery() {
     // Needed by Hibernate
   }
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -5,14 +5,13 @@ import se.citerus.dddsample.domain.model.ValueObject;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 /**
  * An itinerary.
- * 
+ *
  */
 public class Itinerary implements ValueObject<Itinerary> {
 
@@ -29,7 +28,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   public Itinerary(final List<Leg> legs) {
     Validate.notEmpty(legs);
     Validate.noNullElements(legs);
-    
+
     this.legs = legs;
   }
 
@@ -116,7 +115,7 @@ public class Itinerary implements ValueObject<Itinerary> {
     final Leg lastLeg = lastLeg();
 
     if (lastLeg == null) {
-      return END_OF_DAYS;
+      return new Date(END_OF_DAYS.getTime());
     } else {
       return lastLeg.unloadTime();
     }
@@ -143,15 +142,6 @@ public class Itinerary implements ValueObject<Itinerary> {
   }
 
   @Override
-  public Itinerary copy() {
-    final List<Leg> legsCopy = new ArrayList<Leg>(legs.size());
-    for (Leg leg : legs) {
-      legsCopy.add(leg.copy());
-    }
-    return new Itinerary(legsCopy);
-  }
-
-  @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -62,11 +62,6 @@ public class Leg implements ValueObject<Leg> {
   }
 
   @Override
-  public Leg copy() {
-    return new Leg(voyage(), loadLocation(), unloadLocation(), loadTime(), unloadTime());
-  }
-
-  @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RouteSpecification.java

@@ -29,7 +29,7 @@ public class RouteSpecification extends AbstractSpecification<Itinerary> impleme
     Validate.notNull(origin, "Origin is required");
     Validate.notNull(destination, "Destination is required");
     Validate.notNull(arrivalDeadline, "Arrival deadline is required");
-    Validate.isTrue(origin.equals(destination), "Origin and destination can't be the same: " + origin);
+    Validate.isTrue(!origin.sameIdentityAs(destination), "Origin and destination can't be the same: " + origin);
 
     this.origin = origin;
     this.destination = destination;
@@ -75,16 +75,11 @@ public class RouteSpecification extends AbstractSpecification<Itinerary> impleme
   }
 
   @Override
-  public RouteSpecification copy() {
-    return new RouteSpecification(origin, destination, arrivalDeadline);
-  }
-
-  @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    RouteSpecification that = (RouteSpecification) o;
+    final RouteSpecification that = (RouteSpecification) o;
 
     return sameValueAs(that);
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RoutingStatus.java

@@ -1,8 +1,16 @@
 package se.citerus.dddsample.domain.model.cargo;
 
+import se.citerus.dddsample.domain.model.ValueObject;
+
 /**
- * 
+ * Routing status. 
  */
-public enum RoutingStatus {
-  NOT_ROUTED, ROUTED, MISROUTED
+public enum RoutingStatus implements ValueObject<RoutingStatus> {
+  NOT_ROUTED, ROUTED, MISROUTED;
+
+  @Override
+  public boolean sameValueAs(final RoutingStatus other) {
+    return this.equals(other);
+  }
+  
 }

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

@@ -49,11 +49,6 @@ public final class TrackingId implements ValueObject<TrackingId> {
   }
 
   @Override
-  public TrackingId copy() {
-    return new TrackingId(id);
-  }
-
-  @Override
   public String toString() {
     return id;
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TransportStatus.java

@@ -1,8 +1,15 @@
 package se.citerus.dddsample.domain.model.cargo;
 
+import se.citerus.dddsample.domain.model.ValueObject;
+
 /**
  * Represents the different transport statuses for a cargo.
  */
-public enum TransportStatus {
-  NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED, UNKNOWN
+public enum TransportStatus implements ValueObject<TransportStatus> {
+  NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED, UNKNOWN;
+
+  @Override
+  public boolean sameValueAs(final TransportStatus other) {
+    return this.equals(other);
+  }
 }

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

@@ -103,16 +103,6 @@ public final class CarrierMovement implements ValueObject<CarrierMovement> {
       isEquals();
   }
 
-  @Override
-  public CarrierMovement copy() {
-    return new CarrierMovement(
-      departureLocation(),
-      arrivalLocation(),
-      departureTime(),
-      arrivalTime()
-    );
-  }
-
   CarrierMovement() {
     // Needed by Hibernate
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/Schedule.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.ValueObject;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -18,7 +17,7 @@ public class Schedule implements ValueObject<Schedule> {
 
   public static final Schedule EMPTY = new Schedule();
 
-  Schedule(List<CarrierMovement> carrierMovements) {
+  Schedule(final List<CarrierMovement> carrierMovements) {
     Validate.notNull(carrierMovements);
     Validate.noNullElements(carrierMovements);
     Validate.notEmpty(carrierMovements);
@@ -34,22 +33,12 @@ public class Schedule implements ValueObject<Schedule> {
   }
 
   @Override
-  public boolean sameValueAs(Schedule other) {
+  public boolean sameValueAs(final Schedule other) {
     return other != null && this.carrierMovements.equals(other.carrierMovements);
   }
 
   @Override
-  public Schedule copy() {
-    final List<CarrierMovement> copyCarrierMovements = new ArrayList(carrierMovements.size());
-    for (CarrierMovement carrierMovement : carrierMovements) {
-      copyCarrierMovements.add(carrierMovement.copy());
-    }
-
-    return new Schedule(copyCarrierMovements);
-  }
-
-  @Override
-  public boolean equals(Object o) {
+  public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/VoyageNumber.java

@@ -39,11 +39,6 @@ public class VoyageNumber implements ValueObject<VoyageNumber> {
   }
 
   @Override
-  public VoyageNumber copy() {
-    return new VoyageNumber(number);
-  }
-
-  @Override
   public String toString() {
     return number;
   }

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

@@ -91,10 +91,6 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
       return other != null && this.equals(other);
     }
 
-    @Override
-    public Type copy() {
-      return this;
-    }
   }
 
   /**
@@ -105,16 +101,23 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
    * @param location         where the event took place
    * @param voyage           the voyage
    */
-  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type,
-                       Location location, Voyage voyage) {
-    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location, voyage});
+  public HandlingEvent(final Cargo cargo,
+                       final Date completionTime,
+                       final Date registrationTime,
+                       final Type type,
+                       final Location location,
+                       final Voyage voyage) {
+    Validate.noNullElements(new Object[]
+      {cargo, completionTime, registrationTime, type, location, voyage}
+    );
+
     if (type.prohibitsVoyage()) {
       throw new IllegalArgumentException("Voyage is not allowed with event type " + type);
     }
 
     this.voyage = voyage;
-    this.completionTime = completionTime;
-    this.registrationTime = registrationTime;
+    this.completionTime = (Date) completionTime.clone();
+    this.registrationTime = (Date) registrationTime.clone();
     this.type = type;
     this.location = location;
     this.cargo = cargo;
@@ -127,14 +130,21 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
    * @param type             type of event
    * @param location         where the event took place
    */
-  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type, Location location) {
-    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location});
+  public HandlingEvent(final Cargo cargo,
+                       final Date completionTime,
+                       final Date registrationTime,
+                       final Type type,
+                       final Location location) {
+    Validate.noNullElements(new Object[]
+      {cargo, completionTime, registrationTime, type, location}
+    );
+
     if (type.requiresVoyage()) {
       throw new IllegalArgumentException("Voyage is required for event type " + type);
     }
 
-    this.completionTime = completionTime;
-    this.registrationTime = registrationTime;
+    this.completionTime = (Date) completionTime.clone();
+    this.registrationTime = (Date) registrationTime.clone();
     this.type = type;
     this.location = location;
     this.cargo = cargo;

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/UnLocode.java

@@ -61,11 +61,6 @@ public final class UnLocode implements ValueObject<UnLocode> {
   }
 
   @Override
-  public UnLocode copy() {
-    return new UnLocode(unlocode);
-  }
-
-  @Override
   public String toString() {
     return idString();
   }

dddsample/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml

@@ -13,15 +13,29 @@
 
     <many-to-one name="origin" column="origin_id" not-null="false" cascade="none" update="false" foreign-key="origin_fk"/>
 
+    <property name="misdirected" column="is_misdirected" not-null="true"/>
+
+    <property name="routingStatus" column="routing_status" not-null="true">
+      <type name="org.hibernate.type.EnumType">
+        <param name="enumClass">se.citerus.dddsample.domain.model.cargo.RoutingStatus</param>
+        <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
+      </type>
+    </property>
+
     <component name="trackingId" unique="true" update="false">
       <property name="id" column="tracking_id"/>
     </component>
 
     <component name="delivery" lazy="true" update="false">
-      <set name="events" lazy="true" cascade="none">
-        <key column="cargo_id"/>
-        <one-to-many class="se.citerus.dddsample.domain.model.handling.HandlingEvent"/>
-      </set>
+      <property name="transportStatus" column="transport_status" not-null="true">
+        <type name="org.hibernate.type.EnumType">
+          <param name="enumClass">se.citerus.dddsample.domain.model.cargo.TransportStatus</param>
+          <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
+        </type>
+      </property>
+      <many-to-one name="currentVoyage" column="current_voyage_id" not-null="false" cascade="none" foreign-key="current_voyage_fk"/>
+      <many-to-one name="lastKnownLocation" column="last_known_location_id" not-null="false" cascade="none" foreign-key="last_known_location_fk"/>
+      <many-to-one name="lastEvent" column="last_event_id" not-null="false" cascade="none" foreign-key="last_event_fk"/>
     </component>
 
     <component name="routeSpecification">