Removed Delivery.currentLocation(), using lastKnownLocation() instead.

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

@@ -71,17 +71,6 @@ public class Delivery implements ValueObject<Delivery> {
   }
 
   /**
-   * @return Current location, if  
-   */
-  public Location currentLocation() {
-    if (transportStatus().equals(IN_PORT)) {
-      return lastEvent().location();
-    } else {
-      return Location.UNKNOWN;
-    }
-  }
-
-  /**
    * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
    */
   public Location lastKnownLocation() {

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -67,7 +67,7 @@ public final class CargoTrackingViewAdapter {
     final Object[] args;
     switch (delivery.transportStatus()) {
       case IN_PORT:
-        args = new Object[] {getDisplayText(delivery.currentLocation())};
+        args = new Object[] {getDisplayText(delivery.lastKnownLocation())};
         break;
       case ONBOARD_CARRIER:
         args = new Object[] {delivery.currentVoyage().voyageNumber().idString()};

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

@@ -15,7 +15,6 @@ public class DeliveryTest extends TestCase {
   private Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, NEWYORK);
 
   public void testEvensOrderedByTimeOccured() throws Exception {
-
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
     HandlingEvent he1 = new HandlingEvent(cargo, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, NEWYORK);
     HandlingEvent he2 = new HandlingEvent(cargo, df.parse("2010-01-01"), new Date(), HandlingEvent.Type.LOAD, NEWYORK, CM003);
@@ -54,21 +53,21 @@ public class DeliveryTest extends TestCase {
     assertEquals(TransportStatus.CLAIMED, delivery.transportStatus());
   }
 
-  public void testCurrentLocation() throws Exception {
+  public void testLastKnownLocation() throws Exception {
     Set<HandlingEvent> events = new HashSet<HandlingEvent>();
     Delivery delivery = new Delivery(events);
 
-    assertEquals(Location.UNKNOWN, delivery.currentLocation());
+    assertEquals(Location.UNKNOWN, delivery.lastKnownLocation());
 
     events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
     delivery = new Delivery(events);
 
-    assertEquals(HAMBURG, delivery.currentLocation());
+    assertEquals(HAMBURG, delivery.lastKnownLocation());
 
     events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, CM003));
     delivery = new Delivery(events);
 
-    assertEquals(Location.UNKNOWN, delivery.currentLocation());
+    assertEquals(HAMBURG, delivery.lastKnownLocation());
   }
 
 }