HandlingEventService now has a single, strongly typed method for registering events.

A JAX-WS-based remote interface for registering events has been introduced, which works as an anti-corruption layer as well. 

CarrierMovementRepository uses Hibernate implementation, test class created.

Reverted to Spring 2.0.8 in order to get JAX-WS integration going, but that's only until the next release gets out.

dddsample/pom.xml

@@ -24,8 +24,22 @@
       <id>maven2-repository.dev.java.net</id>
       <name>Java.net Repository for Maven</name>
       <url>http://download.java.net/maven/2/</url>
+      <layout>default</layout>
+    </repository>
+    <repository>
+      <id>maven-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven 1</name>
+      <url>http://download.java.net/maven/1/</url>
+      <layout>legacy</layout>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+    </pluginRepository>
+  </pluginRepositories>
   <developers>
     <developer>
       <id>peba</id>
@@ -91,6 +105,24 @@
           <!--scanIntervalSeconds>10</scanIntervalSeconds-->
         </configuration>
       </plugin>
+
+      <!-- JAX-WS generation plugin -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jaxws-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>wsgen</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <sei>se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl</sei>
+          <verbose>true</verbose>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
   <dependencies>
@@ -103,27 +135,29 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>2.5</version>
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>2.5</version>
+      <artifactId>spring-hibernate3</artifactId>
+      <!-- -orm in 2.5.x -->
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>2.5</version>
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5</version>
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>2.5</version>
+      <artifactId>spring-mock</artifactId>
+      <!-- -test in 2.5.x -->
+      <version>2.0.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -189,5 +223,27 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jvnet.jax-ws-commons.spring</groupId>
+      <artifactId>jaxws-spring</artifactId>
+      <version>1.8</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-rt</artifactId>
+      <version>2.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.istack</groupId>
+      <artifactId>istack-commons-runtime</artifactId>
+      <version>1.0</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>

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

@@ -14,7 +14,7 @@ public class CarrierMovementRepositoryHibernate extends HibernateRepository impl
   public CarrierMovement find(CarrierMovementId carrierMovementId) {
     return (CarrierMovement) getSession().
             createQuery("from CarrierMovement where carrierMovementId = ?").
-            setParameter(1, carrierMovementId).
+            setParameter(0, carrierMovementId).
             uniqueResult();
   }
 

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.repository;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 
 /**
@@ -13,7 +12,6 @@ public abstract class HibernateRepository {
 
   SessionFactory sessionFactory;
 
-  @Autowired
   @Required
   public void setSessionFactory(SessionFactory sessionFactory) {
     this.sessionFactory = sessionFactory;

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

@@ -1,5 +1,9 @@
 package se.citerus.dddsample.service;
 
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.HandlingEvent;
+
 import java.util.Date;
 
 
@@ -10,47 +14,15 @@ import java.util.Date;
 public interface HandlingEventService {
 
   /**
-   * Register that a cargo has been loaded.
-   *
-   * @param completionTime when the event was completed, for example finished loading
-   * @param carrierMovementId carrier movement id
-   * @param trackingIds tracking ids of cargos to register this event for
-   */
-  void registerLoad(Date completionTime, String carrierMovementId, String[] trackingIds);
-
-  /**
-   * Register that a cargo has been unloaded.
-   *
-   * @param completionTime when the event was completed, for example finished loading
-   * @param carrierMovementId carrier movement id
-   * @param trackingIds tracking ids of cargos to register this event for
-   */
-  void registerUnload(Date completionTime, String carrierMovementId, String[] trackingIds);
-
-  /**
-   * Register that a cargo has been claimed.
-   *
-   * @param completionTime when the event was completed, for example finished loading
-   * @param unlocode United Nations Location Code, for example "SESTO" for SwEden/STOckholm
-   * @param trackingIds tracking ids of cargos to register this event for
-   */
-  void registerClaim(Date completionTime, String unlocode, String[] trackingIds);
-
-  /**
-   * Register that a cargo has been recieved.
-   *
    * @param completionTime when the event was completed, for example finished loading
-   * @param unlocode United Nations Location Code, for example "SESTO" for SwEden/STOckholm
-   * @param trackingIds tracking ids of cargos to register this event for
+   * @param trackingId tracking id
+   * @param carrierMovementId carrier movement
+   * @param unlocode United Nations Location Code for the location of the event
+   * @param type type of event
+   * @throws UnknownCarrierMovementIdException if there's not carrier movement with this id
+   * @throws se.citerus.dddsample.service.UnknownTrackingIdException if there's no cargo with this tracking id
    */
