Made all domain model classes inherit common pattern base classes, removing lots of boilerplate code.

Made all immutable fields final, setting to null in package local no-args ctor (Hibernate will stil be able to set fields in runtime).

Added javadoc on Cargo.

Removed "empty itinerary" null pattern object, since a cargo is not always supposed to have an itinerary. More work left here though.

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

 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.shared.DomainObjectUtils;
-import se.citerus.dddsample.tracking.core.domain.shared.Entity;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.EntitySupport;
 
 import java.util.Date;
 
  * or not a cargo is misdirected, what the current status of the cargo is (on board carrier,
  * in port etc), are captured in this aggregate.
  */
-public class Cargo implements Entity<Cargo> {
+public class Cargo extends EntitySupport<Cargo,TrackingId> {
 
-  private TrackingId trackingId;
+  private final TrackingId trackingId;
   private RouteSpecification routeSpecification;
   private Itinerary itinerary;
   private Delivery delivery;
     this.projections = new Projections(delivery, itinerary, routeSpecification);
   }
 
+  @Override
+  public TrackingId identity() {
+    return trackingId;
+  }
+
   /**
    * The tracking id is the identity of this entity, and is unique.
    *
    * @return The itinerary. Never null.
    */
   public Itinerary itinerary() {
-    return DomainObjectUtils.nullSafe(this.itinerary, Itinerary.EMPTY_ITINERARY);
+    return itinerary;
   }
 
   /**
     return routeSpecification;
   }
 
+  /**
+   * @return Estimated time of arrival.
+   */
   public Date estimatedTimeOfArrival() {
     return projections.estimatedTimeOfArrival();
   }
 
+  /**
+   * @return Next expected activity.
+   */
   public HandlingActivity nextExpectedActivity() {
     return projections.nextExpectedActivity();
   }
 
+  /**
+   * @return True if cargo is misdirected.
+   */
   public boolean isMisdirected() {
     return delivery.isMisdirected(itinerary, routeSpecification);
   }
 
+  /**
+   * @return Transport status.
+   */
   public TransportStatus transportStatus() {
     return delivery.transportStatus();
   }
 
+  /**
+   * @return Routing status.
+   */
   public RoutingStatus routingStatus() {
     return delivery.routingStatus(itinerary, routeSpecification);
   }
 
+  /**
+   * @return Current voyage.
+   */
   public Voyage currentVoyage() {
     return delivery.currentVoyage();
   }
 
+  /**
+   * @return Last known location.
+   */
   public Location lastKnownLocation() {
     return delivery.lastKnownLocation();
   }
     this.projections = new Projections(delivery, itinerary, routeSpecification);
   }
 
+  /**
+   * @return Customs zone.
+   */
   public CustomsZone customsZone() {
     return routeSpecification.destination().customsZone();
   }
 
 
+  /**
+   * @return Customs clearance point.
+   */
   public Location customsClearancePoint() {
     return customsZone().entryPoint(itinerary.locations());
   }
 
+  /**
+   * @return True if the cargo is ready to be claimed.
+   */
   public boolean isReadyToClaim() {
     return delivery.isUnloadedAtDestination(routeSpecification);
   }
   }
 
   @Override
-  public boolean sameAs(final Cargo other) {
-    return other != null && trackingId().sameValueAs(other.trackingId());
-  }
-
-  /**
-   * @param object to compare
-   * @return True if they have the same identity
-   * @see #sameAs(Cargo)
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (this == object) return true;
-    if (object == null || getClass() != object.getClass()) return false;
-
-    final Cargo other = (Cargo) object;
-    return sameAs(other);
-  }
-
-  /**
-   * @return Hash code of tracking id.
-   */
-  @Override
-  public int hashCode() {
-    return trackingId.hashCode();
-  }
-
-  @Override
   public String toString() {
     return trackingId + " (" + routeSpecification + ")";
   }
 
   Cargo() {
     // Needed by Hibernate
+    trackingId = null;
   }
 
-  // Auto-generated surrogate key
-  @SuppressWarnings("UnusedDeclaration")
-  private Long id;
-
 }

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

 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.*;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.TransportStatus.ONBOARD_CARRIER;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.Date;
 
  * Everything about the delivery of the cargo, i.e. where the cargo is
  * right now, whether or not it's routed, misdirected and so on.
  */
