Inlined cargo factory.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/booking/BookingServiceImpl.java

@@ -3,9 +3,9 @@ package se.citerus.dddsample.tracking.core.application.booking;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
@@ -20,18 +20,18 @@ import java.util.List;
 public final class BookingServiceImpl implements BookingService {
 
   private final RoutingService routingService;
-  private final CargoFactory cargoFactory;
   private final CargoRepository cargoRepository;
   private final LocationRepository locationRepository;
   private final Log logger = LogFactory.getLog(getClass());
+  private final TrackingIdFactory trackingIdFactory;
 
   @Autowired
   public BookingServiceImpl(final RoutingService routingService,
-                            final CargoFactory cargoFactory,
+                            final TrackingIdFactory trackingIdFactory,
                             final CargoRepository cargoRepository,
                             final LocationRepository locationRepository) {
     this.routingService = routingService;
-    this.cargoFactory = cargoFactory;
+    this.trackingIdFactory = trackingIdFactory;
     this.cargoRepository = cargoRepository;
     this.locationRepository = locationRepository;
   }
@@ -41,8 +41,14 @@ public final class BookingServiceImpl implements BookingService {
   public TrackingId bookNewCargo(final UnLocode originUnLocode,
                                  final UnLocode destinationUnLocode,
                                  final Date arrivalDeadline) {
-    final Cargo cargo = cargoFactory.newCargo(originUnLocode, destinationUnLocode, arrivalDeadline);
+    final TrackingId trackingId = trackingIdFactory.nextTrackingId();
+    final Location origin = locationRepository.find(originUnLocode);
+    final Location destination = locationRepository.find(destinationUnLocode);
+    final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, arrivalDeadline);
+
+    final Cargo cargo = new Cargo(trackingId, routeSpecification);
     cargoRepository.store(cargo);
+    
     logger.info("Booked new cargo with tracking id " + cargo.trackingId().stringValue());
 
     return cargo.trackingId();

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

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.tracking.core.domain.model.cargo;
-
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
-import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-
-import java.util.Date;
-
-public class CargoFactory {
-
-  private final LocationRepository locationRepository;
-  private final TrackingIdFactory trackingIdFactory;
-
-  public CargoFactory(LocationRepository locationRepository, TrackingIdFactory trackingIdFactory) {
-    this.locationRepository = locationRepository;
-    this.trackingIdFactory = trackingIdFactory;
-  }
-
-  public Cargo newCargo(UnLocode originUnLocode, UnLocode destinationUnLocode, Date arrivalDeadline) {
-    final TrackingId trackingId = trackingIdFactory.nextTrackingId();
-    final Location origin = locationRepository.find(originUnLocode);
-    final Location destination = locationRepository.find(destinationUnLocode);
-    final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, arrivalDeadline);
-
-    return new Cargo(trackingId, routeSpecification);
-  }
-
-}

dddsample/tracking/core/src/main/resources/contexts/context-domain.xml

@@ -8,8 +8,6 @@
 
   <context:component-scan base-package="se.citerus.dddsample.tracking.core.domain"/>
 
-  <bean class="se.citerus.dddsample.tracking.core.domain.model.cargo.CargoFactory" autowire="constructor"/>
-
   <bean class="se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory" autowire="constructor"/>
   
 </beans>

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/booking/BookingServiceTest.java

@@ -2,7 +2,10 @@ package se.citerus.dddsample.tracking.core.application.booking;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdFactory;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.CHICAGO;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.STOCKHOLM;
@@ -24,8 +27,7 @@ public class BookingServiceTest extends TestCase {
     locationRepository = createMock(LocationRepository.class);
     routingService = createMock(RoutingService.class);
     trackingIdFactory = createMock(TrackingIdFactory.class);
-    CargoFactory cargoFactory = new CargoFactory(locationRepository, trackingIdFactory);
-    bookingService = new BookingServiceImpl(routingService, cargoFactory, cargoRepository, locationRepository);
+    bookingService = new BookingServiceImpl(routingService, trackingIdFactory, cargoRepository, locationRepository);
   }
 
   public void testRegisterNew() {

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/event/CargoUpdaterTest.java

@@ -8,8 +8,9 @@ import org.junit.Before;
 import org.junit.Test;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoFactory;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.*;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.LOAD;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
@@ -23,28 +24,31 @@ public class CargoUpdaterTest {
 
   SystemEvents systemEvents;
   CargoUpdater cargoUpdater;
-  CargoFactory cargoFactory;
   HandlingEventFactory handlingEventFactory;
   CargoRepository cargoRepository;
   HandlingEventRepository handlingEventRepository;
   LocationRepository locationRepository;
   VoyageRepository voyageRepository;
+  private TrackingIdFactoryInMem trackingIdFactory;
 
   @Before
-  public void setUp() throws CannotCreateHandlingEventException {
+  public void setUp() {
     systemEvents = createMock(SystemEvents.class);
     cargoRepository = new CargoRepositoryInMem();
     handlingEventRepository = new HandlingEventRepositoryInMem();
     locationRepository = new LocationRepositoryInMem();
     voyageRepository = new VoyageRepositoryInMem();
-    cargoFactory = new CargoFactory(locationRepository, new TrackingIdFactoryInMem());
+    trackingIdFactory = new TrackingIdFactoryInMem();
     handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
     cargoUpdater = new CargoUpdater(systemEvents, cargoRepository, handlingEventRepository);
   }
 
   @Test
   public void updateCargo() throws CannotCreateHandlingEventException {
-    Cargo cargo = cargoFactory.newCargo(HONGKONG.unLocode(), GOTHENBURG.unLocode(), toDate("2009-10-15"));
+    TrackingId trackingId = trackingIdFactory.nextTrackingId();
+    RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, GOTHENBURG, toDate("2009-10-15"));
+
+    Cargo cargo = new Cargo(trackingId, routeSpecification);
     cargoRepository.store(cargo);
 
     HandlingEvent handlingEvent = handlingEventFactory.createHandlingEvent(

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

@@ -1,42 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-aug-08
- * $Id$
- */
-package se.citerus.dddsample.tracking.core.domain.model.cargo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
-import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HONGKONG;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.ROTTERDAM;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
-
-public class CargoFactoryTest {
-
-  CargoFactory cargoFactory;
-
-  @Before
-  public void setup() {
-    TrackingIdFactory stubFactory = new TrackingIdFactory() {
-      @Override
-      public TrackingId nextTrackingId() {
-        return new TrackingId("ABC");
-      }
-    };
-    cargoFactory = new CargoFactory(new LocationRepositoryInMem(), stubFactory);
-  }
-
-  @Test
-  public void createNewCargo() {
-    Cargo cargo = cargoFactory.newCargo(HONGKONG.unLocode(), ROTTERDAM.unLocode(), toDate("2009-07-01"));
-
-    assertNotNull(cargo);
-    assertEquals(cargo.trackingId(), new TrackingId("ABC"));
-    assertEquals(cargo.routeSpecification(), new RouteSpecification(HONGKONG, ROTTERDAM, toDate("2009-07-01")));
-  }
-
-}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/scenario/CargoLifecycleScenarioTest.java

@@ -38,7 +38,7 @@ public class CargoLifecycleScenarioTest {
   VoyageRepository voyageRepository = new VoyageRepositoryInMem();
 
   HandlingEventFactory handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
-  CargoFactory cargoFactory = new CargoFactory(locationRepository, new TrackingIdFactoryInMem());
+  TrackingIdFactory trackingIdFactory = new TrackingIdFactoryInMem();
 
   /**
    * This is a domain service interface, whose implementation
@@ -188,7 +188,10 @@ public class CargoLifecycleScenarioTest {
 
   private void bookCargoFromHongkongToStockholm() {
     Date arrivalDeadline = toDate("2009-03-18");
-    Cargo cargo = cargoFactory.newCargo(HONGKONG.unLocode(), STOCKHOLM.unLocode(), arrivalDeadline);
+    final TrackingId trackingId1 = trackingIdFactory.nextTrackingId();
+    final RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, STOCKHOLM, arrivalDeadline);
+
+    Cargo cargo = new Cargo(trackingId1, routeSpecification);
     cargoRepository.store(cargo);
 
     trackingId = cargo.trackingId();

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/scenario/VoyageRescheduledScenarioTest.java

@@ -11,17 +11,13 @@ import static org.hamcrest.Matchers.is;
 import org.junit.Before;
 import org.junit.Test;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoFactory;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.MISROUTED;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.ROUTED;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdFactoryInMem;
 
 import java.util.Date;
@@ -35,12 +31,17 @@ public class VoyageRescheduledScenarioTest {
 
   @Before
   public void setupCargo() {
+    TrackingIdFactoryInMem trackingIdFactory = new TrackingIdFactoryInMem();
+
     // Creating new voyages to avoid rescheduling shared ones, breaking other tests
     voyage1 = new Voyage(new VoyageNumber("V1"), HONGKONG_TO_NEW_YORK.schedule());
     voyage2 = new Voyage(new VoyageNumber("V2"), NEW_YORK_TO_DALLAS.schedule());
     voyage3 = new Voyage(new VoyageNumber("V3"), DALLAS_TO_HELSINKI.schedule());
-    CargoFactory cargoFactory = new CargoFactory(new LocationRepositoryInMem(), new TrackingIdFactoryInMem());
-    cargo = cargoFactory.newCargo(HANGZOU.unLocode(), STOCKHOLM.unLocode(), toDate("2008-12-23"));
+
+    TrackingId trackingId = trackingIdFactory.nextTrackingId();
+    RouteSpecification routeSpecification = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2008-12-23"));
+
+    cargo = new Cargo(trackingId, routeSpecification);
     Itinerary itinerary = new Itinerary(
       Leg.deriveLeg(voyage1, HANGZOU, NEWYORK),
       Leg.deriveLeg(voyage2, NEWYORK, DALLAS),