-  void registerRecieve(Date completionTime, String unlocode, String[] trackingIds);
+  void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type)
+  throws UnknownCarrierMovementIdException, UnknownTrackingIdException;
 
-  /**
-   * Register that a cargo has been cleared by customs.
-   *
-   * @param completionTime when the event was completed, for example finished loading
-   * @param unlocode United Nations Location Code, for example "SESTO" for SwEden/STOckholm
-   * @param trackingIds tracking ids of cargos to register this event for
-   */
-  void registerCustomsCleared(Date completionTime, String unlocode, String[] trackingIds);
 }

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

@@ -15,62 +15,38 @@ public class HandlingEventServiceImpl implements HandlingEventService {
   private HandlingEventRepository handlingEventRepository;
 
   @Transactional(readOnly = false)
-  public void registerLoad(Date completionTime, String carrierMovementId, String[] trackingIds) {
-    doRegisterWithCarrierMovement(completionTime, findCarrierMovement(carrierMovementId), HandlingEvent.Type.LOAD, trackingIds);
-  }
-
-  @Transactional(readOnly = false)
-  public void registerUnload(Date completionTime, String carrierMovementId, String[] trackingIds) {
-    doRegisterWithCarrierMovement(completionTime, findCarrierMovement(carrierMovementId), HandlingEvent.Type.UNLOAD, trackingIds);
-  }
-
-  @Transactional(readOnly = false)
-  public void registerClaim(Date completionTime, String unlocode, String[] trackingIds) {
-    doRegisterWithLocation(completionTime, findLocation(unlocode), HandlingEvent.Type.CLAIM, trackingIds);
-  }
-
-  @Transactional(readOnly = false)
-  public void registerRecieve(Date completionTime, String unlocode, String[] trackingIds) {
-    doRegisterWithLocation(completionTime, findLocation(unlocode), HandlingEvent.Type.RECEIVE, trackingIds);
-  }
-
-  @Transactional(readOnly = false)
-  public void registerCustomsCleared(Date completionTime, String unlocode, String[] trackingIds) {
-    doRegisterWithLocation(completionTime, findLocation(unlocode), HandlingEvent.Type.CUSTOMS, trackingIds);
-  }
-
-  private void doRegisterWithLocation(Date completionTime, Location location, HandlingEvent.Type type, String[] trackingIds) {
-    for (String tid: trackingIds) {
-      Cargo cargo = findCargo(tid);
-      Date registrationTime = new Date();
-      HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, location);
-      handlingEventRepository.save(event);
+  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, String unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException {
+    Cargo cargo = findCargo(trackingId);
+    CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
+    Location location = findLocation(unlocode);
+    Date registrationTime = new Date();
+    HandlingEvent event;
+    if (carrierMovement != null) {
+      event = new HandlingEvent(cargo, completionTime, registrationTime, type, carrierMovement);
+    } else {
+      event = new HandlingEvent(cargo, completionTime, registrationTime, type, location);
     }
+    handlingEventRepository.save(event);
   }
 
-  private void doRegisterWithCarrierMovement(Date completionTime, CarrierMovement carrierMovement, HandlingEvent.Type type, String[] trackingIds) {
-    for (String tid: trackingIds) {
-      Cargo cargo = findCargo(tid);
-      Date registrationTime = new Date();
-      HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, carrierMovement);
-      handlingEventRepository.save(event);
-    }
-  }
-
-  private Cargo findCargo(String trackingId) {
+  private Cargo findCargo(TrackingId trackingId) throws UnknownTrackingIdException {
     Validate.notNull(trackingId, "Tracking ID is required");
-    Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
-    Validate.notNull(cargo, "Cargo is not found. Tracking ID=" + trackingId);
+    Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) {
+      throw new UnknownTrackingIdException(trackingId);
+    }
 
     return cargo;
   }
 
-  private CarrierMovement findCarrierMovement(String carrierId) {
-    Validate.notNull(carrierId, "Carrier ID is required");
-    CarrierMovement carrier = carrierMovementRepository.find(new CarrierMovementId(carrierId));
-    Validate.notNull(carrier, "Carrier is not found: Carrier ID=" + carrierId);
+  private CarrierMovement findCarrierMovement(CarrierMovementId carrierMovementId) throws UnknownCarrierMovementIdException {
+    Validate.notNull(carrierMovementId, "Carrier ID is required");
+    CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
+    if (carrierMovement == null) {
+      throw new UnknownCarrierMovementIdException(carrierMovementId);
+    }
 
-    return carrier;
+    return carrierMovement;
   }
 
   private Location findLocation(String unlocode) {

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

@@ -0,0 +1,21 @@
+package se.citerus.dddsample.service;
+
+import se.citerus.dddsample.domain.HandlingEvent;
+
+import java.util.Arrays;
+
+/**
+ * Thrown when trying to register an event with an invalid type.
+ *
+ */
+public class InvalidEventTypeException extends Throwable {
+  private String eventType;
+
+  public InvalidEventTypeException(String eventType) {
+    this.eventType = eventType;
+  }
+
+  public String getMessage() {
+    return "Invalid event type: " + eventType + ". Valid types are: " + Arrays.deepToString(HandlingEvent.Type.values());
+  }
+}

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

@@ -0,0 +1,20 @@
+package se.citerus.dddsample.service;
+
+import se.citerus.dddsample.domain.CarrierMovementId;
+
+/**
+ * Thrown when trying to register an event with an unknown carrier movement id.
+ *
+ */
+public class UnknownCarrierMovementIdException extends Exception {
+  private CarrierMovementId carrierMovementId;
+
+  public UnknownCarrierMovementIdException(CarrierMovementId carrierMovementId) {
+    this.carrierMovementId = carrierMovementId;
+  }
+
+  @Override
+  public String getMessage() {
+    return "No carrier movement with id " + carrierMovementId.idString() + " exists in the system";
+  }
+}

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

@@ -0,0 +1,20 @@
+package se.citerus.dddsample.service;
+
+import se.citerus.dddsample.domain.TrackingId;
+
+/**
+ * Thrown when trying to register an event with an unknown tracking id.
+ *
+ */
+public class UnknownTrackingIdException extends Exception {
+  private TrackingId trackingId;
+
+  public UnknownTrackingIdException(TrackingId trackingId) {
+    this.trackingId = trackingId;
+  }
+
+  @Override
+  public String getMessage() {
+    return "No cargo with tracking id " + trackingId.idString() + " exists in the system";
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpoint.java

@@ -0,0 +1,14 @@
+package se.citerus.dddsample.ws;
+
+import javax.jws.WebService;
+
+/**
+ * Web service endpoint for handling event registration.
+ *
+ */
+@WebService
+public interface HandlingEventServiceEndpoint {
+
+  void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType);
+
+}

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpointImpl.java

@@ -0,0 +1,69 @@
+package se.citerus.dddsample.ws;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.service.HandlingEventService;
+import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.service.UnknownTrackingIdException;
+import se.citerus.dddsample.service.InvalidEventTypeException;
+
+import javax.jws.WebService;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@WebService(endpointInterface = "se.citerus.dddsample.ws.HandlingEventServiceEndpoint")
+public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
+
+  private HandlingEventService handlingEventService;
+  private static final Log logger = LogFactory.getLog(HandlingEventServiceEndpointImpl.class);
+  private static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
+
+  public void register(String completionTime, String trackingId, String carrierMovementId,
+                       String unlocode, String eventType) {
+    try {
+      Date date = parseIso8601Date(completionTime);
+      TrackingId tid = new TrackingId(trackingId);
+      CarrierMovementId cid = new CarrierMovementId(carrierMovementId);
+      HandlingEvent.Type type = parseEventType(eventType);
+
+      handlingEventService.register(date, tid, cid, unlocode, type);
+      
+    } catch (ParseException pe) {
+      logger.error("Invalid date format: " + completionTime);
+    } catch (UnknownTrackingIdException utid) {
+      handleRetry(utid);
+    } catch (UnknownCarrierMovementIdException ucmi) {
+      handleRetry(ucmi);
+    } catch (InvalidEventTypeException iete) {
+      logger.error(iete, iete);
+    } catch (Exception e) {
+      logger.error(e, e);
+    }
+    // TODO: possibly handle "Duplicate event" exceptions due to unique constraint violations
+  }
+
+  private HandlingEvent.Type parseEventType(String eventType) throws InvalidEventTypeException {
+    try {
+      return HandlingEvent.Type.valueOf(eventType);
+    } catch(IllegalArgumentException e) {
+      throw new InvalidEventTypeException(eventType);
+    }
+  }
+
+  private void handleRetry(Exception e) {
+    logger.info("Placing event in retry queue due to: " + e.getMessage());
+    // TODO: actually place in a retry queue
+  }
+
+  private Date parseIso8601Date(String completionTime) throws ParseException {
+    return new SimpleDateFormat(ISO_8601_FORMAT).parse(completionTime);
+  }
+
+  public void setHandlingEventService(HandlingEventService handlingEventService) {
+    this.handlingEventService = handlingEventService;
+  }
+}

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

@@ -44,7 +44,8 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryInMem">
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
 </beans>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:ws="http://jax-ws.dev.java.net/spring/core"
+       xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+        http://jax-ws.dev.java.net/spring/core https://jax-ws.dev.java.net/spring/core.xsd
+        http://jax-ws.dev.java.net/spring/servlet https://jax-ws.dev.java.net/spring/servlet.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+
+  <wss:bindings id="jax-ws.http">
+    <wss:bindings>
+      <wss:binding url="/ws/RegisterEvent">
+        <wss:service>
+          <ws:service bean="#handlingEventServiceEndpoint"/>
+        </wss:service>
+      </wss:binding>
+    </wss:bindings>
+  </wss:bindings>
+
+
+  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl">
+    <property name="handlingEventService" ref="handlingEventService"/>
+  </bean>
+  <!--
+  -->
+
+  <!-- jax-ws-spring does not work with spring 2.5 yet
+  <beans xmlns="http://www.springframework.org/schema/beans"
+         xmlns:ws="http://jax-ws.dev.java.net/spring/core"
+         xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="
+          http://jax-ws.dev.java.net/spring/core https://jax-ws.dev.java.net/spring/core.xsd
+          http://jax-ws.dev.java.net/spring/servlet https://jax-ws.dev.java.net/spring/servlet.xsd
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <ws:service id="handlingEventServiceWS" bean="handlingEventServiceEndpoint"/>
+
+  <wss:binding url="/registerEvent" service="#handlingEventServiceWS"/>
+  -->
+
+</beans>

dddsample/src/main/resources/log4j.properties

@@ -19,5 +19,5 @@ log4j.logger.se.citerus.dddsample=debug
 log4j.logger.net.sf.ehcache.config.ConfigurationFactory=error
 log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=debug
 
-log4j.logger.org.springframework.orm=debug
-log4j.logger.org.springframework.transaction=debug
+#log4j.logger.org.springframework.orm=debug
+#log4j.logger.org.springframework.transaction=debug

dddsample/src/main/webapp/WEB-INF/web.xml

@@ -30,6 +30,16 @@
     <url-pattern>*.html</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>jaxws-servlet</servlet-name>
+    <servlet-class>com.sun.xml.ws.transport.http.servlet.WSSpringServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>jaxws-servlet</servlet-name>
+    <url-pattern>/ws/*</url-pattern>
+  </servlet-mapping>
+
   <filter>
     <filter-name>sitemesh</filter-name>
     <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>

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

@@ -13,6 +13,7 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
   SimpleJdbcTemplate sjt;
 
   protected AbstractRepositoryTest() {
+    setAutowireMode(AUTOWIRE_BY_NAME);
     setDependencyCheck(false);
   }
 

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

@@ -0,0 +1,30 @@
+package se.citerus.dddsample.repository;
+
+import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.CarrierMovement;
+import se.citerus.dddsample.domain.Location;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Peter Backlund
+ * Date: 2008-jan-19
+ * Time: 18:41:50
+ * To change this template use File | Settings | File Templates.
+ */
+public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
+
+  CarrierMovementRepository carrierMovementRepository;
+
+  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
+  }
+
+  public void testFind() throws Exception {
+    CarrierMovement carrierMovement = carrierMovementRepository.find(new CarrierMovementId("CAR_001"));
+    assertNotNull(carrierMovement);
+    assertEquals("CAR_001", carrierMovement.carrierId().idString());
+    assertEquals(new Location("SESTO"), carrierMovement.from());
+    assertEquals(new Location("FIHEL"), carrierMovement.to());
+  }
+
+}

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

@@ -27,6 +27,11 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
   HandlingEventRepository handlingEventRepository;
   SessionFactory sessionFactory;
 
+  public CargoServiceTest() {
+    setAutowireMode(AUTOWIRE_BY_NAME);
+    setDependencyCheck(false);    
+  }
+
   public void setCargoService(CargoService cargoService) {
     this.cargoService = cargoService;
   }

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

@@ -36,51 +36,50 @@ public class HandlingEventServiceTest extends TestCase {
   }
 
   public void testRegisterEvent() throws Exception {
-    final String carrierMovementId = "AAA_BBB";
-    final String[] trackingIds = { "ABC", "XYZ" };
     final Date date = new Date();
 
-    expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargoXYZ);
-    expect(carrierMovementRepository.find(new CarrierMovementId("AAA_BBB"))).andReturn(cmAAA_BBB);
+    final TrackingId trackingId = new TrackingId("ABC");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
+
+    final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
+    expect(carrierMovementRepository.find(carrierMovementId)).andReturn(cmAAA_BBB);
 
     // TODO: does not inspect the handling event instance in a sufficient way
     handlingEventRepository.save(isA(HandlingEvent.class));
-    expectLastCall().times(2);  // Two tracking ids
 
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
-    service.registerUnload(date, carrierMovementId, trackingIds);
+    service.register(date, trackingId, carrierMovementId, "SESTO", HandlingEvent.Type.LOAD);
   }
   
   public void testRegisterEventInvalidCarrier() throws Exception {
-    final String[] trackingIds = { "ABC", "XYZ" };
     final Date date = new Date();
 
-    expect(carrierMovementRepository.find(new CarrierMovementId("AAA_BBB"))).andReturn(null);
-    
+    final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
+    expect(carrierMovementRepository.find(carrierMovementId)).andReturn(null);
+
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, new Location("FROM"), new Location("TO")));
+
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
-      service.registerUnload(date, "AAA_BBB", trackingIds);
+      service.register(date, trackingId, carrierMovementId, "AUMEL", HandlingEvent.Type.UNLOAD);
       fail("Should not be able to register an event with non-existing carrier movement");
-    } catch (IllegalArgumentException expected) {}
+    } catch (UnknownCarrierMovementIdException expected) {}
   }
   
   public void testRegisterEventInvalidCargo() throws Exception {
-    final String[] trackIds = { "ABC", "XYZ" };
     final Date date = new Date();
 
-    expect(cargoRepository.find(new TrackingId("ABC"))).andReturn(cargoABC);
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(null);
-    expect(carrierMovementRepository.find(new CarrierMovementId("AAA_BBB"))).andReturn(cmAAA_BBB);
-    handlingEventRepository.save(isA(HandlingEvent.class));
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(null);
 
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository);
     
     try {
-      service.registerUnload(date, "AAA_BBB", trackIds);
+      service.register(date, trackingId, null, "CNHKG", HandlingEvent.Type.CLAIM);
       fail("Should not be able to register an event with non-existing cargo");
-    } catch (IllegalArgumentException expected) {}
+    } catch (UnknownTrackingIdException expected) {}
   }
 }