Adapted currentCarrierMovement and currentLocation to null object pattern

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

@@ -71,7 +71,7 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     if (status().equals(IN_PORT)) {
       return lastEvent().location();
     } else {
-      return null;
+      return Location.UNKNOWN;
     }
   }
 
@@ -79,7 +79,7 @@ public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
     if (status().equals(ONBOARD_CARRIER)) {
       return lastEvent().carrierMovement();
     } else {
-      return null;
+      return CarrierMovement.NONE;
     }
   }
 

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

@@ -4,6 +4,7 @@ import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
 import java.text.DateFormat;
@@ -17,10 +18,10 @@ public class DeliveryHistoryTest extends TestCase {
   public void testEvensOrderedByTimeOccured() throws Exception {
 
     DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), HONGKONG, NEWYORK);
-    HandlingEvent he1 = new HandlingEvent(cargo, df.parse("2010-01-03"), new Date(), HandlingEvent.Type.RECEIVE, NEWYORK, null);
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("CAR_001"), HONGKONG, NEWYORK, new Date(), new Date());
+    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, carrierMovement);
-    HandlingEvent he3 = new HandlingEvent(cargo, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, HONGKONG, null);
+    HandlingEvent he3 = new HandlingEvent(cargo, df.parse("2010-01-04"), new Date(), HandlingEvent.Type.CLAIM, HONGKONG);
     HandlingEvent he4 = new HandlingEvent(cargo, df.parse("2010-01-02"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, carrierMovement);
     DeliveryHistory dh = new DeliveryHistory(Arrays.asList(he1, he2, he3, he4));
 
@@ -38,11 +39,11 @@ public class DeliveryHistoryTest extends TestCase {
 
     assertEquals(StatusCode.NOT_RECEIVED, deliveryHistory.status());
 
-    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG, null));
+    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
     deliveryHistory = new DeliveryHistory(events);
     assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
 
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG);
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG, new Date(), new Date());
     events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, carrierMovement));
     deliveryHistory = new DeliveryHistory(events);
     assertEquals(StatusCode.ONBOARD_CARRIER, deliveryHistory.status());
@@ -51,7 +52,7 @@ public class DeliveryHistoryTest extends TestCase {
     deliveryHistory = new DeliveryHistory(events);
     assertEquals(StatusCode.IN_PORT, deliveryHistory.status());
 
-    events.add(new HandlingEvent(cargo, new Date(40), new Date(41), HandlingEvent.Type.CLAIM, HAMBURG, null));
+    events.add(new HandlingEvent(cargo, new Date(40), new Date(41), HandlingEvent.Type.CLAIM, HAMBURG));
     deliveryHistory = new DeliveryHistory(events);
     assertEquals(StatusCode.CLAIMED, deliveryHistory.status());
   }
@@ -60,16 +61,18 @@ public class DeliveryHistoryTest extends TestCase {
     Set<HandlingEvent> events = new HashSet<HandlingEvent>();
     DeliveryHistory deliveryHistory = new DeliveryHistory(events);
 
-    assertNull(deliveryHistory.currentLocation());
+    assertEquals(Location.UNKNOWN, deliveryHistory.currentLocation());
 
-    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG, null));
+    events.add(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG));
     deliveryHistory = new DeliveryHistory(events);
+
     assertEquals(HAMBURG, deliveryHistory.currentLocation());
 
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG);
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("ABC"), HAMBURG, HAMBURG, new Date(), new Date());
     events.add(new HandlingEvent(cargo, new Date(20), new Date(21), HandlingEvent.Type.LOAD, HAMBURG, carrierMovement));
     deliveryHistory = new DeliveryHistory(events);
-    assertNull(deliveryHistory.currentLocation());
+
+    assertEquals(Location.UNKNOWN, deliveryHistory.currentLocation());
   }
 
 }