Use CarrierId instead of String as CarrierMovement identifier.

Renamed to CarrierMovementRepository.

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepository.java

@@ -0,0 +1,10 @@
+package se.citerus.dddsample.repository;
+
+import se.citerus.dddsample.domain.CarrierId;
+import se.citerus.dddsample.domain.CarrierMovement;
+
+public interface CarrierMovementRepository {
+
+  CarrierMovement find(CarrierId carrierId);
+
+}

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierRepositoryInMem.java → dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepositoryInMem.java

@@ -5,12 +5,13 @@ import se.citerus.dddsample.domain.CarrierMovement;
 import se.citerus.dddsample.domain.Location;
 
 import java.util.HashMap;
+import java.util.Map;
 
-public class CarrierRepositoryInMem implements CarrierRepository {
-  private HashMap<String, CarrierMovement> carriers;
+public class CarrierMovementRepositoryInMem implements CarrierMovementRepository {
+  private Map<CarrierId, CarrierMovement> carriers;
 
-  public CarrierRepositoryInMem() {
-    carriers = new HashMap<String, CarrierMovement>();
+  public CarrierMovementRepositoryInMem() {
+    carriers = new HashMap<CarrierId, CarrierMovement>();
     setup();
   }
 
@@ -26,17 +27,15 @@ public class CarrierRepositoryInMem implements CarrierRepository {
     final CarrierMovement stockholmToHelsinki = new CarrierMovement(
             new CarrierId("CAR_005"), new Location("SESTO"), new Location("FIHEL"));
     
-    carriers.put("SESTO_DEHAM", stockholmToHamburg);
-    carriers.put("DEHAM_CNHKG", hamburgToHongKong);
-    carriers.put("AUMEL_JPTOK", melbourneToTokyo);
-    carriers.put("JPTOK_USLA", tokyoToLosAngeles);
-    carriers.put("SESTO_FIHEL", stockholmToHelsinki);
+    carriers.put(new CarrierId("SESTO_DEHAM"), stockholmToHamburg);
+    carriers.put(new CarrierId("DEHAM_CNHKG"), hamburgToHongKong);
+    carriers.put(new CarrierId("AUMEL_JPTOK"), melbourneToTokyo);
+    carriers.put(new CarrierId("JPTOK_USLA"), tokyoToLosAngeles);
+    carriers.put(new CarrierId("SESTO_FIHEL"), stockholmToHelsinki);
   }
 
-  public CarrierMovement find(String carrierId) {
+  public CarrierMovement find(CarrierId carrierId) {
     return carriers.get(carrierId);
   }
-  
-  
 
 }

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierRepository.java

@@ -1,9 +0,0 @@
-package se.citerus.dddsample.repository;
-
-import se.citerus.dddsample.domain.CarrierMovement;
-
-public interface CarrierRepository {
-
-  CarrierMovement find(String carrierId);
-
-}

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepositoryInMem.java

@@ -15,7 +15,7 @@ import java.util.Set;
 
 public class HandlingEventRepositoryInMem implements HandlingEventRepository{
   private HashMap<String, HandlingEvent> eventDB;
-  private CarrierRepository carrierRepository;
+  private CarrierMovementRepository carrierMovementRepository;
   
   private final Log logger = LogFactory.getLog(getClass());
 
@@ -36,11 +36,11 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
     registerEvent(cargoXYZ, "2007-11-30", HandlingEvent.Type.RECEIVE, null);
 
-    final CarrierMovement stockholmToHamburg = carrierRepository.find("SESTO_DEHAM");
+    final CarrierMovement stockholmToHamburg = carrierMovementRepository.find(new CarrierId("SESTO_DEHAM"));
     registerEvent(cargoXYZ, "2007-12-01", HandlingEvent.Type.LOAD, stockholmToHamburg);
     registerEvent(cargoXYZ, "2007-12-02", HandlingEvent.Type.UNLOAD, stockholmToHamburg);
     
-    final CarrierMovement hamburgToHongKong = carrierRepository.find("DEHAM_CNHKG");
+    final CarrierMovement hamburgToHongKong = carrierMovementRepository.find(new CarrierId("DEHAM_CNHKG"));
     registerEvent(cargoXYZ, "2007-12-03", HandlingEvent.Type.LOAD, hamburgToHongKong);
     registerEvent(cargoXYZ, "2007-12-05", HandlingEvent.Type.UNLOAD, hamburgToHongKong);
     
@@ -48,11 +48,11 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     final Cargo cargoZYX = new Cargo(new TrackingId("ZYX"), new Location("AUMEL"), new Location("SESTO"));
     registerEvent(cargoZYX, "2007-12-09", HandlingEvent.Type.RECEIVE, null);
     
-    final CarrierMovement melbourneToTokyo = carrierRepository.find("AUMEL_JPTOK");
+    final CarrierMovement melbourneToTokyo = carrierMovementRepository.find(new CarrierId("AUMEL_JPTOK"));
     registerEvent(cargoZYX, "2007-12-10", HandlingEvent.Type.LOAD, melbourneToTokyo);
     registerEvent(cargoZYX, "2007-12-12", HandlingEvent.Type.UNLOAD, melbourneToTokyo);
     
-    final CarrierMovement tokyoToLosAngeles = carrierRepository.find("JPTOK_USLA");
+    final CarrierMovement tokyoToLosAngeles = carrierMovementRepository.find(new CarrierId("JPTOK_USLA"));
     registerEvent(cargoZYX, "2007-12-13", HandlingEvent.Type.LOAD, tokyoToLosAngeles);
  
     //CargoABC
@@ -133,7 +133,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
     return events;
   }
 
-  public void setCarrierRepository(CarrierRepository carrierRepository) {
-    this.carrierRepository = carrierRepository;
+  public void setCarrierRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventServiceImpl.java

@@ -1,27 +1,24 @@
 package se.citerus.dddsample.service;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.commons.lang.Validate;
-
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.CarrierRepository;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
 
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
 public class HandlingEventServiceImpl implements HandlingEventService {
   private CargoRepository cargoRepository;
-  private CarrierRepository carrierRepository;
+  private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
 
 
   public void register(Date date, String type, String carrierId, String[] trackingIds) {
-    HandlingEvent event = new HandlingEvent(date, HandlingEvent.parseType(type), findCarrier(carrierId));
+    CarrierMovement cm = findCarrier(new CarrierId(carrierId));
+    HandlingEvent event = new HandlingEvent(date, HandlingEvent.parseType(type), cm);
     Set<Cargo> cargos = findCargos(trackingIds);
     event.register(cargos);
     
@@ -47,11 +44,11 @@ public class HandlingEventServiceImpl implements HandlingEventService {
     return cargo;
   }
 
-  private CarrierMovement findCarrier(String carrierId) {
+  private CarrierMovement findCarrier(CarrierId carrierId) {
     if (carrierId == null){
       return null;
     }
-    CarrierMovement carrier = carrierRepository.find(carrierId);
+    CarrierMovement carrier = carrierMovementRepository.find(carrierId);
     Validate.notNull(carrier, "Carrier is not found: Carrier ID=" + carrierId);
     
     return carrier;
@@ -61,14 +58,12 @@ public class HandlingEventServiceImpl implements HandlingEventService {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setCarrierRepository(CarrierRepository carrierRepository) {
-    this.carrierRepository = carrierRepository;
+  public void setCarrierRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
   }
 
   public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
   }
 
-
-
 }

dddsample/src/main/resources/context-persistence.xml

@@ -43,10 +43,10 @@
   </bean>
   
   <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryInMem" init-method="init">
-    <property name="carrierRepository" ref="carrierRepository"/>
+    <property name="carrierRepository" ref="carrierMovementRepository"/>
   </bean>
   
-  <bean id="carrierRepository" class="se.citerus.dddsample.repository.CarrierRepositoryInMem" />
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryInMem" />
   
   <!--bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>

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

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.CarrierRepository;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
 
 import java.util.Calendar;
@@ -15,7 +15,7 @@ import java.util.Set;
 public class HandlingEventServiceTest extends TestCase {
   private HandlingEventServiceImpl service;
   private CargoRepository cargoRepository;
-  private CarrierRepository carrierRepository;
+  private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
   
   private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("ABCFROM"), new Location("ABCTO"));
@@ -26,11 +26,11 @@ public class HandlingEventServiceTest extends TestCase {
   protected void setUp() throws Exception{
     service = new HandlingEventServiceImpl();
     cargoRepository = createMock(CargoRepository.class);
-    carrierRepository = createMock(CarrierRepository.class);
+    carrierMovementRepository = createMock(CarrierMovementRepository.class);
     handlingEventRepository = createMock(HandlingEventRepository.class);
     
     service.setCargoRepository(cargoRepository);
-    service.setCarrierRepository(carrierRepository);
+    service.setCarrierRepository(carrierMovementRepository);
     service.setHandlingEventRepository(handlingEventRepository);
   }
 
@@ -42,7 +42,7 @@ public class HandlingEventServiceTest extends TestCase {
     
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
-    expect(carrierRepository.find("AAA_BBB")).andReturn(cmAAA_BBB);
+    expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(cmAAA_BBB);
     
     HandlingEvent event = new HandlingEvent(date, HandlingEvent.parseType(type), cmAAA_BBB);
     Set<Cargo> cargos = new HashSet<Cargo>();
@@ -52,11 +52,11 @@ public class HandlingEventServiceTest extends TestCase {
     
     handlingEventRepository.save(event);
     
-    replay(cargoRepository, carrierRepository, handlingEventRepository);
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     service.register(date, type, carrierId, trackIds);
     
-    verify(cargoRepository, carrierRepository, handlingEventRepository);
+    verify(cargoRepository, carrierMovementRepository, handlingEventRepository);
   }
   
   public void testRegisterEventInvalidCarrier() throws Exception {
@@ -66,9 +66,9 @@ public class HandlingEventServiceTest extends TestCase {
     
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
-    expect(carrierRepository.find("AAA_BBB")).andReturn(null);
+    expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(null);
     
-    replay(cargoRepository, carrierRepository, handlingEventRepository);
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
       service.register(date, type, "AAA_BBB", trackIds);
@@ -85,9 +85,9 @@ public class HandlingEventServiceTest extends TestCase {
     
     expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
     expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(null);
-    expect(carrierRepository.find("AAA_BBB")).andReturn(cmAAA_BBB);
+    expect(carrierMovementRepository.find(new CarrierId("AAA_BBB"))).andReturn(cmAAA_BBB);
     
-    replay(cargoRepository, carrierRepository, handlingEventRepository);
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
       service.register(date, type, "AAA_BBB", trackIds);

dddsample/src/test/resources/mock-context-persistence.xml

@@ -13,8 +13,8 @@
   </bean>
   
   <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryInMem" init-method="init">
-    <property name="carrierRepository" ref="carrierRepository"/>
+    <property name="carrierRepository" ref="carrierMovementRepository"/>
   </bean>
   
-  <bean id="carrierRepository" class="se.citerus.dddsample.repository.CarrierRepositoryInMem" />
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryInMem" />
 </beans>