Removed redundant constructor argument for Cargo (origin can be derived from the inital route specification)

dddsample/src/main/java/se/citerus/dddsample/application/impl/BookingServiceImpl.java

@@ -44,7 +44,7 @@ public final class BookingServiceImpl implements BookingService {
     final Location destination = locationRepository.find(destinationUnLocode);
     final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, arrivalDeadline);
 
-    final Cargo cargo = new Cargo(trackingId, origin, routeSpecification);
+    final Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     cargoRepository.store(cargo);
     logger.info("Booked new cargo with tracking id " + cargo.trackingId().idString());

dddsample/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -224,7 +224,7 @@ public class SampleDataGenerator implements ServletContextListener {
 
         RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-03-15"));
         TrackingId trackingId = new TrackingId("ABC123");
-        Cargo abc123 = new Cargo(trackingId, HELSINKI, routeSpecification);
+        Cargo abc123 = new Cargo(trackingId, routeSpecification);
 
         Itinerary itinerary = new Itinerary(asList(
           new Leg(HONGKONG_TO_NEW_YORK, HONGKONG, NEWYORK, toDate("2009-03-02"), toDate("2009-03-05")),
@@ -263,7 +263,7 @@ public class SampleDataGenerator implements ServletContextListener {
 
         RouteSpecification routeSpecification1 = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2009-03-18"));
         TrackingId trackingId1 = new TrackingId("JKL567");
-        Cargo jkl567 = new Cargo(trackingId1, HANGZOU, routeSpecification1);
+        Cargo jkl567 = new Cargo(trackingId1, routeSpecification1);
 
         Itinerary itinerary1 = new Itinerary(asList(
           new Leg(HONGKONG_TO_NEW_YORK, HANGZOU, NEWYORK, toDate("2009-03-03"), toDate("2009-03-05")),

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

@@ -52,15 +52,16 @@ public class Cargo implements Entity<Cargo> {
   
   private static final Date ETA_UNKOWN = null;
 
-  // TODO origin can be taken from route spec on creation, even if the origin never changes
-  public Cargo(final TrackingId trackingId, final Location origin, final RouteSpecification routeSpecification) {
+  public Cargo(final TrackingId trackingId, final RouteSpecification routeSpecification) {
     Validate.notNull(trackingId, "Tracking id is required");
-    Validate.notNull(origin, "Origin location is required");
     Validate.notNull(routeSpecification, "Route specification is required");
 
     this.trackingId = trackingId;
-    this.origin = origin;
+    // Cargo origin never changes, even if the route specification changes.
+    // However, at creation, cargo orgin can be derived from the initial route specification.
+    this.origin = routeSpecification.origin();
     this.routeSpecification = routeSpecification;
+
     deriveDeliveryProgress(Collections.<HandlingEvent>emptyList());
   }
 

dddsample/src/test/java/se/citerus/dddsample/application/HandlingEventServiceTest.java

@@ -28,8 +28,8 @@ public class HandlingEventServiceTest extends TestCase {
   private LocationRepository locationRepository;
   private HandlingEventFactory handlingEventFactory;
 
-  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), HAMBURG, new RouteSpecification(HAMBURG, TOKYO, new Date()));
-  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), HONGKONG, new RouteSpecification(HONGKONG, HELSINKI, new Date()));
+  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new RouteSpecification(HAMBURG, TOKYO, new Date()));
+  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HONGKONG, HELSINKI, new Date()));
 
   protected void setUp() throws Exception{
     cargoRepository = createMock(CargoRepository.class);
@@ -90,7 +90,7 @@ public class HandlingEventServiceTest extends TestCase {
     expect(voyageRepository.find(voyageNumber)).andReturn(null);
 
     final TrackingId trackingId = new TrackingId("XYZ");
-    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, CHICAGO, new RouteSpecification(CHICAGO, STOCKHOLM, new Date())));
+    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new RouteSpecification(CHICAGO, STOCKHOLM, new Date())));
 
     expect(locationRepository.find(MELBOURNE.unLocode())).andReturn(MELBOURNE);
 

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

@@ -37,7 +37,7 @@ public class CargoTest extends TestCase {
       STOCKHOLM, MELBOURNE, arrivalDeadline
     );
 
