A few minor refactorings.

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

@@ -12,7 +12,6 @@ import java.util.Date;
 
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.NOT_ROUTED;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.TransportStatus.ONBOARD_CARRIER;
-import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.UNLOAD;
 import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.customsIn;
 
 /**
@@ -106,18 +105,19 @@ public class Cargo extends EntitySupport<Cargo,TrackingId> {
   }
 
   /**
-   * @return Next expected activity.
+   * @return Next expected activity. If the cargo is not on route (misdirected and/or misrouted),
+   * it cannot be determined and null is returned.
    */
   public HandlingActivity nextExpectedActivity() {
     if (!delivery.isOnRoute(itinerary, routeSpecification)) {
       return null;
     }
 
-    if (unloadedInCustomsClearancePoint()) {
+    if (delivery.isUnloadedIn(customsClearancePoint())) {
       return customsIn(customsClearancePoint());
+    } else {
+      return itinerary.activitySucceding(delivery.mostRecentPhysicalHandlingActivity());
     }
-
-    return itinerary.activitySucceding(delivery.mostRecentPhysicalHandlingActivity());
   }
 
   /**
@@ -228,7 +228,7 @@ public class Cargo extends EntitySupport<Cargo,TrackingId> {
     if (customsClearancePoint().sameAs(routeSpecification.destination())) {
       return customsIn(customsClearancePoint()).sameValueAs(mostRecentHandlingActivity());
     } else {
-      return delivery.onTheGroundAtDestination(routeSpecification);
+      return delivery.isUnloadedIn(routeSpecification.destination());
     }
   }
 
@@ -287,12 +287,6 @@ public class Cargo extends EntitySupport<Cargo,TrackingId> {
     }
   }
 
-  private boolean unloadedInCustomsClearancePoint() {
-    return mostRecentHandlingActivity() != null &&
-           mostRecentHandlingActivity().location().sameAs(customsClearancePoint()) &&
-           mostRecentHandlingActivity().type() == UNLOAD;
-  }
-
   @Override
   public String toString() {
     return trackingId + " (" + routeSpecification + ")";

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

@@ -23,6 +23,13 @@ class Delivery extends ValueObjectSupport<Delivery> {
   private final Date lastUpdatedOn;
 
   /**
+   * @return Initial delivery, before any handling has taken place
+   */
+  static Delivery beforeHandling() {
+    return new Delivery(null, null);
+  }
+
+  /**
    * Derives a new delivery when a cargo has been handled.
    *
    * @param newHandlingActivity  handling activity
@@ -45,13 +52,6 @@ class Delivery extends ValueObjectSupport<Delivery> {
     return new Delivery(mostRecentHandlingActivity, mostRecentPhysicalHandlingActivity);
   }
 
-  /**
-   * @return Initial delivery, before any handling has taken place
-   */
-  static Delivery beforeHandling() {
-    return new Delivery(null, null);
-  }
-
   private Delivery(final HandlingActivity mostRecentHandlingActivity,
                    final HandlingActivity mostRecentPhysicalHandlingActivity) {
     this.mostRecentHandlingActivity = mostRecentHandlingActivity;
@@ -120,16 +120,6 @@ class Delivery extends ValueObjectSupport<Delivery> {
   }
 
   /**
-   * @return True if the cargo has been unloaded at the final destination.
-   * @param routeSpecification route specification
-   */
-  boolean onTheGroundAtDestination(final RouteSpecification routeSpecification) {
-    return hasBeenHandled() &&
-           mostRecentHandlingActivity.type() == UNLOAD &&
-           routeSpecification.destination().sameAs(mostRecentHandlingActivity.location());
-  }
-
-  /**
    * @return Routing status.
    * @param itinerary itinerary
    * @param routeSpecification route specification
@@ -168,4 +158,9 @@ class Delivery extends ValueObjectSupport<Delivery> {
     mostRecentHandlingActivity = mostRecentPhysicalHandlingActivity = null;
   }
 
+  boolean isUnloadedIn(Location customsClearancePoint) {
+    return hasBeenHandled() &&
+           mostRecentHandlingActivity.location().sameAs(customsClearancePoint) &&
+           mostRecentHandlingActivity().type() == UNLOAD;
+  }
 }

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/DeliveryTest.java

@@ -1,6 +1,12 @@
 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import junit.framework.TestCase;
+import se.citerus.dddsample.tracking.core.domain.model.location.Location;
+import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
+
+import java.util.Date;
+
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
@@ -8,15 +14,10 @@ import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatu
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.ROUTED;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.TransportStatus.*;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.customsIn;
 import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.loadOnto;
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-
-import java.util.Date;
 
 public class DeliveryTest extends TestCase {
 
@@ -61,7 +62,7 @@ public class DeliveryTest extends TestCase {
   public void testDerivedFromRouteSpecificationAndItinerary() throws Exception {
     assertEquals(ROUTED, delivery.routingStatus(itinerary, routeSpecification));
     assertEquals(Voyage.NONE, delivery.currentVoyage());
-    assertFalse(delivery.onTheGroundAtDestination(routeSpecification));
+    assertFalse(delivery.isUnloadedIn(routeSpecification.destination()));
     assertEquals(Location.NONE, delivery.lastKnownLocation());
     assertEquals(NOT_RECEIVED, delivery.transportStatus());
     assertTrue(delivery.lastUpdatedOn().before(new Date()));
@@ -79,7 +80,7 @@ public class DeliveryTest extends TestCase {
     assertEquals(IN_PORT, newDelivery.transportStatus());
 
     // Changed on handling and/or (re-)routing
-    assertFalse(newDelivery.onTheGroundAtDestination(routeSpecification));
+    assertFalse(newDelivery.isUnloadedIn(routeSpecification.destination()));
 
     // Changed on (re-)routing
     assertEquals(ROUTED, newDelivery.routingStatus(itinerary, routeSpecification));
@@ -96,7 +97,7 @@ public class DeliveryTest extends TestCase {
     assertEquals(HANGZOU, newDelivery.lastKnownLocation());
     assertEquals(ONBOARD_CARRIER, newDelivery.transportStatus());
 
-    assertFalse(newDelivery.onTheGroundAtDestination(routeSpecification));
+    assertFalse(newDelivery.isUnloadedIn(routeSpecification.destination()));
 
     assertEquals(ROUTED, newDelivery.routingStatus(itinerary, routeSpecification));
 
@@ -113,7 +114,7 @@ public class DeliveryTest extends TestCase {
     assertEquals(STOCKHOLM, newDelivery.lastKnownLocation());
     assertEquals(IN_PORT, newDelivery.transportStatus());
 
-    assertTrue(newDelivery.onTheGroundAtDestination(routeSpecification));
+    assertTrue(newDelivery.isUnloadedIn(routeSpecification.destination()));
 
     assertEquals(ROUTED, newDelivery.routingStatus(itinerary, routeSpecification));
 
@@ -128,7 +129,7 @@ public class DeliveryTest extends TestCase {
     assertEquals(STOCKHOLM, newDelivery.lastKnownLocation());
     assertEquals(CLAIMED, newDelivery.transportStatus());
 
-    assertFalse(newDelivery.onTheGroundAtDestination(routeSpecification));
+    assertFalse(newDelivery.isUnloadedIn(routeSpecification.destination()));
 
     assertEquals(ROUTED, newDelivery.routingStatus(itinerary, routeSpecification));
 
@@ -146,7 +147,7 @@ public class DeliveryTest extends TestCase {
 
     // Next handling activity is undefined. Need a new itinerary to know what to do.
 
-    assertFalse(newDelivery.onTheGroundAtDestination(routeSpecification));
+    assertFalse(newDelivery.isUnloadedIn(routeSpecification.destination()));
 
     assertEquals(ROUTED, newDelivery.routingStatus(itinerary, routeSpecification));