Added LocationRepository

dddsample/pom.xml

@@ -119,10 +119,31 @@
         </executions>
         <configuration>
           <sei>se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl</sei>
+          <genWsdl>true</genWsdl>
           <verbose>true</verbose>
         </configuration>
       </plugin>
-
+      
+      <!-- Jar plugin for generation of WS Client classes -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>ws-client</classifier>
+              <includes>
+                <include>**/se/citerus/dddsample/ws/*</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
   </build>
   <dependencies>

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

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

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

@@ -0,0 +1,13 @@
+package se.citerus.dddsample.repository;
+
+import se.citerus.dddsample.domain.Location;
+
+public class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
+
+  public Location find(String unlcode) {
+    return (Location) getSession().
+          createQuery("from Location where unlocode = ?").
+          setParameter(0, unlcode).
+          uniqueResult();
+  }
+}

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

@@ -23,6 +23,6 @@ public interface HandlingEventService {
    * @throws UnknownTrackingIdException if there's no cargo with this tracking id
    */
   void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type)
-  throws UnknownCarrierMovementIdException, UnknownTrackingIdException;
+  throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
 
 }

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

@@ -6,6 +6,7 @@ import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
+import se.citerus.dddsample.repository.LocationRepository;
 
 import java.util.Date;
 
@@ -13,9 +14,10 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
+  private LocationRepository locationRepository;
 
   @Transactional(readOnly = false)
-  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException {
+  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
     Cargo cargo = findCargo(trackingId);
     CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
     Location location = findLocation(unlocode);
@@ -51,9 +53,17 @@ public class HandlingEventServiceImpl implements HandlingEventService {
     return carrierMovement;
   }
 
-  private Location findLocation(String unlocode) {
-    // TODO: introdcue Location repository, lookup and add new Location when not found
-    return new Location(unlocode);
+  private Location findLocation(String unlocode) throws UnknownLocationException {
+    if (unlocode == null){
+      return Location.UNKNOWN;
+    }
+    
+    Location location = locationRepository.find(unlocode);
+    if (location == null){
+      throw new UnknownLocationException(unlocode);
+    }
+    
+    return location;
   }
 
   public void setCargoRepository(CargoRepository cargoRepository) {
@@ -67,4 +77,8 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
   }
+
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
 }

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

@@ -0,0 +1,16 @@
+package se.citerus.dddsample.service;
+
+public class UnknownLocationException extends Exception {
+
+  private String unlocode;
+
+  public UnknownLocationException(String unlocode) {
+    this.unlocode = unlocode;
+  }
+
+
+  @Override
+  public String getMessage() {
+    return "No location with UN location code " + unlocode + " exists in the system";
+  }
+}

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

@@ -48,4 +48,7 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
+  <bean id="locationRepository" class="se.citerus.dddsample.repository.LocationRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
 </beans>

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

@@ -21,6 +21,7 @@
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
     <property name="carrierRepository" ref="carrierMovementRepository"/>
+    <property name="locationRepository" ref="locationRepository"/>
   </bean>
 
 </beans>

dddsample/src/test/java/se/citerus/dddsample/repository/LocationRepositoryTest.java

@@ -0,0 +1,17 @@
+package se.citerus.dddsample.repository;
+
+import se.citerus.dddsample.domain.Location;
+
+public class LocationRepositoryTest extends AbstractRepositoryTest {
+  private LocationRepository locationRepository;
+  
+  public void testFind() throws Exception {
+    Location location = locationRepository.find("AUMEL");
+    assertNotNull(location);
+    assertEquals("AUMEL", location.unlocode());
+  }
+
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
+}

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

@@ -6,6 +6,7 @@ import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.HandlingEventRepository;
+import se.citerus.dddsample.repository.LocationRepository;
 
 import java.util.Date;
 
@@ -14,21 +15,28 @@ public class HandlingEventServiceTest extends TestCase {
   private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
+  private LocationRepository locationRepository;
   
   private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("AFROM"), new Location("ABCTO"));
   private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("XFROM"), new Location("XYZTO"));
   private final CarrierMovement cmAAA_BBB = new CarrierMovement(
           new CarrierMovementId("CAR_001"), new Location("AAAAA"), new Location("BBBBB"));
+  
+  private final Location locationSESTO = new Location("SESTO");
+  private final Location locationAUMEL = new Location("AUMEL");
+  private final Location locationCNHKG = new Location("CNHKG");
 
   protected void setUp() throws Exception{
     service = new HandlingEventServiceImpl();
     cargoRepository = createMock(CargoRepository.class);
     carrierMovementRepository = createMock(CarrierMovementRepository.class);
     handlingEventRepository = createMock(HandlingEventRepository.class);
+    locationRepository = createMock(LocationRepository.class);
     
     service.setCargoRepository(cargoRepository);
     service.setCarrierRepository(carrierMovementRepository);
     service.setHandlingEventRepository(handlingEventRepository);
+    service.setLocationRepository(locationRepository);
   }
 
   protected void tearDown() throws Exception {
@@ -43,11 +51,13 @@ public class HandlingEventServiceTest extends TestCase {
 
     final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
     expect(carrierMovementRepository.find(carrierMovementId)).andReturn(cmAAA_BBB);
+    
+    expect(locationRepository.find("SESTO")).andReturn(locationSESTO);
 
     // TODO: does not inspect the handling event instance in a sufficient way
     handlingEventRepository.save(isA(HandlingEvent.class));
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     service.register(date, trackingId, carrierMovementId, "SESTO", HandlingEvent.Type.LOAD);
   }
@@ -59,8 +69,10 @@ public class HandlingEventServiceTest extends TestCase {
     expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
 
     handlingEventRepository.save(isA(HandlingEvent.class));
+    
+    expect(locationRepository.find("SESTO")).andReturn(locationSESTO);
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
 
     service.register(date, trackingId, null, "SESTO", HandlingEvent.Type.CLAIM);
   }
@@ -75,7 +87,9 @@ public class HandlingEventServiceTest extends TestCase {
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new Location("FROMX"), new Location("TOYYY")));
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
+    expect(locationRepository.find("AUMEL")).andReturn(locationAUMEL);
+    
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     try {
       service.register(date, trackingId, carrierMovementId, "AUMEL", HandlingEvent.Type.UNLOAD);
@@ -89,11 +103,28 @@ public class HandlingEventServiceTest extends TestCase {
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(null);
 
-    replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
+    expect(locationRepository.find("CNHKG")).andReturn(locationCNHKG);
+    
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
     
     try {
       service.register(date, trackingId, null, "CNHKG", HandlingEvent.Type.CLAIM);
       fail("Should not be able to register an event with non-existing cargo");
     } catch (UnknownTrackingIdException expected) {}
   }
+  
+  public void testRegisterEventInvalidLocation() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoXYZ);
+    expect(locationRepository.find("WAY_OFF")).andReturn(null);
+    
+    replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository);
+    
+    try {
+      service.register(date, trackingId, null, "WAY_OFF", HandlingEvent.Type.CLAIM);
+      fail("Should not be able to register an event with non-existing Location");
+    } catch (UnknownLocationException expected) {}
+  }
 }