Entity interface now has sameAs instead of sameIdentityAs, which expresses the intent more clearly.

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

@@ -178,14 +178,14 @@ public class Cargo implements Entity<Cargo> {
   }
 
   @Override
-  public boolean sameIdentityAs(final Cargo other) {
+  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 #sameIdentityAs(Cargo)
+   * @see #sameAs(Cargo)
    */
   @Override
   public boolean equals(final Object object) {
@@ -193,7 +193,7 @@ public class Cargo implements Entity<Cargo> {
     if (object == null || getClass() != object.getClass()) return false;
 
     final Cargo other = (Cargo) object;
-    return sameIdentityAs(other);
+    return sameAs(other);
   }
 
   /**
@@ -216,5 +216,5 @@ public class Cargo implements Entity<Cargo> {
   // Auto-generated surrogate key
   @SuppressWarnings("UnusedDeclaration")
   private Long id;
-  
+
 }

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

@@ -96,7 +96,7 @@ public class Delivery implements ValueObject<Delivery> {
     }
 
     if (mostRecentHandlingActivity.type().sameValueAs(HandlingEvent.Type.CUSTOMS)) {
-      return !routeSpecification.destination().sameIdentityAs(mostRecentHandlingActivity.location());
+      return !routeSpecification.destination().sameAs(mostRecentHandlingActivity.location());
     } else {
       return !itinerary.isExpected(mostRecentHandlingActivity);
     }
@@ -109,7 +109,7 @@ public class Delivery implements ValueObject<Delivery> {
   boolean isUnloadedAtDestination(final RouteSpecification routeSpecification) {
     return mostRecentHandlingActivity != null &&
           (CLAIM.sameValueAs(mostRecentHandlingActivity.type()) || UNLOAD.sameValueAs(mostRecentHandlingActivity.type()) &&
-           routeSpecification.destination().sameIdentityAs(mostRecentHandlingActivity.location()));
+           routeSpecification.destination().sameAs(mostRecentHandlingActivity.location()));
   }
 
   /**

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

@@ -65,8 +65,8 @@ public class Itinerary implements ValueObject<Itinerary> {
     if (handlingActivity.type() == HandlingEvent.Type.LOAD) {
       //Check that the there is a leg with same load location and voyage
       for (Leg leg : legs) {
-        if (leg.loadLocation().sameIdentityAs(handlingActivity.location()) &&
-          leg.voyage().sameIdentityAs(handlingActivity.voyage()))
+        if (leg.loadLocation().sameAs(handlingActivity.location()) &&
+          leg.voyage().sameAs(handlingActivity.voyage()))
           return true;
       }
       return false;
@@ -75,8 +75,8 @@ public class Itinerary implements ValueObject<Itinerary> {
     if (handlingActivity.type() == HandlingEvent.Type.UNLOAD) {
       //Check that the there is a leg with same unload location and voyage
       for (Leg leg : legs) {
-        if (leg.unloadLocation().sameIdentityAs(handlingActivity.location()) &&
-          leg.voyage().sameIdentityAs(handlingActivity.voyage()))
+        if (leg.unloadLocation().sameAs(handlingActivity.location()) &&
+          leg.voyage().sameAs(handlingActivity.voyage()))
           return true;
       }
       return false;
@@ -155,7 +155,7 @@ public class Itinerary implements ValueObject<Itinerary> {
 
     Leg lastAdded = null;
     for (Leg leg : this.legs) {
-      if (leg.voyage().sameIdentityAs(rescheduledVoyage)) {
+      if (leg.voyage().sameAs(rescheduledVoyage)) {
         Leg modifiedLeg = leg.withRescheduledVoyage(rescheduledVoyage);
         // This truncates the itinerary if the voyage rescheduling makes
         // it impossible to maintain the old unload-load chain.
@@ -190,7 +190,7 @@ public class Itinerary implements ValueObject<Itinerary> {
    */
   public Date loadTimeAt(final Location location) {
     for (Leg leg : legs) {
-      if (leg.loadLocation().sameIdentityAs(location)) {
+      if (leg.loadLocation().sameAs(location)) {
         return leg.loadTime();
       }
     }
@@ -203,7 +203,7 @@ public class Itinerary implements ValueObject<Itinerary> {
    */
   public Date unloadTimeAt(final Location location) {
     for (Leg leg : legs) {
-      if (leg.unloadLocation().sameIdentityAs(location)) {
+      if (leg.unloadLocation().sameAs(location)) {
         return leg.unloadTime();
       }
     }

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

@@ -27,7 +27,7 @@ public class Leg implements ValueObject<Leg> {
     Validate.notNull(unloadLocation, "Unload location is required");
     Validate.notNull(loadTime, "Load time is required");
     Validate.notNull(unloadTime, "Unload time is required");
-    Validate.isTrue(!loadLocation.sameIdentityAs(unloadLocation));
+    Validate.isTrue(!loadLocation.sameAs(unloadLocation));
     // TODO use a minimum time between unloading and loading?
     //Validate.isTrue(unloadTime.after(loadTime));
 

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

@@ -75,7 +75,7 @@ class Projections implements ValueObject<Projections> {
     final Location lastKnownLocation = delivery.lastKnownLocation();
     switch (delivery.transportStatus()) {
       case IN_PORT:
-        if (itinerary.firstLeg().loadLocation().sameIdentityAs(lastKnownLocation)) {
+        if (itinerary.firstLeg().loadLocation().sameAs(lastKnownLocation)) {
           return loadInFirstLocation(itinerary);
         } else {
           return loadOrClaimInNextLocation(itinerary, lastKnownLocation);
@@ -106,7 +106,7 @@ class Projections implements ValueObject<Projections> {
   private HandlingActivity loadOrClaimInNextLocation(final Itinerary itinerary, final Location activityLocation) {
     for (final Iterator<Leg> it = itinerary.legs().iterator(); it.hasNext();) {
       final Leg leg = it.next();
-      if (leg.unloadLocation().sameIdentityAs(activityLocation)) {
+      if (leg.unloadLocation().sameAs(activityLocation)) {
         if (it.hasNext()) {
           final Leg nextLeg = it.next();
 
@@ -126,7 +126,7 @@ class Projections implements ValueObject<Projections> {
 
   private HandlingActivity unloadInNextLocation(final Itinerary itinerary, final Location activityLocation) {
     for (final Leg leg : itinerary.legs()) {
-      if (leg.loadLocation().sameIdentityAs(activityLocation)) {
+      if (leg.loadLocation().sameAs(activityLocation)) {
         return new HandlingActivity(UNLOAD, leg.unloadLocation(), leg.voyage());
       }
     }

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

@@ -4,13 +4,10 @@ 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.location.Location;
-import se.citerus.dddsample.domain.model.location.SampleLocations;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.shared.AbstractSpecification;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
 import java.util.Date;
-import java.lang.reflect.Field;
 
 /**
  * Route specification. Describes where a cargo orign and destination is,
@@ -31,7 +28,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.sameIdentityAs(destination), "Origin and destination can't be the same: " + origin);
+    Validate.isTrue(!origin.sameAs(destination), "Origin and destination can't be the same: " + origin);
 
     this.origin = origin;
     this.destination = destination;
@@ -86,8 +83,8 @@ public class RouteSpecification extends AbstractSpecification<Itinerary> impleme
   @Override
   public boolean isSatisfiedBy(final Itinerary itinerary) {
     return itinerary != null &&
-      origin().sameIdentityAs(itinerary.initialLoadLocation()) &&
-      destination().sameIdentityAs(itinerary.finalUnloadLocation()) &&
+      origin().sameAs(itinerary.initialLoadLocation()) &&
+      destination().sameAs(itinerary.finalUnloadLocation()) &&
       arrivalDeadline().after(itinerary.finalUnloadTime());
   }
 

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

@@ -54,7 +54,7 @@ public class Voyage implements Entity<Voyage> {
     final List<CarrierMovement> carrierMovements = new ArrayList<CarrierMovement>(size);
 
     for (CarrierMovement carrierMovement : schedule.carrierMovements()) {
-      if (carrierMovement.departureLocation().sameIdentityAs(location)) {
+      if (carrierMovement.departureLocation().sameAs(location)) {
         carrierMovements.add(carrierMovement.withDepartureTime(newDepartureTime));
       } else {
         carrierMovements.add(carrierMovement);
@@ -77,11 +77,11 @@ public class Voyage implements Entity<Voyage> {
 
     final Voyage that = (Voyage) o;
 
-    return sameIdentityAs(that);
+    return sameAs(that);
   }
 
   @Override
-  public boolean sameIdentityAs(Voyage other) {
+  public boolean sameAs(Voyage other) {
     return other != null && this.voyageNumber().sameValueAs(other.voyageNumber());
   }
 

dddsample/src/main/java/se/citerus/dddsample/domain/shared/Entity.java

@@ -11,6 +11,6 @@ public interface Entity<T> {
    * @param other The other entity.
    * @return true if the identities are the same, regardles of other attributes.
    */
-  boolean sameIdentityAs(T other);
+  boolean sameAs(T other);
 
 }