-    final Cargo cargo = new Cargo(trackingId, STOCKHOLM, routeSpecification);
+    final Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     assertEquals(NOT_ROUTED, cargo.routingStatus());
     assertEquals(NOT_RECEIVED, cargo.delivery().transportStatus());
@@ -46,7 +46,7 @@ public class CargoTest extends TestCase {
   }
 
   public void testRoutingStatus() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
     final Itinerary good = new Itinerary();
     final Itinerary bad = new Itinerary();
     final RouteSpecification acceptOnlyGood = new RouteSpecification(cargo.origin(), cargo.routeSpecification().destination(), new Date()) {
@@ -68,7 +68,7 @@ public class CargoTest extends TestCase {
   }
 
   public void testlastKnownLocationUnknownWhenNoEvents() throws Exception {
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     assertEquals(Location.UNKNOWN, cargo.delivery().lastKnownLocation());
   }
@@ -100,10 +100,10 @@ public class CargoTest extends TestCase {
   public void testEquality() throws Exception {
     RouteSpecification spec1 = new RouteSpecification(STOCKHOLM, HONGKONG, new Date());
     RouteSpecification spec2 = new RouteSpecification(STOCKHOLM, MELBOURNE, new Date());
-    Cargo c1 = new Cargo(new TrackingId("ABC"), STOCKHOLM, spec1);
-    Cargo c2 = new Cargo(new TrackingId("CBA"), STOCKHOLM, spec1);
-    Cargo c3 = new Cargo(new TrackingId("ABC"), STOCKHOLM, spec2);
-    Cargo c4 = new Cargo(new TrackingId("ABC"), STOCKHOLM, spec1);
+    Cargo c1 = new Cargo(new TrackingId("ABC"), spec1);
+    Cargo c2 = new Cargo(new TrackingId("CBA"), spec1);
+    Cargo c3 = new Cargo(new TrackingId("ABC"), spec2);
+    Cargo c4 = new Cargo(new TrackingId("ABC"), spec1);
 
     assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c4));
     assertTrue("Cargos should be equal when TrackingIDs are equal", c1.equals(c3));
@@ -146,7 +146,7 @@ public class CargoTest extends TestCase {
 
   // TODO: Generate test data some better way
   private Cargo populateCargoReceivedStockholm() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     HandlingEvent he = new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.RECEIVE, STOCKHOLM);
     events.add(he);
@@ -165,7 +165,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo populateCargoOffHongKong() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
 
     events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
@@ -179,7 +179,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo populateCargoOnHamburg() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
     events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
@@ -190,7 +190,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo populateCargoOffMelbourne() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
     events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
@@ -206,7 +206,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo populateCargoOnHongKong() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
 
     events.add(new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, voyage));
     events.add(new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, voyage));
