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

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

@@ -5,9 +5,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import static se.citerus.dddsample.domain.model.cargo.RoutingStatus.*;
 import static se.citerus.dddsample.domain.model.cargo.TransportStatus.ONBOARD_CARRIER;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.CLAIM;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.UNLOAD;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
@@ -95,7 +93,7 @@ public class Delivery implements ValueObject<Delivery> {
       return false;
     }
 
-    if (mostRecentHandlingActivity.type().sameValueAs(HandlingEvent.Type.CUSTOMS)) {
+    if (CUSTOMS.sameValueAs(mostRecentHandlingActivity.type())) {
       return !routeSpecification.destination().sameAs(mostRecentHandlingActivity.location());
     } else {
       return !itinerary.isExpected(mostRecentHandlingActivity);

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

@@ -43,7 +43,7 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
 
     while (it.hasNext()) {
       final Cargo nextCargo = it.next().cargo();
-      Validate.isTrue(firstCargo.sameIdentityAs(nextCargo),
+      Validate.isTrue(firstCargo.sameAs(nextCargo),
         "A handling history can only contain handling events for a unique cargo. " +
           "First event is for cargo " + firstCargo + ", also discovered cargo " + nextCargo
       );

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

@@ -108,7 +108,7 @@ public class CustomsZone implements Entity<CustomsZone> {
   }
 
   @Override
-  public boolean sameIdentityAs(CustomsZone other) {
+  public boolean sameAs(CustomsZone other) {
     return code.equals(other.code);
   }
 
@@ -117,7 +117,7 @@ public class CustomsZone implements Entity<CustomsZone> {
   }
 
   public boolean includes(Location location) {
-    return this.sameIdentityAs(location.customsZone());
+    return this.sameAs(location.customsZone());
   }
 
 

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

@@ -83,11 +83,11 @@ public final class Location implements Entity<Location> {
       return false;
     }
     Location other = (Location) object;
-    return sameIdentityAs(other);
+    return sameAs(other);
   }
 
   @Override
-  public boolean sameIdentityAs(final Location other) {
+  public boolean sameAs(final Location other) {
     return this.unLocode.sameValueAs(other.unLocode);
   }
 

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

@@ -39,7 +39,7 @@ public class Schedule implements ValueObject<Schedule> {
    */
   public Date departureTimeAt(final Location location) {
     for (CarrierMovement movement : carrierMovements) {
-      if (movement.departureLocation().sameIdentityAs(location)) {
+      if (movement.departureLocation().sameAs(location)) {
         return movement.departureTime();
       }
     }
@@ -52,7 +52,7 @@ public class Schedule implements ValueObject<Schedule> {
    */
   public Date arrivalTimeAt(final Location location) {
     for (CarrierMovement movement : carrierMovements) {
-      if (movement.arrivalLocation().sameIdentityAs(location)) {
+      if (movement.arrivalLocation().sameAs(location)) {
         return movement.arrivalTime();
       }
     }

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -166,7 +166,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     for (Cargo cargo : cargos) {
       boolean found = false;
       for (Leg leg : cargo.itinerary().legs()) {
-        if (leg.voyage().sameIdentityAs(voyage)) {
+        if (leg.voyage().sameAs(voyage)) {
           found = true;
         }
       }

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/CargoRepositoryInMem.java

@@ -37,7 +37,7 @@ public class CargoRepositoryInMem implements CargoRepository {
   public List<Cargo> findCargosOnVoyage(Voyage voyage) {
     List<Cargo> onVoyage = new ArrayList<Cargo>();
     for (Cargo cargo : cargoDb.values()) {
-      if (voyage.sameIdentityAs(cargo.currentVoyage())) {
+      if (voyage.sameAs(cargo.currentVoyage())) {
         onVoyage.add(cargo);
       }
     }