Improved a few sameValueAs/sameIdentityAs, added some TODOS for stuff to remove after branching off 1.0

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

@@ -190,7 +190,7 @@ public final class Cargo implements Entity<Cargo> {
   }
 
   public boolean sameIdentityAs(final Cargo other) {
-    return other != null && trackingId.equals(other.trackingId);
+    return other != null && trackingId.sameValueAs(other.trackingId);
   }
 
   /**

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

@@ -27,6 +27,10 @@ public interface CargoRepository {
   void save(Cargo cargo);
 
   /**
+   * TODO
+   * this is too complex a procedure to belong in the repository -
+   * introduce a TrackingIdFactory (or perhaps a CargoFactory).
+   *
    * @return A new generated tracking Id.
    */
   TrackingId nextTrackingId();

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

@@ -1,8 +1,6 @@
 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;
 
 /**
@@ -42,11 +40,11 @@ public final class TrackingId implements ValueObject<TrackingId> {
 
   @Override
   public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this);
+    return id.hashCode();
   }
 
   public boolean sameValueAs(TrackingId other) {
-    return other != null && EqualsBuilder.reflectionEquals(this, other);
+    return other != null && this.id.equals(other.id);
   }
 
   TrackingId() {

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

@@ -41,7 +41,7 @@ public final class CarrierMovement implements Entity<CarrierMovement> {
   }
 
   public boolean sameIdentityAs(final CarrierMovement other) {
-    return carrierMovementId.equals(other.carrierMovementId);
+    return carrierMovementId.sameValueAs(other.carrierMovementId);
   }
 
   @Override

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

@@ -16,6 +16,8 @@ public interface HandlingEventRepository {
    */
   void save(final HandlingEvent event);
 
+
+  // TODO: remove this in 1.0 branch, it's not used anywhere
   /**
    * @param trackingId cargo tracking id
    * @return All handling events for this cargo, ordered by completion time.

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

@@ -69,7 +69,7 @@ public final class Location implements Entity<Location> {
   }
 
   public boolean sameIdentityAs(final Location other) {
-    return this.unLocode.equals(other.unLocode);
+    return this.unLocode.sameValueAs(other.unLocode);
   }
 
   /**