-public class Delivery implements ValueObject<Delivery> {
+public class Delivery extends ValueObjectSupport<Delivery> {
 
-  private HandlingActivity mostRecentHandlingActivity;
-  private Date calculatedAt;
+  private final HandlingActivity mostRecentHandlingActivity;
+  private final Date calculatedAt;
 
   /**
    * Derives a new delivery when a cargo has been handled.
    * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
    */
   Location lastKnownLocation() {
-    if (mostRecentHandlingActivity != null) {
+    if (isHandled()) {
       return mostRecentHandlingActivity.location();
     } else {
       return Location.UNKNOWN;
    * @return Current voyage.
    */
   Voyage currentVoyage() {
-    if (mostRecentHandlingActivity != null && transportStatus().equals(ONBOARD_CARRIER)) {
+    if (isHandled() && transportStatus().equals(ONBOARD_CARRIER)) {
       return mostRecentHandlingActivity.voyage();
     } else {
       return Voyage.NONE;
     }
   }
 
+  private boolean isHandled() {
+    return mostRecentHandlingActivity != null;
+  }
+
   /**
    * Check if cargo is misdirected.
    * <p/>
    * @param routeSpecification route specification
    */
   boolean isUnloadedAtDestination(final RouteSpecification routeSpecification) {
-    return mostRecentHandlingActivity != null &&
+    return isHandled() &&
           (CLAIM.sameValueAs(mostRecentHandlingActivity.type()) || UNLOAD.sameValueAs(mostRecentHandlingActivity.type()) &&
            routeSpecification.destination().sameAs(mostRecentHandlingActivity.location()));
   }
            !isMisdirected(itinerary, routeSpecification);
   }
 
-  @Override
-  public boolean sameValueAs(final Delivery other) {
-    return other != null && new EqualsBuilder().
-      append(this.mostRecentHandlingActivity, other.mostRecentHandlingActivity).
-      append(this.calculatedAt, other.calculatedAt).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Delivery other = (Delivery) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(mostRecentHandlingActivity).
-      append(calculatedAt).
-      toHashCode();
-  }
-
   Delivery() {
     // Needed by Hibernate
+    calculatedAt = null;
+    mostRecentHandlingActivity = null;
   }
 
 }

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

 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.*;
 
 /**
  * An itinerary.
  */
-public class Itinerary implements ValueObject<Itinerary> {
+public class Itinerary extends ValueObjectSupport<Itinerary> {
 
-  private List<Leg> legs = Collections.emptyList();
-
-  static final Itinerary EMPTY_ITINERARY = new Itinerary();
+  private final List<Leg> legs;
   private static final Date END_OF_DAYS = new Date(Long.MAX_VALUE);
 
   /**
     return null;
   }
 
-
-  /**
-   * @param other itinerary to compare
-   * @return <code>true</code> if the legs in this and the other itinerary are all equal.
-   */
-  @Override
-  public boolean sameValueAs(final Itinerary other) {
-    return other != null && legs.equals(other.legs);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Itinerary itinerary = (Itinerary) o;
-
-    return sameValueAs(itinerary);
-  }
-
-  @Override
-  public int hashCode() {
-    return legs.hashCode();
-  }
-
   @Override
   public String toString() {
     return StringUtils.join(legs, "\n");
 
   Itinerary() {
     // Needed by Hibernate
+    legs = null;
   }
 
-  // Auto-generated surrogate key
-  @SuppressWarnings("UnusedDeclaration")
-  private Long id;
 }

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

 package se.citerus.dddsample.tracking.core.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.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.Date;
 
 /**
  * An itinerary consists of one or more legs.
  */
-public class Leg implements ValueObject<Leg> {
+public class Leg extends ValueObjectSupport<Leg> {
 
-  private Voyage voyage;
-  private Location loadLocation;
-  private Location unloadLocation;
-  private Date loadTime;
-  private Date unloadTime;
+  private final Voyage voyage;
+  private final Location loadLocation;
+  private final Location unloadLocation;
+  private final Date loadTime;
+  private final Date unloadTime;
 
-  // TODO hide this, use factory
+  // TODO hide this, use factory only
   public Leg(Voyage voyage, Location loadLocation, Location unloadLocation, Date loadTime, Date unloadTime) {
     Validate.notNull(voyage, "Voyage is required");
     Validate.notNull(loadLocation, "Load location is required");
   }
 
   @Override
-  public boolean sameValueAs(final Leg other) {
-    return other != null && new EqualsBuilder().
-      append(this.voyage, other.voyage).
-      append(this.loadLocation, other.loadLocation).
-      append(this.unloadLocation, other.unloadLocation).
-      append(this.loadTime, other.loadTime).
-      append(this.unloadTime, other.unloadTime).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    Leg leg = (Leg) o;
-
-    return sameValueAs(leg);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(voyage).
-      append(loadLocation).
-      append(unloadLocation).
-      append(loadTime).
-      append(unloadTime).
-      toHashCode();
-  }
-
-  @Override
   public String toString() {
     return "Load in " + loadLocation + " at " + loadTime +
       " --- Unload in " + unloadLocation + " at " + unloadTime;
 
   Leg() {
     // Needed by Hibernate
+    voyage = null;
+    loadLocation = unloadLocation = null;
+    loadTime = unloadTime = null;
   }
 
-  // Auto-generated surrogate key
-  private Long id;
-
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Projections.java

 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.Date;
 import java.util.Iterator;
  * <p/>
  * It is updated on routing changes as well as handling.
  */
-class Projections implements ValueObject<Projections> {
+class Projections extends ValueObjectSupport<Projections> {
 
-  private Date estimatedTimeOfArrival;
-  private HandlingActivity nextExpectedActivity;
+  private final Date estimatedTimeOfArrival;
+  private final HandlingActivity nextExpectedActivity;
 
   private static final Date ETA_UNKOWN = null;
   private static final HandlingActivity NO_ACTIVITY = null;
     return NO_ACTIVITY;
   }
 
-
-  @Override
-  public boolean sameValueAs(final Projections other) {
-    return other != null && new EqualsBuilder().
-      append(this.estimatedTimeOfArrival, other.estimatedTimeOfArrival).
-      append(this.nextExpectedActivity, other.nextExpectedActivity).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Projections other = (Projections) o;
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(estimatedTimeOfArrival).
-      append(nextExpectedActivity).
-      toHashCode();
-  }
-
   Projections() {
     // Needed by Hibernate
+    estimatedTimeOfArrival = null;
+    nextExpectedActivity = null;
   }
 
 }

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

 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.shared.AbstractSpecification;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObject;
 
 import java.util.Date;
 
  * Route specification. Describes where a cargo orign and destination is,
  * and the arrival deadline.
  */
+// TODO use composition instead of inheritance
 public class RouteSpecification extends AbstractSpecification<Itinerary> implements ValueObject<RouteSpecification> {
 
-  private Location origin;
-  private Location destination;
-  private Date arrivalDeadline;
+  private final Location origin;
+  private final Location destination;
+  private final Date arrivalDeadline;
 
   /**
    * @param origin          origin location - can't be the same as the destination
 
   RouteSpecification() {
     // Needed by Hibernate
+    origin = destination = null;
+    arrivalDeadline = null;
   }
 
 }

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

 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObject;
+
 
 /**
  * The different routing statuses of a cargo.

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

 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.io.Serializable;
 
 /**
  * Uniquely identifies a particular cargo. Automatically generated by the application.
  */
-public final class TrackingId implements ValueObject<TrackingId>, Serializable {
+public final class TrackingId extends ValueObjectSupport<TrackingId> implements Serializable {
 
-  private String id;
+  private final String id;
 
   /**
    * Constructor.
   }
 
   @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    TrackingId other = (TrackingId) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return id.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(TrackingId other) {
-    return other != null && this.id.equals(other.id);
-  }
-
-  @Override
   public String toString() {
     return id;
   }
 
   TrackingId() {
     // Needed by Hibernate
+    id = null;
   }
+  
 }

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

 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObject;
 
 /**
  * Represents the different transport statuses for a cargo.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/EventSequenceNumber.java

 package se.citerus.dddsample.tracking.core.domain.model.handling;
 
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-public class EventSequenceNumber implements ValueObject<EventSequenceNumber> {
+public class EventSequenceNumber extends ValueObjectSupport<EventSequenceNumber> {
 
-  private long value;
+  private final long value;
   private static final AtomicLong SEQUENCE = new AtomicLong(System.currentTimeMillis());
 
   private EventSequenceNumber(final long value) {
   }
 
   @Override
-  public boolean sameValueAs(final EventSequenceNumber other) {
-    return false;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    return sameValueAs((EventSequenceNumber) o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Long.valueOf(value).hashCode();
-  }
-
-  @Override
   public String toString() {
     return String.valueOf(value);
   }
 
   EventSequenceNumber() {
     // Needed by Hibernate
+    value = -1L;
   }
 
 }

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

 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.shared.DomainEvent;
 import se.citerus.dddsample.tracking.core.domain.shared.DomainObjectUtils;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObject;
 
 import java.util.Date;
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingEventRepository.java

 package se.citerus.dddsample.tracking.core.domain.model.handling;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 
 /**
  * Handling event repository.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingHistory.java

 
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObject;
 
 import java.util.*;
 import static java.util.Collections.sort;

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/location/CustomsZone.java

 package se.citerus.dddsample.tracking.core.domain.model.location;
 
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.tracking.core.domain.shared.Entity;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.EntitySupport;
 
 import java.util.Arrays;
 import java.util.List;
 /**
  * A geographical zone within which there are no customs restrictions or checks.
  */
-public class CustomsZone implements Entity<CustomsZone> {
+public class CustomsZone extends EntitySupport<CustomsZone,String> {
 
-  private String code;
-  private String name;
+  private final String code;
+  private final String name;
 
   // TODO: Find out what the standards are for this, if any. For now:
   // For CustomsZone code, we are using the "country code" portion of the UnLocode,
     this.name = name;
   }
 
+  @Override
+  public String identity() {
+    return code;
+  }
+
   /**
    * Where would a Cargo enter this CustomsZone if it were
    * following this route. Note that specific voyages, etc do not
    * @param route
    * @return
    */
-  public Location entryPoint(List<Location> route) {
+  public Location entryPoint(final List<Location> route) {
     for (Location location : route) {
-      if (this.includes(location)) return location;
+      if (this.includes(location)) {
+        return location;
+      }
     }
     return null; //The route does not enter this CustomsZone
   }
    * @param route
    * @return
    */
-  public Location entryPoint(Location... route) {
+  public Location entryPoint(final Location... route) {
     return entryPoint(Arrays.asList(route));
   }
 
     return name;
   }
 
-  @Override
-  public String toString() {
-    return code + "[" + name + "]";
+  public boolean includes(final Location location) {
+    return this.sameAs(location.customsZone());
   }
 
   @Override
-  public boolean sameAs(CustomsZone other) {
-    return code.equals(other.code);
+  public String toString() {
+    return code + "[" + name + "]";
   }
 
   CustomsZone() {
     // Needed by Hibernate
+    code = name = null;
   }
 
-  public boolean includes(Location location) {
-    return this.sameAs(location.customsZone());
-  }
-
-
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/location/Location.java

 package se.citerus.dddsample.tracking.core.domain.model.location;
 
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.tracking.core.domain.shared.Entity;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.EntitySupport;
 
 import java.util.TimeZone;
 
  * <p/>
  * It is uniquely identified by a UN Locode.
  */
-public final class Location implements Entity<Location> {
+public final class Location extends EntitySupport<Location, UnLocode> {
 
-  private UnLocode unLocode;
+  private final UnLocode unLocode;
   private String name;
   private TimeZone timeZone;
   private CustomsZone customsZone;
    *
    * @param unLocode    UN Locode
    * @param name        location name
-   * @param timeZone
-   * @param customsZone
+   * @param timeZone    time zone
+   * @param customsZone customs zone
    * @throws IllegalArgumentException if the UN Locode or name is null
    */
   Location(final UnLocode unLocode, final String name, final TimeZone timeZone, final CustomsZone customsZone) {
     this.customsZone = customsZone;
   }
 
+  @Override
+  public UnLocode identity() {
+    return unLocode;
+  }
+
   /**
    * @return UN Locode for this location.
    */
   }
 
   /**
-   * @param object to compare
-   * @return Since this is an entity this will be true iff UN locodes are equal.
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (object == null) {
-      return false;
-    }
-    if (this == object) {
-      return true;
-    }
-    if (!(object instanceof Location)) {
-      return false;
-    }
-    Location other = (Location) object;
-    return sameAs(other);
-  }
-
-  @Override
-  public boolean sameAs(final Location other) {
-    return this.unLocode.sameValueAs(other.unLocode);
-  }
-
-  /**
-   * @return Hash code of UN locode.
+   * @return Time zone of this location.
    */
-  @Override
-  public int hashCode() {
-    return unLocode.hashCode();
+  public TimeZone timeZone() {
+    return timeZone;
   }
 
   @Override
 
   Location() {
     // Needed by Hibernate
-  }
-
-  private Long id;
-
-  public TimeZone timeZone() {
-    return timeZone;
+    unLocode = null;
   }
 
 }

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

 package se.citerus.dddsample.tracking.core.domain.model.location;
 
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.regex.Pattern;
 
  * http://www.unece.org/cefact/locode/
  * http://www.unece.org/cefact/locode/DocColumnDescription.htm#LOCODE
  */
-public final class UnLocode implements ValueObject<UnLocode> {
+public final class UnLocode extends ValueObjectSupport<UnLocode> {
 
-  private String unlocode;
+  private final String unlocode;
 
   // Country code is exactly two letters.
   // Location code is usually three letters, but may contain the numbers 2-9 as well
   }
 
   @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    UnLocode other = (UnLocode) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return unlocode.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(UnLocode other) {
-    return other != null && this.unlocode.equals(other.unlocode);
-  }
-
-  @Override
   public String toString() {
     return stringValue();
   }
 
   UnLocode() {
     // Needed by Hibernate
+    unlocode = null;
   }
 
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/shared/HandlingActivity.java

 package se.citerus.dddsample.tracking.core.domain.model.shared;
 
 import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 /**
  * A handling activity represents how and where a cargo can be handled,
  * and can be used to express predictions about what is expected to
  * happen to a cargo in the future.
  */
-public class HandlingActivity implements ValueObject<HandlingActivity> {
+public class HandlingActivity extends ValueObjectSupport<HandlingActivity> {
 
   // TODO introduce something like this (?):
   // HandlingActivity.loadOnto(voyage).in(location)
   // HandlingActivity.claimIn(location)
 
-  private HandlingEvent.Type type;
-  private Location location;
-  private Voyage voyage;
+  private final HandlingEvent.Type type;
+  private final Location location;
+  private final Voyage voyage;
 
   public HandlingActivity(final HandlingEvent.Type type, final Location location) {
     Validate.notNull(type, "Handling event type is required");
 
     this.type = type;
     this.location = location;
+    this.voyage = null;
   }
 
   public HandlingActivity(final HandlingEvent.Type type, final Location location, final Voyage voyage) {
     Validate.notNull(type, "Handling event type is required");
     Validate.notNull(location, "Location is required");
-    Validate.notNull(location, "Voyage is required");
+    Validate.notNull(voyage, "Voyage is required");
 
     this.type = type;
     this.location = location;
   }
 
   @Override
-  public boolean sameValueAs(final HandlingActivity other) {
-    return other != null && new EqualsBuilder().
-      append(this.type, other.type).
-      append(this.location, other.location).
-      append(this.voyage, other.voyage).
-      isEquals();
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.type).
-      append(this.location).
-      append(this.voyage).
-      toHashCode();
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    if (obj == this) return true;
-    if (obj == null) return false;
-    if (obj.getClass() != this.getClass()) return false;
-
-    HandlingActivity other = (HandlingActivity) obj;
-
-    return sameValueAs(other);
-  }
-
-  @Override
   public String toString() {
     return type + " in " + location + (voyage != null ? ", " + voyage : "");
   }
 
   HandlingActivity() {
     // Needed by Hibernate
+    type = null;
+    location = null;
+    voyage = null;
   }
 
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/CarrierMovement.java

 package se.citerus.dddsample.tracking.core.domain.model.voyage;
 
 import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.Date;
 
 /**
  * A carrier movement is a vessel voyage from one location to another.
  */
-public final class CarrierMovement implements ValueObject<CarrierMovement> {
+public final class CarrierMovement extends ValueObjectSupport<CarrierMovement> {
 
-  private Location departureLocation;
-  private Location arrivalLocation;
-  private Date departureTime;
-  private Date arrivalTime;
+  private final Location departureLocation;
+  private final Location arrivalLocation;
+  private final Date departureTime;
+  private final Date arrivalTime;
 
   // Null object pattern 
   public static final CarrierMovement NONE = new CarrierMovement(
     );
   }
 
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final CarrierMovement that = (CarrierMovement) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.departureLocation).
-      append(this.departureTime).
-      append(this.arrivalLocation).
-      append(this.arrivalTime).
-      toHashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(CarrierMovement other) {
-    return other != null && new EqualsBuilder().
-      append(this.departureLocation, other.departureLocation).
-      append(this.departureTime, other.departureTime).
-      append(this.arrivalLocation, other.arrivalLocation).
-      append(this.arrivalTime, other.arrivalTime).
-      isEquals();
-  }
-
   CarrierMovement() {
     // Needed by Hibernate
+    arrivalLocation = departureLocation = null;
+    arrivalTime = departureTime = null;
   }
 
-  // Auto-generated surrogate key
-  private Long id;
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/Schedule.java

 package se.citerus.dddsample.tracking.core.domain.model.voyage;
 
 import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 import java.util.Collections;
 import java.util.Date;
 /**
  * A voyage schedule.
  */
-public class Schedule implements ValueObject<Schedule> {
+public class Schedule extends ValueObjectSupport<Schedule> {
 
-  private List<CarrierMovement> carrierMovements;
+  private final List<CarrierMovement> carrierMovements;
 
   public static final Schedule EMPTY = new Schedule();
 
     return null;
   }
 
-  @Override
-  public boolean sameValueAs(final Schedule other) {
-    return other != null && this.carrierMovements.equals(other.carrierMovements);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Schedule that = (Schedule) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().append(this.carrierMovements).toHashCode();
-  }
-
   Schedule() {
     // Needed by Hibernate
+    carrierMovements = null;
   }
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/Voyage.java

 
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.shared.Entity;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.EntitySupport;
 
 import java.util.ArrayList;
 import java.util.Date;
 /**
  * A Voyage.
  */
-public class Voyage implements Entity<Voyage> {
+public class Voyage extends EntitySupport<Voyage,VoyageNumber> {
 
-  private VoyageNumber voyageNumber;
+  private final VoyageNumber voyageNumber;
   private Schedule schedule;
 
   // Null object pattern
     this.schedule = schedule;
   }
 
+  @Override
+  public VoyageNumber identity() {
+    return voyageNumber;
+  }
+  
   /**
    * @return Voyage number.
    */
   }
 
   @Override
-  public int hashCode() {
-    return voyageNumber.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null) return false;
-    if (!(o instanceof Voyage)) return false;
-
-    final Voyage that = (Voyage) o;
-
-    return sameAs(that);
-  }
-
-  @Override
-  public boolean sameAs(Voyage other) {
-    return other != null && this.voyageNumber().sameValueAs(other.voyageNumber());
-  }
-
-  @Override
   public String toString() {
     return "Voyage " + voyageNumber;
   }
 
   Voyage() {
     // Needed by Hibernate
+    voyageNumber = null;
   }
 
-  // Needed by Hibernate
-  private Long id;
-
-
   /**
    * Builder pattern is used for incremental construction
    * of a Voyage aggregate. This serves as an aggregate factory.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/VoyageNumber.java

 package se.citerus.dddsample.tracking.core.domain.model.voyage;
 
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
+import se.citerus.dddsample.tracking.core.domain.shared.experimental.ValueObjectSupport;
 
 /**
  * Identifies a voyage.
  */
-public class VoyageNumber implements ValueObject<VoyageNumber> {
+public class VoyageNumber extends ValueObjectSupport<VoyageNumber> {
 
-  private String number;
+  private final String number;
 
-  public VoyageNumber(String number) {
+  public VoyageNumber(final String number) {
     Validate.notNull(number);
 
     this.number = number;
   }
 
   @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null) return false;
-    if (!(o instanceof VoyageNumber)) return false;
-
-    final VoyageNumber other = (VoyageNumber) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return number.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(VoyageNumber other) {
-    return other != null && this.number.equals(other.number);
-  }
-
-  @Override
   public String toString() {
     return number;
   }
 
   VoyageNumber() {
     // Needed by Hibernate
+    number = null;
   }
 
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/shared/experimental/EntitySupport.java

     return identity().hashCode();
   }
 
+  @SuppressWarnings({"SimplifiableIfStatement", "unchecked"})
   @Override
   public final boolean equals(final Object o) {
     if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    // TODO class comparision is too strict for ORM proxies
+    if (o == null || !(o instanceof EntitySupport)) return false;
+    //if (o == null || getClass() != o.getClass()) return false;
 
     return sameAs((T) o);
   }
 
+  @SuppressWarnings("UnusedDeclaration")
+  // Surrogate primary key
+  private Long id;
+
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/shared/experimental/ValueObject.java

    */
   boolean sameValueAs(T other);
 
-  /**
-   * Value objects can be freely copied.
-   *
-   * @return A safe, deep copy of this value object.
-   */
-  T copy();
-
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/shared/experimental/ValueObjectSupport.java

 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
 
 /**
  * Base class for value objects.
 public abstract class ValueObjectSupport<T extends ValueObject> implements ValueObject<T> {
 
   private transient int cachedHashCode = 0;
+  @SuppressWarnings("UnusedDeclaration")
+  private final Long id = null;
 
   /**
    * @param other The other value object.
    * @param o other object
    * @return True if other object has the same value as this value object.
    */
+  @SuppressWarnings({"SimplifiableIfStatement", "unchecked"})
   @Override
   public final boolean equals(final Object o) {
     if (this == o) return true;

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssembler.java

 package se.citerus.dddsample.tracking.core.interfaces.booking.facade;
 
+import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
+import se.citerus.dddsample.tracking.booking.api.LegDTO;
+import se.citerus.dddsample.tracking.booking.api.LocationDTO;
+import se.citerus.dddsample.tracking.booking.api.RouteCandidateDTO;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.tracking.core.domain.model.location.Location;
+import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
+import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.LegDTO;
-import se.citerus.dddsample.tracking.booking.api.RouteCandidateDTO;
-import se.citerus.dddsample.tracking.booking.api.*;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 final class DTOAssembler {
 
    * @return A cargo routing DTO
    */
   static CargoRoutingDTO toDTO(final Cargo cargo) {
-    final List<Leg> legs = cargo.itinerary().legs();
+    final Itinerary itinerary = cargo.itinerary();
+
+    List<LegDTO> legDTOList = Collections.emptyList();
+    if (itinerary != null) {
+      final List<Leg> legs = itinerary.legs();
 
-    final List<LegDTO> legDTOList = new ArrayList<LegDTO>(legs.size());
-    for (Leg leg : legs) {
-      final LegDTO legDTO = new LegDTO(
-        leg.voyage().voyageNumber().stringValue(),
-        leg.loadLocation().unLocode().stringValue(),
-        leg.unloadLocation().unLocode().stringValue(),
-        leg.loadTime(),
-        leg.unloadTime());
-      legDTOList.add(legDTO);
+      legDTOList = new ArrayList<LegDTO>(legs.size());
+      for (Leg leg : legs) {
+        final LegDTO legDTO = new LegDTO(
+          leg.voyage().voyageNumber().stringValue(),
+          leg.loadLocation().unLocode().stringValue(),
+          leg.unloadLocation().unLocode().stringValue(),
+          leg.loadTime(),
+          leg.unloadTime());
+        legDTOList.add(legDTO);
+      }
     }
 
     return new CargoRoutingDTO(

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/ItineraryTest.java

 
     HandlingActivity claimRotterdam = new HandlingActivity(CLAIM, ROTTERDAM);
     assertFalse(itinerary.isExpected(claimRotterdam));
-
-    //Unrouted Cargo shouldn't go anywhere or do anything
-    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(receiveShanghai));
-    assertFalse(Itinerary.EMPTY_ITINERARY.isExpected(loadShanghai));
-
   }
 
   public void testCreateItinerary() throws Exception {