@@ -222,7 +222,7 @@ public class CargoTest extends TestCase {
 
   public void testIsMisdirected() throws Exception {
     //A cargo with no itinerary is not misdirected
-    Cargo cargo = new Cargo(new TrackingId("TRKID"), SHANGHAI, new RouteSpecification(SHANGHAI, GOTHENBURG, new Date()));
+    Cargo cargo = new Cargo(new TrackingId("TRKID"), new RouteSpecification(SHANGHAI, GOTHENBURG, new Date()));
     assertFalse(cargo.isMisdirected());
 
     cargo = setUpCargoWithItinerary(SHANGHAI, ROTTERDAM, GOTHENBURG);
@@ -286,7 +286,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo setUpCargoWithItinerary(Location origin, Location midpoint, Location destination) {
-    Cargo cargo = new Cargo(new TrackingId("CARGO1"), origin, new RouteSpecification(origin, destination, new Date()));
+    Cargo cargo = new Cargo(new TrackingId("CARGO1"), new RouteSpecification(origin, destination, new Date()));
 
     Itinerary itinerary = new Itinerary(
       Arrays.asList(

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

@@ -8,7 +8,7 @@ import java.util.Date;
 
 public class DeliveryTest extends TestCase {
 
-  private Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, new RouteSpecification(HONGKONG, NEWYORK, new Date()));
+  private Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HONGKONG, NEWYORK, new Date()));
 
   public void testToSilenceWarnings() throws Exception {
     assertTrue(true);

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

@@ -36,7 +36,7 @@ public class ItineraryTest extends TestCase {
 
     TrackingId trackingId = new TrackingId("CARGO1");
     RouteSpecification routeSpecification = new RouteSpecification(SHANGHAI, GOTHENBURG, new Date());
-    Cargo cargo = new Cargo(trackingId, SHANGHAI, routeSpecification);
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     Itinerary itinerary = new Itinerary(
       Arrays.asList(

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactoryTest.java

@@ -39,7 +39,7 @@ public class HandlingEventFactoryTest extends TestCase {
 
     trackingId = new TrackingId("ABC");
     RouteSpecification routeSpecification = new RouteSpecification(TOKYO, HELSINKI, new Date());
-    cargo = new Cargo(trackingId, TOKYO, routeSpecification);
+    cargo = new Cargo(trackingId, routeSpecification);
   }
 
   public void testCreateHandlingEventWithCarrierMovement() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventTest.java

@@ -19,7 +19,7 @@ public class HandlingEventTest extends TestCase {
   protected void setUp() throws Exception {
     TrackingId trackingId = new TrackingId("XYZ");
     RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, NEWYORK, new Date());
-    cargo = new Cargo(trackingId, HONGKONG, routeSpecification);
+    cargo = new Cargo(trackingId, routeSpecification);
   }
 
   public void testNewWithCarrierMovement() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -105,7 +105,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     Location origin = locationRepository.find(STOCKHOLM.unLocode());
     Location destination = locationRepository.find(MELBOURNE.unLocode());
 
-    Cargo cargo = new Cargo(trackingId, origin, new RouteSpecification(origin, destination, new Date()));
+    Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
     cargoRepository.store(cargo);
 
     cargo.assignToRoute(new Itinerary(Arrays.asList(

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/CargoRepositoryInMem.java

@@ -88,7 +88,7 @@ public class CargoRepositoryInMem implements CargoRepository {
                                                      Collection<HandlingEvent> events) {
 
     final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, new Date());
-    final Cargo cargo = new Cargo(trackingId, origin, routeSpecification);
+    final Cargo cargo = new Cargo(trackingId, routeSpecification);
     cargo.deriveDeliveryProgress(new ArrayList<HandlingEvent>(events));
 
     return cargo;

dddsample/src/test/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingServiceTest.java

@@ -47,7 +47,7 @@ public class ExternalRoutingServiceTest extends TestCase {
   public void testCalculatePossibleRoutes() {
     TrackingId trackingId = new TrackingId("ABC");
     RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, new Date());
-    Cargo cargo = new Cargo(trackingId, HONGKONG, routeSpecification);
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
 
     expect(voyageRepository.find(isA(VoyageNumber.class))).andStubReturn(SampleVoyages.CM002);
     

dddsample/src/test/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/CargoRoutingDTOAssemblerTest.java

@@ -18,7 +18,7 @@ public class CargoRoutingDTOAssemblerTest extends TestCase {
 
     final Location origin = STOCKHOLM;
     final Location destination = MELBOURNE;
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, new RouteSpecification(origin, destination, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(origin, destination, new Date()));
 
     final Itinerary itinerary = new Itinerary(
       Arrays.asList(
@@ -47,7 +47,7 @@ public class CargoRoutingDTOAssemblerTest extends TestCase {
   public void testToDTO_NoItinerary() throws Exception {
     final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
 
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
     final CargoRoutingDTO dto = assembler.toDTO(cargo);
 
     assertEquals("XYZ", dto.getTrackingId());

dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -15,7 +15,7 @@ import java.util.*;
 public class CargoTrackingViewAdapterTest extends TestCase {
 
   public void testCreate() {
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), HANGZOU, new RouteSpecification(HANGZOU, HELSINKI, new Date()));
+    Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(HANGZOU, HELSINKI, new Date()));
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
     events.add(new HandlingEvent(cargo, new Date(1), new Date(2), HandlingEvent.Type.RECEIVE, HANGZOU));