Adde equals/hashcode to delegate specifications to uphold the value object contract in RouteSpecification.

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

@@ -3,6 +3,7 @@ package se.citerus.dddsample.tracking.core.domain.model.cargo;
 import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.patterns.specification.AbstractSpecification;
+import se.citerus.dddsample.tracking.core.domain.patterns.specification.Specification;
 import se.citerus.dddsample.tracking.core.domain.patterns.valueobject.ValueObjectSupport;
 
 import java.util.Date;
@@ -17,10 +18,11 @@ public class RouteSpecification extends ValueObjectSupport<RouteSpecification> {
   private final Location destination;
   private final Date arrivalDeadline;
 
-  private final NotNullSpecification notNull = new NotNullSpecification();
-  private final SameOriginSpecification sameOrigin = new SameOriginSpecification();
-  private final SameDestinationSpecification sameDestination = new SameDestinationSpecification();
-  private final MeetsDeadlineSpecification meetsDeadline = new MeetsDeadlineSpecification();
+  // Delegate specifications
+  private final Specification<Itinerary> notNull = new NotNullSpecification();
+  private final Specification<Itinerary> sameOrigin = new SameOriginSpecification();
+  private final Specification<Itinerary> sameDestination = new SameDestinationSpecification();
+  private final Specification<Itinerary> meetsDeadline = new MeetsDeadlineSpecification();
 
   /**
    * @param origin          origin location - can't be the same as the destination
@@ -39,6 +41,15 @@ public class RouteSpecification extends ValueObjectSupport<RouteSpecification> {
   }
 
   /**
+   * @param itinerary itinerary
+   * @return True if this route specification is satisfied by the itinerary,
+   *         i.e. the cargo will be delivered according to requirements.
+   */
+  public boolean isSatisfiedBy(final Itinerary itinerary) {
+    return notNull.and(sameOrigin).and(sameDestination).and(meetsDeadline).isSatisfiedBy(itinerary);
+  }
+
+  /**
    * @return Specified origin location.
    */
   public Location origin() {
@@ -83,15 +94,6 @@ public class RouteSpecification extends ValueObjectSupport<RouteSpecification> {
     return new RouteSpecification(origin, destination, newArrivalDeadline);
   }
 
-  /**
-   * @param itinerary itinerary
-   * @return True if this route specification is satisfied by the itinerary,
-   *         i.e. the cargo will be delivered according to requirements.
-   */
-  public boolean isSatisfiedBy(final Itinerary itinerary) {
-    return notNull.and(sameOrigin).and(sameDestination).and(meetsDeadline).isSatisfiedBy(itinerary);
-  }
-
   @Override
   public String toString() {
     return origin + " to " + destination + " by " + arrivalDeadline;
@@ -103,32 +105,45 @@ public class RouteSpecification extends ValueObjectSupport<RouteSpecification> {
     arrivalDeadline = null;
   }
 
-  private class NotNullSpecification extends AbstractSpecification<Itinerary> {
+  // --- Private classes ---
+  
+  private final class NotNullSpecification extends FieldlessSpecification {
     @Override
-    public boolean isSatisfiedBy(final Itinerary itinerary) {
+    public final boolean isSatisfiedBy(final Itinerary itinerary) {
       return itinerary != null;
     }
   }
 
-  private class SameOriginSpecification extends AbstractSpecification<Itinerary> {
+  private final class SameOriginSpecification extends FieldlessSpecification {
     @Override
-    public boolean isSatisfiedBy(final Itinerary itinerary) {
+    public final boolean isSatisfiedBy(final Itinerary itinerary) {
       return origin.sameAs(itinerary.initialLoadLocation());
     }
   }
 
-  private class SameDestinationSpecification extends AbstractSpecification<Itinerary> {
+  private final class SameDestinationSpecification extends FieldlessSpecification {
     @Override
-    public boolean isSatisfiedBy(final Itinerary itinerary) {
+    public final boolean isSatisfiedBy(final Itinerary itinerary) {
       return destination.sameAs(itinerary.finalUnloadLocation());
     }
   }
 
-  private class MeetsDeadlineSpecification extends AbstractSpecification<Itinerary> {
+  private final class MeetsDeadlineSpecification extends FieldlessSpecification {
     @Override
-    public boolean isSatisfiedBy(final Itinerary itinerary) {
+    public final boolean isSatisfiedBy(final Itinerary itinerary) {
       return arrivalDeadline.after(itinerary.finalUnloadTime());
     }
   }
 
+  private static abstract class FieldlessSpecification extends AbstractSpecification<Itinerary> {
+    @Override
+    public final boolean equals(final Object that) {
+      return that != null && this.getClass().equals(that.getClass());
+    }
+    @Override
+    public final int hashCode() {
+      return this.getClass().hashCode();
+    }
+  }
+
 }