Changed Itinerary to use load/unload semantics consistently, instead of arrival/departure in some cases.

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

@@ -216,7 +216,7 @@ public class Delivery implements ValueObject<Delivery> {
 
   private Date calculateEta(Itinerary itinerary) {
     if (onTrack()) {
-      return itinerary.finalArrivalDate();
+      return itinerary.finalUnloadTime();
     } else {
       return ETA_UNKOWN;
     }

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

@@ -34,7 +34,7 @@ public class Itinerary implements ValueObject<Itinerary> {
     this.legs = legs;
   }
 
-  public Itinerary(Leg... legs) {
+  public Itinerary(final Leg... legs) {
     this(Arrays.asList(legs));
   }
 
@@ -97,8 +97,8 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return The initial departure location.
    */
-  Location initialDepartureLocation() {
-    if (legs.isEmpty()) {
+  Location initialLoadLocation() {
+    if (isEmpty()) {
       return Location.UNKNOWN;
     } else {
       return legs.get(0).loadLocation();
@@ -108,8 +108,8 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return The final arrival location.
    */
-  Location finalArrivalLocation() {
-    if (legs.isEmpty()) {
+  Location finalUnloadLocation() {
+    if (isEmpty()) {
       return Location.UNKNOWN;
     } else {
       return lastLeg().unloadLocation();
@@ -119,7 +119,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return Date when cargo arrives at final destination.
    */
-  Date finalArrivalDate() {
+  Date finalUnloadTime() {
     if (isEmpty()) return new Date(END_OF_DAYS.getTime());
     return new Date(lastLeg().unloadTime().getTime());
   }

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

@@ -83,9 +83,9 @@ public class RouteSpecification extends AbstractSpecification<Itinerary> impleme
   @Override
   public boolean isSatisfiedBy(final Itinerary itinerary) {
     return itinerary != null &&
-      origin().sameIdentityAs(itinerary.initialDepartureLocation()) &&
-      destination().sameIdentityAs(itinerary.finalArrivalLocation()) &&
-      arrivalDeadline().after(itinerary.finalArrivalDate());
+      origin().sameIdentityAs(itinerary.initialLoadLocation()) &&
+      destination().sameIdentityAs(itinerary.finalUnloadLocation()) &&
+      arrivalDeadline().after(itinerary.finalUnloadTime());
   }
 
   @Override