Rename TrackingIdGenerator TrackingIdFactory, moved into cargo aggregate package.

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

@@ -1,30 +1,23 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-jun-14
- * $Id$
- */
 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 se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 import java.util.Date;
 
 public class CargoFactory {
 
   private final LocationRepository locationRepository;
-  private final TrackingIdGenerator trackingIdGenerator;
+  private final TrackingIdFactory trackingIdFactory;
 
-  public CargoFactory(LocationRepository locationRepository, TrackingIdGenerator trackingIdGenerator) {
+  public CargoFactory(LocationRepository locationRepository, TrackingIdFactory trackingIdFactory) {
     this.locationRepository = locationRepository;
-    this.trackingIdGenerator = trackingIdGenerator;
+    this.trackingIdFactory = trackingIdFactory;
   }
 
   public Cargo newCargo(UnLocode originUnLocode, UnLocode destinationUnLocode, Date arrivalDeadline) {
-    final TrackingId trackingId = trackingIdGenerator.nextTrackingId();
+    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);

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

@@ -0,0 +1,10 @@
+package se.citerus.dddsample.tracking.core.domain.model.cargo;
+
+/**
+ * Generates tracking ids for cargos. This is a domain service.
+ */
+public interface TrackingIdFactory {
+
+  TrackingId nextTrackingId();
+
+}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/service/TrackingIdGenerator.java

@@ -1,12 +0,0 @@
-package se.citerus.dddsample.tracking.core.domain.service;
-
-import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-
-/**
- * Generates tracking ids for cargos. This is a domain service.
- */
-public interface TrackingIdGenerator {
-
-  TrackingId nextTrackingId();
-
-}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdGenerator.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdFactory.java

@@ -10,16 +10,16 @@ import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdFactory;
 
 @Repository
-public class DatabaseTrackingIdGenerator implements TrackingIdGenerator {
+public class DatabaseTrackingIdFactory implements TrackingIdFactory {
 
   private final SessionFactory sessionFactory;
   private static final String SEQUENCE_NAME = "TRACKING_ID_SEQ";
 
   @Autowired
-  public DatabaseTrackingIdGenerator(final SessionFactory sessionFactory) {
+  public DatabaseTrackingIdFactory(final SessionFactory sessionFactory) {
     this.sessionFactory = sessionFactory;
   }
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/inmemory/TrackingIdGeneratorInMem.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/inmemory/TrackingIdFactoryInMem.java

@@ -7,11 +7,11 @@
 package se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdFactory;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-public class TrackingIdGeneratorInMem implements TrackingIdGenerator {
+public class TrackingIdFactoryInMem implements TrackingIdFactory {
 
   private static final AtomicLong SEQ = new AtomicLong(1);
 

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

@@ -8,7 +8,6 @@ import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLoc
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.STOCKHOLM;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.service.RoutingService;
-import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 import java.util.Date;
 
@@ -18,14 +17,14 @@ public class BookingServiceTest extends TestCase {
   CargoRepository cargoRepository;
   LocationRepository locationRepository;
   RoutingService routingService;
-  TrackingIdGenerator trackingIdGenerator;
+  TrackingIdFactory trackingIdFactory;
 
   protected void setUp() throws Exception {
     cargoRepository = createMock(CargoRepository.class);
     locationRepository = createMock(LocationRepository.class);
     routingService = createMock(RoutingService.class);
-    trackingIdGenerator = createMock(TrackingIdGenerator.class);
-    CargoFactory cargoFactory = new CargoFactory(locationRepository, trackingIdGenerator);
+    trackingIdFactory = createMock(TrackingIdFactory.class);
+    CargoFactory cargoFactory = new CargoFactory(locationRepository, trackingIdFactory);
     bookingService = new BookingServiceImpl(routingService, cargoFactory, cargoRepository, locationRepository);
   }
 
@@ -34,19 +33,19 @@ public class BookingServiceTest extends TestCase {
     UnLocode fromUnlocode = new UnLocode("USCHI");
     UnLocode toUnlocode = new UnLocode("SESTO");
 
-    expect(trackingIdGenerator.nextTrackingId()).andReturn(expectedTrackingId);
+    expect(trackingIdFactory.nextTrackingId()).andReturn(expectedTrackingId);
     expect(locationRepository.find(fromUnlocode)).andReturn(CHICAGO);
     expect(locationRepository.find(toUnlocode)).andReturn(STOCKHOLM);
 
     cargoRepository.store(isA(Cargo.class));
 
-    replay(cargoRepository, locationRepository, trackingIdGenerator);
+    replay(cargoRepository, locationRepository, trackingIdFactory);
 
     TrackingId trackingId = bookingService.bookNewCargo(fromUnlocode, toUnlocode, new Date());
     assertEquals(expectedTrackingId, trackingId);
   }
 
   protected void tearDown() throws Exception {
-    verify(cargoRepository, locationRepository, trackingIdGenerator);
+    verify(cargoRepository, locationRepository, trackingIdFactory);
   }
 }

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

@@ -37,7 +37,7 @@ public class CargoUpdaterTest {
     handlingEventRepository = new HandlingEventRepositoryInMem();
     locationRepository = new LocationRepositoryInMem();
     voyageRepository = new VoyageRepositoryInMem();
-    cargoFactory = new CargoFactory(locationRepository, new TrackingIdGeneratorInMem());
+    cargoFactory = new CargoFactory(locationRepository, new TrackingIdFactoryInMem());
     handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
     cargoUpdater = new CargoUpdater(systemEvents, cargoRepository, handlingEventRepository);
   }

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

@@ -8,23 +8,34 @@ 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.TrackingIdGeneratorInMem;
 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() {
-    CargoFactory cargoFactory = new CargoFactory(new LocationRepositoryInMem(), new TrackingIdGeneratorInMem());
-    Cargo cargo = cargoFactory.newCargo(
-      HONGKONG.unLocode(), ROTTERDAM.unLocode(), toDate("2009-07-01")
-    );
+    Cargo cargo = cargoFactory.newCargo(HONGKONG.unLocode(), ROTTERDAM.unLocode(), toDate("2009-07-01"));
+
     assertNotNull(cargo);
-    assertNotNull(cargo.trackingId());
+    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/infrastructure/TrackingIdGeneratorTest.java

@@ -3,18 +3,18 @@ package se.citerus.dddsample.tracking.core.infrastructure;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdFactory;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdFactoryInMem;
 
 public class TrackingIdGeneratorTest extends TestCase {
 
-  TrackingIdGenerator trackingIdGenerator = new TrackingIdGeneratorInMem();
+  TrackingIdFactory trackingIdFactory = new TrackingIdFactoryInMem();
 
   public void testNextTrackingId() {
-    TrackingId trackingId = trackingIdGenerator.nextTrackingId();
+    TrackingId trackingId = trackingIdFactory.nextTrackingId();
     Assert.assertNotNull(trackingId);
 
-    TrackingId trackingId2 = trackingIdGenerator.nextTrackingId();
+    TrackingId trackingId2 = trackingIdFactory.nextTrackingId();
     Assert.assertNotNull(trackingId2);
     Assert.assertFalse(trackingId.equals(trackingId2));
   }

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

@@ -41,7 +41,7 @@ public class CargoLifecycleScenarioTest {
   VoyageRepository voyageRepository = new VoyageRepositoryInMem();
 
   HandlingEventFactory handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
-  CargoFactory cargoFactory = new CargoFactory(locationRepository, new TrackingIdGeneratorInMem());
+  CargoFactory cargoFactory = new CargoFactory(locationRepository, new TrackingIdFactoryInMem());
 
   /**
    * This is a domain service interface, whose implementation

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

@@ -22,7 +22,7 @@ import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyag
 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.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdFactoryInMem;
 
 import java.util.Date;
 
@@ -39,7 +39,7 @@ public class VoyageRescheduledScenarioTest {
     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 TrackingIdGeneratorInMem());
+    CargoFactory cargoFactory = new CargoFactory(new LocationRepositoryInMem(), new TrackingIdFactoryInMem());
     cargo = cargoFactory.newCargo(HANGZOU.unLocode(), STOCKHOLM.unLocode(), toDate("2008-12-23"));
     Itinerary itinerary = new Itinerary(
       Leg.deriveLeg(voyage1, HANGZOU, NEWYORK),