HandlingEventService.registerHandlingEvent() signature takes value objects instead of HandlingEventRegistrationAttempt, decoupling it from message queues.

Creating sample data using domain objects and storing with Hibernate, for simplicity.

Estimated time of arrival is now a property of the Cargo aggregate.

Tracking web interface has new look for 1.1.

Admin interface shows more time related information.

Serverside now handles change of destination (no UI yet though)

dddsample/pom.xml

@@ -101,8 +101,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>

dddsample/src/main/java/se/citerus/dddsample/application/ApplicationEvents.java

@@ -1,7 +1,6 @@
 package se.citerus.dddsample.application;
 
 import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 /**
@@ -41,12 +40,4 @@ public interface ApplicationEvents {
    */
   void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt);
 
-  /**
-   * A handling event regitration attempt is rejected for a certain reason.
-   *
-   * @param attempt handling event registration attempt
-   * @param cause cause of rejection
-   */
-  void rejectedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException cause);
-
 }

dddsample/src/main/java/se/citerus/dddsample/application/BookingService.java

@@ -32,7 +32,16 @@ public interface BookingService {
 
   /**
    * @param itinerary itinerary describing the selected route
-   * @param trackingId tracking id
+   * @param trackingId cargo tracking id
    */
   void assignCargoToRoute(Itinerary itinerary, TrackingId trackingId);
+
+  /**
+   * Changes the destination of a cargo.
+   *
+   * @param trackingId cargo tracking id
+   * @param unLocode UN locode of new destination
+   */
+  void changeDestination(TrackingId trackingId, UnLocode unLocode);
+
 }

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

@@ -1,5 +1,12 @@
 package se.citerus.dddsample.application;
 
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.UnLocode;
+
+import java.util.Date;
+
 /**
  * Handling event service.
  */
@@ -9,8 +16,12 @@ public interface HandlingEventService {
    * Registers a handling event in the system, and notifies interested
    * parties that a cargo has been handled.
    *
-   * @param attempt handling event registration attempt
+   * @param completionTime when the event was completed
+   * @param trackingId cargo tracking id
+   * @param voyageNumber voyage number
+   * @param unLocode UN locode for the location where the event occurred
+   * @param type type of event
    */
-  void registerHandlingEvent(HandlingEventRegistrationAttempt attempt);
+  void registerHandlingEvent(Date completionTime, TrackingId trackingId, VoyageNumber voyageNumber, UnLocode unLocode, HandlingEvent.Type type);
 
 }

dddsample/src/main/java/se/citerus/dddsample/application/impl/BookingServiceImpl.java

@@ -82,5 +82,23 @@ public final class BookingServiceImpl implements BookingService {
 
     logger.info("Assigned cargo " + trackingId + " to new route");
   }
-  
+
+  @Override
+  @Transactional
+  public void changeDestination(final TrackingId trackingId, final UnLocode unLocode) {
+    Validate.notNull(trackingId);
+    Validate.notNull(unLocode);
+
+    final Cargo cargo = cargoRepository.find(trackingId);
+    final Location newDestination = locationRepository.find(unLocode);
+
+    final RouteSpecification routeSpecification = new RouteSpecification(
+      cargo.origin(), newDestination, cargo.routeSpecification().arrivalDeadline()
+    );
+    cargo.specifyNewRoute(routeSpecification);
+
+    cargoRepository.store(cargo);
+    logger.info("Changed destination for cargo " + trackingId + " to " + routeSpecification.destination());
+  }
+
 }

dddsample/src/main/java/se/citerus/dddsample/application/impl/HandlingEventServiceImpl.java

@@ -4,12 +4,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.application.ApplicationEvents;
-import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.application.HandlingEventService;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.domain.model.location.UnLocode;
+
+import java.util.Date;
 
 public final class HandlingEventServiceImpl implements HandlingEventService {
 
@@ -28,18 +32,17 @@ public final class HandlingEventServiceImpl implements HandlingEventService {
 
   @Override
   @Transactional
-  public void registerHandlingEvent(final HandlingEventRegistrationAttempt attempt) {
+  public void registerHandlingEvent(final Date completionTime,
+                                    final TrackingId trackingId,
+                                    final VoyageNumber voyageNumber,
+                                    final UnLocode unLocode,
+                                    final HandlingEvent.Type type) {
     try {
       /* Using a factory to create a HandlingEvent (aggregate). This is where
          it is determined wether the incoming data, the attempt, actually is capable
          of representing a real handling event. */
       final HandlingEvent event = handlingEventFactory.createHandlingEvent(
-        attempt.getRegistrationTime(),
-        attempt.getCompletionTime(),
-        attempt.getTrackingId(),
-        attempt.getVoyageNumber(),
-        attempt.getUnLocode(),
-        attempt.getType()
+        new Date(), completionTime, trackingId, voyageNumber, unLocode, type
       );
 
       /* Store the new handling event, which updates the persistent
@@ -55,7 +58,7 @@ public final class HandlingEventServiceImpl implements HandlingEventService {
     } catch (CannotCreateHandlingEventException e) {
       /* This may be a bogus attempt, for example containing a tracking id
          that doesn't match any cargo that we're tracking. */
-      applicationEvents.rejectedHandlingEventRegistrationAttempt(attempt, e);
+      logger.error(e, e);
     }
   }
 

dddsample/src/test/java/se/citerus/dddsample/DateTestUtil.java → dddsample/src/main/java/se/citerus/dddsample/application/util/DateTestUtil.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample;
+package se.citerus.dddsample.application.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

dddsample/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.application.util;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -8,6 +10,18 @@ import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+import se.citerus.dddsample.domain.model.cargo.*;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
+import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.location.LocationRepository;
+import se.citerus.dddsample.domain.model.location.SampleLocations;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -15,7 +29,9 @@ import javax.sql.DataSource;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import static java.util.Arrays.asList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Provides sample data.
@@ -173,7 +189,122 @@ public class SampleDataGenerator implements ServletContextListener {
     WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
     DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
     PlatformTransactionManager transactionManager = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    loadSampleData(new JdbcTemplate(dataSource), new TransactionTemplate(transactionManager));
+    TransactionTemplate tt = new TransactionTemplate(transactionManager);
+    //loadSampleData(new JdbcTemplate(dataSource), tt);
+
+
+    SessionFactory sf = (SessionFactory) BeanFactoryUtils.beanOfType(context, SessionFactory.class);
+    HandlingEventFactory handlingEventFactory = new HandlingEventFactory(
+      getBean(context, CargoRepository.class),
+      getBean(context, VoyageRepository.class),
+      getBean(context, LocationRepository.class));
+    loadHibernateData(tt, sf, handlingEventFactory, getBean(context, HandlingEventRepository.class));
+  }
+
+  private <T> T getBean(WebApplicationContext context, Class<T> cls) {
+    return (T) BeanFactoryUtils.beanOfType(context, cls);
+  }
+
+  public static void loadHibernateData(TransactionTemplate tt, final SessionFactory sf, final HandlingEventFactory handlingEventFactory, final HandlingEventRepository handlingEventRepository) {
+    System.out.println("*** Loading Hibernate data ***");
+    tt.execute(new TransactionCallbackWithoutResult() {
+      @Override
+      protected void doInTransactionWithoutResult(TransactionStatus status) {
+        Session session = sf.getCurrentSession();
+
+        for (Location location : SampleLocations.getAll()) {
+          session.save(location);
+        }
+
+        session.save(HONGKONG_TO_NEW_YORK);
+        session.save(NEW_YORK_TO_DALLAS);
+        session.save(DALLAS_TO_HELSINKI);
+        session.save(HELSINKI_TO_HONGKONG);
+        session.save(DALLAS_TO_HELSINKI_ALT);
+
+        RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-03-15"));
+        TrackingId trackingId = new TrackingId("ABC123");
+        Cargo abc123 = new Cargo(trackingId, HELSINKI, routeSpecification);
+
+        Itinerary itinerary = new Itinerary(asList(
+          new Leg(HONGKONG_TO_NEW_YORK, HONGKONG, NEWYORK, toDate("2009-03-02"), toDate("2009-03-05")),
+          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
+          new Leg(DALLAS_TO_HELSINKI, DALLAS, HELSINKI, toDate("2009-03-09"), toDate("2009-03-12"))
+        ));
+        abc123.assignToRoute(itinerary);
+
+        session.save(abc123);
+        
+        try {
+          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE
+          );
+          session.save(event1);
+
+          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD
+          );
+          session.save(event2);
+
+          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+          );
+          session.save(event3);
+        } catch (CannotCreateHandlingEventException e) {
+          throw new RuntimeException(e);
+        }
+
+        List<HandlingEvent> handlingEvents = handlingEventRepository.findEventsForCargo(trackingId);
+        abc123.deriveStatusFromHandling(handlingEvents);
+
+        session.update(abc123);
+
+        // Cargo JKL567
+
+        RouteSpecification routeSpecification1 = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2009-03-18"));
+        TrackingId trackingId1 = new TrackingId("JKL567");
+        Cargo jkl567 = new Cargo(trackingId1, HANGZOU, routeSpecification1);
+
+        Itinerary itinerary1 = new Itinerary(asList(
+          new Leg(HONGKONG_TO_NEW_YORK, HANGZOU, NEWYORK, toDate("2009-03-03"), toDate("2009-03-05")),
+          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
+          new Leg(DALLAS_TO_HELSINKI, DALLAS, STOCKHOLM, toDate("2009-03-09"), toDate("2009-03-11"))
+        ));
+        jkl567.assignToRoute(itinerary1);
+
+        session.save(jkl567);
+
+        try {
+          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE
+          );
+          session.save(event1);
+
+          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD
+          );
+          session.save(event2);
+
+          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+          );
+          session.save(event3);
+
+          HandlingEvent event4 = handlingEventFactory.createHandlingEvent(
+            new Date(), toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD
+          );
+          session.save(event4);
+
+        } catch (CannotCreateHandlingEventException e) {
+          throw new RuntimeException(e);
+        }
+
+        List<HandlingEvent> handlingEvents1 = handlingEventRepository.findEventsForCargo(trackingId1);
+        jkl567.deriveStatusFromHandling(handlingEvents1);
+
+        session.update(jkl567);
+      }
+    });
   }
 
   public void contextDestroyed(ServletContextEvent event) {}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java

@@ -8,6 +8,7 @@ import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -47,6 +48,9 @@ public class Cargo implements Entity<Cargo> {
   private RouteSpecification routeSpecification;
   private RoutingStatus routingStatus;
   private boolean misdirected;
+  private Date eta;
+  
+  private static final Date ETA_UNKOWN = null;
 
   // TODO origin can be taken from route spec on creation, even if the origin never changes
   public Cargo(final TrackingId trackingId, final Location origin, final RouteSpecification routeSpecification) {
@@ -122,6 +126,7 @@ public class Cargo implements Entity<Cargo> {
     // Handling consistency within the Cargo aggregate synchronously
     this.routingStatus = deriveRoutingStatus();
     this.misdirected = deriveMisdirectionStatus();
+    this.eta = deriveEta();
   }
 
   /**
@@ -139,16 +144,6 @@ public class Cargo implements Entity<Cargo> {
     return misdirected;
   }
 
-  private boolean deriveMisdirectionStatus() {
-    final HandlingEvent lastEvent = delivery().lastEvent();
-    if (lastEvent == null) {
-      return false;
-    } else {
-      return !itinerary().isExpected(lastEvent);
-    }
-  }
-
-
   /**
    * @return Routing status.
    */
@@ -157,29 +152,20 @@ public class Cargo implements Entity<Cargo> {
   }
 
   /**
-   * Updates the routing status.
-   * @return current routing status
-   */
-  private RoutingStatus deriveRoutingStatus() {
-    if (itinerary == null) {
-      return NOT_ROUTED;
-    } else {
-      if (routeSpecification.isSatisfiedBy(itinerary)) {
-        return ROUTED;
-      } else {
-        return MISROUTED;
-      }
-    }
-  }
-
-  /**
    * @return True if the cargo has been unloaded at the final destination.
    */
   public boolean isUnloadedAtDestination() {
     final HandlingEvent lastEvent = delivery.lastEvent();
     return lastEvent != null &&
-           HandlingEvent.Type.UNLOAD.sameValueAs(lastEvent.type()) &&
-           routeSpecification.destination().sameIdentityAs(lastEvent.location());
+      HandlingEvent.Type.UNLOAD.sameValueAs(lastEvent.type()) &&
+      routeSpecification.destination().sameIdentityAs(lastEvent.location());
+  }
+
+  /**
+   * @return estimated time of arrival
+   */
+  public Date estimatedTimeOfArrival() {
+    return eta;
   }
 
   /**
@@ -203,8 +189,55 @@ public class Cargo implements Entity<Cargo> {
     this.delivery = Delivery.derivedFrom(deliveryHistory);
     this.routingStatus = deriveRoutingStatus();
     this.misdirected = deriveMisdirectionStatus();
+    this.eta = deriveEta();
   }
 
+  /**
+   *
+   * @return true if this cargo is misdirected.
+   */
+  private boolean deriveMisdirectionStatus() {
+    final HandlingEvent lastEvent = delivery().lastEvent();
+    if (lastEvent == null) {
+      return false;
+    } else {
+      return !itinerary().isExpected(lastEvent);
+    }
+  }
+
+  /**
+   * @return current routing status
+   */
+  private RoutingStatus deriveRoutingStatus() {
+    if (itinerary == null) {
+      return NOT_ROUTED;
+    } else {
+      if (routeSpecification.isSatisfiedBy(itinerary)) {
+        return ROUTED;
+      } else {
+        return MISROUTED;
+      }
+    }
+  }
+
+  /**
+   * @return estimated time of arrival, or null if unknown
+   */
+  private Date deriveEta() {
+    if (onTrack()) {
+      return itinerary().finalArrivalDate();
+    } else {
+      return ETA_UNKOWN;
+    }
+  }
+
+  /**
+   * @return true if cargo is on track, i.e. routed and not misdirected
+   */
+  private boolean onTrack() {
+    return routingStatus().equals(ROUTED) && !misdirected;
+  }
+  
   @Override
   public boolean sameIdentityAs(final Cargo other) {
     return other != null && trackingId.sameValueAs(other.trackingId);

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -89,7 +89,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return The initial departure location.
    */
-  public Location initialDepartureLocation() {
+  Location initialDepartureLocation() {
      if (legs.isEmpty()) {
        return Location.UNKNOWN;
      } else {
@@ -100,7 +100,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return The final arrival location.
    */
-  public Location finalArrivalLocation() {
+  Location finalArrivalLocation() {
     if (legs.isEmpty()) {
       return Location.UNKNOWN;
     } else {
@@ -111,7 +111,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return Date when cargo arrives at final destination.
    */
-  public Date finalArrivalDate() {
+  Date finalArrivalDate() {
     final Leg lastLeg = lastLeg();
 
     if (lastLeg == null) {
@@ -124,7 +124,7 @@ public class Itinerary implements ValueObject<Itinerary> {
   /**
    * @return The last leg on the itinerary.
    */
-  public Leg lastLeg() {
+  Leg lastLeg() {
     if (legs.isEmpty()) {
       return null;
     } else {

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/SampleVoyages.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/SampleVoyages.java

@@ -1,6 +1,6 @@
 package se.citerus.dddsample.domain.model.carrier;
 
-import static se.citerus.dddsample.DateTestUtil.toDate;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 

dddsample/src/test/java/se/citerus/dddsample/domain/model/location/SampleLocations.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/location/SampleLocations.java

@@ -26,7 +26,7 @@ public class SampleLocations {
   public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York");
   public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas");
 
-  public static final Map<UnLocode, Location> ALL = new HashMap();
+  public static final Map<UnLocode, Location> ALL = new HashMap<UnLocode, Location>();
 
   static {
     for (Field field : SampleLocations.class.getDeclaredFields()) {
@@ -42,7 +42,7 @@ public class SampleLocations {
   }
 
   public static List<Location> getAll() {
-    return new ArrayList(ALL.values());
+    return new ArrayList<Location>(ALL.values());
   }
 
   public static Location lookup(UnLocode unLocode) {

dddsample/src/main/java/se/citerus/dddsample/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java

@@ -23,7 +23,14 @@ public class HandlingEventRegistrationAttemptConsumer implements MessageListener
   public void onMessage(final Message message) {
     try {
       final ObjectMessage om = (ObjectMessage) message;
-      handlingEventService.registerHandlingEvent((HandlingEventRegistrationAttempt) om.getObject());
+      HandlingEventRegistrationAttempt attempt = (HandlingEventRegistrationAttempt) om.getObject();
+      handlingEventService.registerHandlingEvent(
+        attempt.getCompletionTime(),
+        attempt.getTrackingId(),
+        attempt.getVoyageNumber(),
+        attempt.getUnLocode(),
+        attempt.getType()
+      );
     } catch (Exception e) {
       logger.error(e, e);
     }

dddsample/src/main/java/se/citerus/dddsample/infrastructure/messaging/jms/JmsApplicationEventsImpl.java

@@ -7,7 +7,6 @@ import org.springframework.jms.core.MessageCreator;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 import javax.jms.Destination;
@@ -61,17 +60,6 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
   }
 
   @Override
-  public void rejectedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException problem) {
-    // TODO include error message in JMS message
-    logger.info("Rejected handling event registration attempt " + attempt + ", " + problem);
-    jmsOperations.send(rejectedRegistrationAttemptsQueue, new MessageCreator() {
-      public Message createMessage(Session session) throws JMSException {
-        return session.createObjectMessage(attempt);
-      }
-    });
-  }
-
-  @Override
   public void receivedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt) {
     logger.info("Received handling event registration attempt " + attempt);
     jmsOperations.send(handlingEventQueue, new MessageCreator() {

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacade.java

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.interfaces.booking.facade;
 
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
@@ -19,9 +19,11 @@ public interface BookingServiceFacade extends Remote {
 
   CargoRoutingDTO loadCargoForRouting(String trackingId) throws RemoteException;
 
-  void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itinerary) throws RemoteException;
+  void assignCargoToRoute(String trackingId, RouteCandidateDTO route) throws RemoteException;
 
-  List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException;
+  void changeDestination(String trackingId, String destinationUnLocode) throws RemoteException;
+
+  List<RouteCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException;
 
   List<LocationDTO> listShippingLocations() throws RemoteException;
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java

@@ -3,6 +3,7 @@ package se.citerus.dddsample.interfaces.booking.facade.dto;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,6 +14,8 @@ public final class CargoRoutingDTO implements Serializable {
   private final String trackingId;
   private final String origin;
   private final String finalDestination;
+  private final Date arrivalDeadline;
+  private final boolean misrouted;
   private final List<LegDTO> legs;
 
   /**
@@ -21,11 +24,15 @@ public final class CargoRoutingDTO implements Serializable {
    * @param trackingId
    * @param origin
    * @param finalDestination
+   * @param arrivalDeadline
+   * @param misrouted
    */
-  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination) {
+  public CargoRoutingDTO(String trackingId, String origin, String finalDestination, Date arrivalDeadline, boolean misrouted) {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
+    this.arrivalDeadline = arrivalDeadline;
+    this.misrouted = misrouted;
     this.legs = new ArrayList<LegDTO>();
   }
 
@@ -41,8 +48,8 @@ public final class CargoRoutingDTO implements Serializable {
     return finalDestination;
   }
 
-  public void addLeg(final String carrierMovementId, final String from, final String to) {
-    legs.add(new LegDTO(carrierMovementId, from, to));
+  public void addLeg(String voyageNumber, String from, String to, Date loadTime, Date unloadTime) {
+    legs.add(new LegDTO(voyageNumber, from, to, loadTime, unloadTime));
   }
 
   /**
@@ -52,8 +59,16 @@ public final class CargoRoutingDTO implements Serializable {
     return Collections.unmodifiableList(legs);
   }
 
+  public boolean isMisrouted() {
+    return misrouted;
+  }
+
   public boolean isRouted() {
     return !legs.isEmpty();
   }
 
+  public Date getArrivalDeadline() {
+    return arrivalDeadline;
+  }
+
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/LegDTO.java

@@ -1,6 +1,7 @@
 package se.citerus.dddsample.interfaces.booking.facade.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * DTO for a leg in an itinerary.
@@ -10,6 +11,8 @@ public final class LegDTO implements Serializable {
   private final String voyageNumber;
   private final String from;
   private final String to;
+  private final Date loadTime;
+  private final Date unloadTime;
 
   /**
    * Constructor.
@@ -17,11 +20,15 @@ public final class LegDTO implements Serializable {
    * @param voyageNumber
    * @param from
    * @param to
+   * @param loadTime
+   * @param unloadTime
    */
-  public LegDTO(final String voyageNumber, final String from, final String to) {
+  public LegDTO(final String voyageNumber, final String from, final String to, Date loadTime, Date unloadTime) {
     this.voyageNumber = voyageNumber;
     this.from = from;
     this.to = to;
+    this.loadTime = loadTime;
+    this.unloadTime = unloadTime;
   }
 
   public String getVoyageNumber() {
@@ -36,4 +43,12 @@ public final class LegDTO implements Serializable {
     return to;
   }
 
+  public Date getLoadTime() {
+    return loadTime;
+  }
+
+  public Date getUnloadTime() {
+    return unloadTime;
+  }
+  
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/ItineraryCandidateDTO.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/RouteCandidateDTO.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * DTO for presenting and selecting an itinerary from a collection of candidates.
  */
-public final class ItineraryCandidateDTO implements Serializable {
+public final class RouteCandidateDTO implements Serializable {
 
   private final List<LegDTO> legs;
 
@@ -16,7 +16,7 @@ public final class ItineraryCandidateDTO implements Serializable {
    *
    * @param legs The legs for this itinerary.
    */
-  public ItineraryCandidateDTO(final List<LegDTO> legs) {
+  public RouteCandidateDTO(final List<LegDTO> legs) {
     this.legs = legs;
   }
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/BookingServiceFacadeImpl.java

@@ -12,8 +12,8 @@ import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.internal.assembler.CargoRoutingDTOAssembler;
 import se.citerus.dddsample.interfaces.booking.facade.internal.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.interfaces.booking.facade.internal.assembler.LocationDTOAssembler;
@@ -38,12 +38,14 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   private VoyageRepository voyageRepository;
   private final Logger logger = Logger.getLogger(BookingServiceFacadeImpl.class);
 
+  @Override
   public List<LocationDTO> listShippingLocations() {
     final List<Location> allLocations = locationRepository.findAll();
     final LocationDTOAssembler assembler = new LocationDTOAssembler();
     return assembler.toDTOList(allLocations);
   }
 
+  @Override
   public String bookNewCargo(String origin, String destination, Date arrivalDeadline) {
     TrackingId trackingId = bookingService.bookNewCargo(
       new UnLocode(origin), 
@@ -53,19 +55,27 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     return trackingId.idString();
   }
 
+  @Override
   public CargoRoutingDTO loadCargoForRouting(String trackingId) {
     final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
     final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
     return assembler.toDTO(cargo);
   }
 
-  public void assignCargoToRoute(String trackingIdStr, ItineraryCandidateDTO itineraryCandidateDTO) {
-    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, voyageRepository, locationRepository);
+  @Override
+  public void assignCargoToRoute(String trackingIdStr, RouteCandidateDTO routeCandidateDTO) {
+    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(routeCandidateDTO, voyageRepository, locationRepository);
     final TrackingId trackingId = new TrackingId(trackingIdStr);
 
     bookingService.assignCargoToRoute(itinerary, trackingId);
   }
 
+  @Override
+  public void changeDestination(String trackingId, String destinationUnLocode) throws RemoteException {
+    bookingService.changeDestination(new TrackingId(trackingId), new UnLocode(destinationUnLocode));
+  }
+
+  @Override
   public List<CargoRoutingDTO> listAllCargos() {
     final List<Cargo> cargoList = cargoRepository.findAll();
     final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(cargoList.size());
@@ -76,16 +86,17 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     return dtoList;
   }
 
-  public List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException {
+  @Override
+  public List<RouteCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException {
     final List<Itinerary> itineraries = bookingService.requestPossibleRoutesForCargo(new TrackingId(trackingId));
 
-    final List<ItineraryCandidateDTO> itineraryCandidates = new ArrayList<ItineraryCandidateDTO>(itineraries.size());
+    final List<RouteCandidateDTO> routeCandidates = new ArrayList<RouteCandidateDTO>(itineraries.size());
     final ItineraryCandidateDTOAssembler dtoAssembler = new ItineraryCandidateDTOAssembler();
     for (Itinerary itinerary : itineraries) {
-      itineraryCandidates.add(dtoAssembler.toDTO(itinerary));
+      routeCandidates.add(dtoAssembler.toDTO(itinerary));
     }
 
-    return itineraryCandidates;
+    return routeCandidates;
   }
 
   public void setBookingService(BookingService bookingService) {

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/CargoRoutingDTOAssembler.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.interfaces.booking.facade.internal.assembler;
 
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Leg;
+import se.citerus.dddsample.domain.model.cargo.RoutingStatus;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
 
 /**
@@ -13,14 +14,16 @@ public class CargoRoutingDTOAssembler {
     final CargoRoutingDTO dto = new CargoRoutingDTO(
       cargo.trackingId().idString(),
       cargo.origin().unLocode().idString(),
-      cargo.routeSpecification().destination().unLocode().idString()
-    );
+      cargo.routeSpecification().destination().unLocode().idString(),
+      cargo.routeSpecification().arrivalDeadline(),
+      cargo.routingStatus().equals(RoutingStatus.MISROUTED));
     for (Leg leg : cargo.itinerary().legs()) {
       dto.addLeg(
         leg.voyage().voyageNumber().idString(),
         leg.loadLocation().unLocode().idString(),
-        leg.unloadLocation().unLocode().idString()
-      );
+        leg.unloadLocation().unLocode().idString(),
+        leg.loadTime(),
+        leg.unloadTime());
     }
     return dto;
   }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssembler.java

@@ -8,8 +8,8 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -20,24 +20,24 @@ import java.util.List;
  */
 public class ItineraryCandidateDTOAssembler {
   
-  public ItineraryCandidateDTO toDTO(final Itinerary itinerary) {
+  public RouteCandidateDTO toDTO(final Itinerary itinerary) {
     final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
     for (Leg leg : itinerary.legs()) {
       legDTOs.add(toLegDTO(leg));
     }
-    return new ItineraryCandidateDTO(legDTOs);
+    return new RouteCandidateDTO(legDTOs);
   }
 
   protected LegDTO toLegDTO(final Leg leg) {
     final VoyageNumber voyageNumber = leg.voyage().voyageNumber();
     final UnLocode from = leg.loadLocation().unLocode();
     final UnLocode to = leg.unloadLocation().unLocode();
-    return new LegDTO(voyageNumber.idString(), from.idString(), to.idString());
+    return new LegDTO(voyageNumber.idString(), from.idString(), to.idString(), leg.loadTime(), leg.unloadTime());
   }
 
-  public Itinerary fromDTO(ItineraryCandidateDTO itineraryCandidateDTO, VoyageRepository voyageRepository, LocationRepository locationRepository) {
-    final List<Leg> legs = new ArrayList<Leg>(itineraryCandidateDTO.getLegs().size());
-    for (LegDTO legDTO : itineraryCandidateDTO.getLegs()) {
+  public Itinerary fromDTO(RouteCandidateDTO routeCandidateDTO, VoyageRepository voyageRepository, LocationRepository locationRepository) {
+    final List<Leg> legs = new ArrayList<Leg>(routeCandidateDTO.getLegs().size());
+    for (LegDTO legDTO : routeCandidateDTO.getLegs()) {
       final VoyageNumber voyageNumber = new VoyageNumber(legDTO.getVoyageNumber());
       final Voyage voyage = voyageRepository.find(voyageNumber);
       final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java

@@ -3,9 +3,9 @@ package se.citerus.dddsample.interfaces.booking.web;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,71 +28,72 @@ public final class CargoAdminController extends MultiActionController {
 
   private BookingServiceFacade bookingServiceFacade;
 
-  public Map registrationForm(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
+  public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map<String, Object> map = new HashMap<String, Object>();
+    List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
 
-    final List<String> unLocodeStrings = new ArrayList<String>();
+    List<String> unLocodeStrings = new ArrayList<String>();
 
     for (LocationDTO dto : dtoList) {
       unLocodeStrings.add(dto.getUnLocode());
     }
 
     map.put("unlocodes", unLocodeStrings);
+    map.put("locations", dtoList);
     return map;
   }
 
-  public void register(final HttpServletRequest request, final HttpServletResponse response,
-                       final RegistrationCommand command) throws Exception {
-    final Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
-    final String trackingId = bookingServiceFacade.bookNewCargo(
+  public void register(HttpServletRequest request, HttpServletResponse response,
+                       RegistrationCommand command) throws Exception {
+    Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
+    String trackingId = bookingServiceFacade.bookNewCargo(
       command.getOriginUnlocode(), command.getDestinationUnlocode(), arrivalDeadline
     );
     response.sendRedirect("show.html?trackingId=" + trackingId);
   }
 
   public Map list(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
+    Map<String, Object> map = new HashMap<String, Object>();
+    List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
 
     map.put("cargoList", cargoList);
     return map;
   }
 
-  public Map show(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final String trackingId = request.getParameter("trackingId");
-    final CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
+  public Map show(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map<String, Object> map = new HashMap<String, Object>();
+    String trackingId = request.getParameter("trackingId");
+    CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
     map.put("cargo", dto);
     return map;
   }
 
-  public Map selectItinerary(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final String trackingId = request.getParameter("trackingId");
-    final List<ItineraryCandidateDTO> itineraryCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
-    map.put("itineraryCandidates", itineraryCandidates);
+  public Map selectItinerary(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map<String, Object> map = new HashMap<String, Object>();
+    String trackingId = request.getParameter("trackingId");
 
+    List<RouteCandidateDTO> routeCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
+    map.put("routeCandidates", routeCandidates);
+
+    CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
+    map.put("cargo", cargoDTO);
 
-    final CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("origin", cargoDTO.getOrigin());
-    map.put("destination", cargoDTO.getFinalDestination());
-    map.put("trackingId", trackingId);
-    
     return map;
   }
 
-  public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
-    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
+  public void assignItinerary(HttpServletRequest request, HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
+    List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
     for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
-      legDTOs.add(new LegDTO(leg.getVoyageNumber(), leg.getFromUnLocode(), leg.getToUnLocode()));
+      // TODO actual dates
+      legDTOs.add(new LegDTO(leg.getVoyageNumber(), leg.getFromUnLocode(), leg.getToUnLocode(), new Date(), new Date()));
     }
 
-    final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
+    RouteCandidateDTO selectedRoute = new RouteCandidateDTO(legDTOs);
 
-    bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedItinerary);
+    bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedRoute);
 
-    response.sendRedirect("list.html");
+    response.sendRedirect("show.html?trackingId=" + command.getTrackingId());
+    //response.sendRedirect("list.html");
   }
 
   public void setBookingServiceFacade(BookingServiceFacade bookingServiceFacade) {

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -8,10 +8,7 @@ import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 /**
  * View adapter for displaying a cargo in a tracking context.
@@ -22,6 +19,7 @@ public final class CargoTrackingViewAdapter {
   private final MessageSource messageSource;
   private final Locale locale;
   private final List<HandlingEventViewAdapter> events;
+  private final String FORMAT = "yyyy-MM-dd hh:mm";
 
   /**
    * Constructor.
@@ -47,7 +45,7 @@ public final class CargoTrackingViewAdapter {
    * @return A formatted string for displaying the location.
    */
   private String getDisplayText(Location location) {
-    return location.unLocode().idString() + " (" + location.name() + ")";
+    return location.name();
   }
 
   /**
@@ -104,6 +102,13 @@ public final class CargoTrackingViewAdapter {
     return cargo.trackingId().idString();
   }
 
+  public String getEta() {
+    Date eta = cargo.estimatedTimeOfArrival();
+
+    if (eta == null) return "?";
+    else return new SimpleDateFormat(FORMAT).format(eta);
+  }
+
   /**
    * @return True if cargo is misdirected.
    */
@@ -117,7 +122,6 @@ public final class CargoTrackingViewAdapter {
   public final class HandlingEventViewAdapter {
 
     private final HandlingEvent handlingEvent;
-    private final String FORMAT = "yyyy-MM-dd hh:mm";
 
     /**
      * Constructor.
@@ -132,7 +136,7 @@ public final class CargoTrackingViewAdapter {
      * @return Location where the event occurred.
      */
     public String getLocation() {
-      return handlingEvent.location().unLocode().idString();
+      return handlingEvent.location().name();
     }
 
     /**
@@ -164,5 +168,36 @@ public final class CargoTrackingViewAdapter {
       return cargo.itinerary().isExpected(handlingEvent);
     }
 
+    public String getDescription() {
+      Object[] args;
+
+      switch (handlingEvent.type()) {
+        case LOAD:
+        case UNLOAD:
+          args = new Object[] {
+            handlingEvent.voyage().voyageNumber().idString(),
+            handlingEvent.location().name(),
+            handlingEvent.completionTime()
+          };
+          break;
+
+        case RECEIVE:
+        case CLAIM:
+          args = new Object[] {
+            handlingEvent.location().name(),
+            handlingEvent.completionTime()
+          };
+          break;
+
+        default:
+          args = new Object[] {};
+      }
+
+      String key = "deliveryHistory.eventDescription." + handlingEvent.type().name();
+
+      return messageSource.getMessage(key,args,locale);
+    }
+
   }
+  
 }

dddsample/src/main/resources/messages_en.properties

@@ -2,4 +2,12 @@ cargo.status.NOT_RECEIVED=Not received
 cargo.status.IN_PORT=In port {0}
 cargo.status.ONBOARD_CARRIER=Onboard carrier {0}
 cargo.status.CLAIMED=Claimed
-cargo.status.UNKNOWN=Unknown
+cargo.status.UNKNOWN=Unknown
+
+deliveryHistory.eventDescription.NOT_RECEIVED=Cargo has not yet been received.
+
+deliveryHistory.eventDescription.LOAD=Loaded onto voyage {0} in {1}, at {2}.
+deliveryHistory.eventDescription.UNLOAD=Unloaded off voyage {0} in {1}, at {2}.
+deliveryHistory.eventDescription.RECEIVE=Received in {0}, at {1}.
+deliveryHistory.eventDescription.CLAIM=Claimed in {0}, at {1}.
+deliveryHistory.eventDescription.CUSTOMS=Cleared customs in {0}, at {1}.

dddsample/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml

@@ -14,7 +14,8 @@
     <many-to-one name="origin" column="origin_id" not-null="false" cascade="none" update="false" foreign-key="origin_fk"/>
 
     <property name="misdirected" column="is_misdirected" not-null="true"/>
-
+    <property name="eta" column="eta" not-null="false"/>
+    
     <property name="routingStatus" column="routing_status" not-null="true">
       <type name="org.hibernate.type.EnumType">
         <param name="enumClass">se.citerus.dddsample.domain.model.cargo.RoutingStatus</param>

dddsample/src/main/webapp/WEB-INF/jsp/admin/selectItinerary.jsp

@@ -12,21 +12,18 @@
 <body>
 <div id="container">
   <table>
-    <caption>Select route for cargo ${trackingId}</caption>
+    <caption>Select route</caption>
     <tr>
-      <td><strong>Origin:</strong></td>
-      <td>${origin}</td>
-    </tr>
-    <tr>
-      <td><strong>Destination:</strong></td>
-      <td>${destination}</td>
+      <td>
+          Cargo ${cargo.trackingId} is going from ${cargo.origin} to ${cargo.finalDestination}
+      </td>
     </tr>
   </table>
   <c:url value="/admin/assignItinerary.html" var="postUrl"/>
 
   <c:forEach items="${itineraryCandidates}" var="it" varStatus="itStatus">
       <form action="${postUrl}" method="post">
-        <input type="hidden" name="trackingId" value="${trackingId}"/>
+        <input type="hidden" name="trackingId" value="${cargo.trackingId}"/>
         <table>
           <caption>Route ${itStatus.index + 1}</caption>
           <thead>

dddsample/src/main/webapp/WEB-INF/jsp/admin/show.jsp

@@ -13,19 +13,35 @@
       </tr>
       <tr>
         <td>Destination</td>
-        <td>${cargo.finalDestination}</td>
+        <td>
+            ${cargo.finalDestination}
+        </td>
+      </tr>
+      <tr>
+          <td></td>
+          <td>
+            <a href="">Change destination</a>    
+          </td>
+      </tr>
+      <tr>
+        <td>Arrival deadline</td>
+        <td><fmt:formatDate value="${cargo.arrivalDeadline}" pattern="yyyy-MM-dd hh:mm"/></td>
       </tr>
     </tbody>
   </table>
+  <p></p>
   <c:choose>
     <c:when test="${cargo.routed}">
-      <table>
+      <c:if test="${carg.misrouted}">
+      <p><em>Cargo is misrouted - <a href="${selectUrl}">reroute this cargo</a></em></p>    
+      </c:if>
+      <table border="1">
         <caption>Itinerary</caption>
         <thead>
           <tr>
             <td>Voyage number</td>
-            <td>From</td>
-            <td>To</td>
+            <td colspan="2">Load</td>
+            <td colspan="2">Unload</td>
           </tr>
         </thead>
         <tbody>
@@ -33,7 +49,9 @@
             <tr>
               <td>${leg.voyageNumber}</td>
               <td>${leg.from}</td>
+              <td>(<fmt:formatDate value="${leg.loadTime}" pattern="yyyy-MM-dd hh:mm"/>)</td>
               <td>${leg.to}</td>
+              <td>(<fmt:formatDate value="${leg.unloadTime}" pattern="yyyy-MM-dd hh:mm"/>)</td>
             </tr>
           </c:forEach>
         </tbody>
@@ -44,7 +62,7 @@
         <c:url value="/admin/selectItinerary.html" var="selectUrl">
           <c:param name="trackingId" value="${cargo.trackingId}"/>
         </c:url>
-        Not routed - <a href="${selectUrl}">Route this cargo</a>
+        <strong>Not routed</strong> - <a href="${selectUrl}">Route this cargo</a>
       </p>
     </c:otherwise>
   </c:choose>

dddsample/src/main/webapp/WEB-INF/jsp/pub/track.jsp

@@ -4,13 +4,12 @@
 </head>
 <body>
 <div id="container">
-  <h1>Track Your Cargo</h1>
   <div id="search">
   <form:form method="post" commandName="trackCommand">
     <table>
       <tr>
         <td>
-          Enter tracking id:
+          Enter your tracking id:
         </td>
         <td>
           <form:input path="trackingId" id="idInput"/>
@@ -30,17 +29,19 @@
   </form:form>
   </div>
   <c:if test="${cargo == null}">
-    <p><em>Hint: try tracking "XYZ" or "JKL".</em></p>  
+    <p><em>Hint: try tracking "ABC123" or "JKL567".</em></p>
   </c:if>
 
   <c:if test="${cargo != null}">
     <div id="result">
-    <h2>Status: ${cargo.statusText}</h2>
+    <h2>Cargo ${cargo.trackingId} is now: ${cargo.statusText}</h2>
+    <p>Estimated time of arrival in ${cargo.destination}: ${cargo.eta}</p>
     <c:if test="${cargo.misdirected}">
       <p class="notify"><img src="${rc.contextPath}/images/error.png" alt="" />Cargo is misdirected</p>
     </c:if>
     <c:if test="${not empty cargo.events}">
       <h3>Delivery History</h3>
+      <%--
       <table cellspacing="4">
         <thead>
           <tr>
@@ -65,6 +66,17 @@
           </c:forEach>
         </tbody>
       </table>
+      --%>
+        <ul style="list-style-type: none;">
+            <c:forEach items="${cargo.events}" var="leg">
+            <li>
+                <p><img src="${rc.contextPath}/images/${leg.expected ? "tick" : "cross"}.png" alt=""/>
+                ${leg.description}</p>
+            </li>
+            </c:forEach>
+        </ul>
+
+
     </c:if>
   </div>
   </c:if>

dddsample/src/main/webapp/WEB-INF/jspf/include.jspf

@@ -1,5 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
 <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>

dddsample/src/main/webapp/style.css

@@ -7,7 +7,9 @@ body {
   font: 400 0.7em verdana, arial, sans-serif;
   line-height: 170%;
   color: #555;
-  background-color: orange;
+  background-color: #8599f7;
+  background-image: url("images/shade.png");
+  background-repeat: repeat-x;
 }
 
 /* Headers */
@@ -193,8 +195,8 @@ div#outer {
   height: 100%;
   text-align: center;
   background-color: white;
-  border-left: 5px dashed orange;
-  border-right: 5px dashed orange;
+  border-left: 2px solid #4223de;
+  border-right: 2px solid #4223de;
 }
 
 

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

@@ -10,7 +10,6 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
@@ -62,9 +61,10 @@ public class HandlingEventServiceTest extends TestCase {
 
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, applicationEvents);
 
-    service.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(), trackingId, voyageNumber, HandlingEvent.Type.LOAD, unLocode
-    ));
+    );
+    service.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
   }
 
   public void testRegisterEventWithoutCarrierMovement() throws Exception {
@@ -78,9 +78,10 @@ public class HandlingEventServiceTest extends TestCase {
 
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, applicationEvents);
 
-    service.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(), trackingId, null, HandlingEvent.Type.RECEIVE, STOCKHOLM.unLocode()
-    ));
+    );
+    service.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
   }
   
 
@@ -93,13 +94,12 @@ public class HandlingEventServiceTest extends TestCase {
 
     expect(locationRepository.find(MELBOURNE.unLocode())).andReturn(MELBOURNE);
 
-    applicationEvents.rejectedHandlingEventRegistrationAttempt(isA(HandlingEventRegistrationAttempt.class), isA(CannotCreateHandlingEventException.class));
-
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, applicationEvents);
-    
-    service.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(), trackingId, voyageNumber, HandlingEvent.Type.UNLOAD, MELBOURNE.unLocode()
-    ));
+    );
+    service.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
   }
   
   public void testRegisterEventInvalidCargo() throws Exception {
@@ -108,13 +108,12 @@ public class HandlingEventServiceTest extends TestCase {
 
     expect(locationRepository.find(HONGKONG.unLocode())).andReturn(HONGKONG);
 
-    applicationEvents.rejectedHandlingEventRegistrationAttempt(isA(HandlingEventRegistrationAttempt.class), isA(CannotCreateHandlingEventException.class));
-
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, applicationEvents);
-    
-      service.registerHandlingEvent(new HandlingEventRegistrationAttempt(
-        new Date(), new Date(), trackingId, new VoyageNumber("V001"), HandlingEvent.Type.CLAIM, HONGKONG.unLocode()
-      ));
+
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
+      new Date(), new Date(), trackingId, new VoyageNumber("V001"), HandlingEvent.Type.CLAIM, HONGKONG.unLocode()
+    );
+    service.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
   }
   
   public void testRegisterEventInvalidLocation() throws Exception {
@@ -123,12 +122,11 @@ public class HandlingEventServiceTest extends TestCase {
     UnLocode wayOff = new UnLocode("XXYYY");
     expect(locationRepository.find(wayOff)).andReturn(null);
 
-    applicationEvents.rejectedHandlingEventRegistrationAttempt(isA(HandlingEventRegistrationAttempt.class), isA(CannotCreateHandlingEventException.class));
-
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, applicationEvents);
-    
-    service.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(), trackingId, null, HandlingEvent.Type.CLAIM, wayOff
-    ));
+    );
+    service.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
   }
 }

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/CargoTest.java

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.domain.model.cargo;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.DateTestUtil;
+import se.citerus.dddsample.application.util.DateTestUtil;
 import static se.citerus.dddsample.domain.model.cargo.RoutingStatus.*;
 import static se.citerus.dddsample.domain.model.cargo.TransportStatus.NOT_RECEIVED;
 import se.citerus.dddsample.domain.model.carrier.Voyage;

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/RouteSpecificationTest.java

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.domain.model.cargo;
 
 import junit.framework.TestCase;
-import static se.citerus.dddsample.DateTestUtil.toDate;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;

dddsample/src/test/java/se/citerus/dddsample/infrastructure/messaging/stub/SynchronousApplicationEventsStub.java

@@ -4,7 +4,6 @@ import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.CargoInspectionService;
 import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 public class SynchronousApplicationEventsStub implements ApplicationEvents {
@@ -32,11 +31,6 @@ public class SynchronousApplicationEventsStub implements ApplicationEvents {
   }
 
   @Override
-  public void rejectedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException problem) {
-    System.out.println("EVENT: rejected handling event registration attempt: " + problem);
-  }
-
-  @Override
   public void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt) {
     System.out.println("EVENT: received handling event registration attempt");
   }

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/AbstractRepositoryTest.java

@@ -7,6 +7,8 @@ import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 import org.springframework.transaction.support.TransactionTemplate;
 import se.citerus.dddsample.application.util.SampleDataGenerator;
+import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 
 import java.lang.reflect.Field;
 
@@ -14,6 +16,16 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
 
   SessionFactory sessionFactory;
   SimpleJdbcTemplate sjt;
+  HandlingEventFactory handlingEventFactory;
+  HandlingEventRepository handlingEventRepository;
+
+  public void setHandlingEventFactory(HandlingEventFactory handlingEventFactory) {
+    this.handlingEventFactory = handlingEventFactory;
+  }
+
+  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+    this.handlingEventRepository = handlingEventRepository;
+  }
 
   protected AbstractRepositoryTest() {
     setAutowireMode(AUTOWIRE_BY_NAME);
@@ -35,11 +47,12 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
 
   @Override
   protected String[] getConfigLocations() {
-    return new String[] {"/context-infrastructure-persistence.xml"};
+    return new String[] {"/context-infrastructure-persistence.xml", "context-domain.xml"};
   }
 
   @Override
   protected void onSetUpInTransaction() throws Exception {
+    // TODO store Sample* and object instances here instead of handwritten SQL
     SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
     sjt = new SimpleJdbcTemplate(jdbcTemplate);
   }

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -9,7 +9,6 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
 import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.RECEIVE;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
@@ -25,7 +24,6 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
   CargoRepository cargoRepository;
   LocationRepository locationRepository;
   VoyageRepository voyageRepository;
-  HandlingEventRepository handlingEventRepository;
 
   public void setCargoRepository(CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
@@ -39,10 +37,6 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     this.voyageRepository = voyageRepository;
   }
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
   public void testFindByCargoId() {
     final TrackingId trackingId = new TrackingId("FGH");
     final Cargo cargo = cargoRepository.find(trackingId);

dddsample/src/test/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -11,8 +11,8 @@ import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
-import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +34,7 @@ public class ItineraryCandidateDTOAssemblerTest extends TestCase {
       )
     );
 
-    final ItineraryCandidateDTO dto = assembler.toDTO(itinerary);
+    final RouteCandidateDTO dto = assembler.toDTO(itinerary);
 
     assertEquals(2, dto.getLegs().size());
     LegDTO legDTO = dto.getLegs().get(0);
@@ -52,8 +52,8 @@ public class ItineraryCandidateDTOAssemblerTest extends TestCase {
     final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
 
     final List<LegDTO> legs = new ArrayList<LegDTO>();
-    legs.add(new LegDTO("CM001", "AAAAA", "BBBBB"));
-    legs.add(new LegDTO("CM001", "BBBBB", "CCCCC"));
+    legs.add(new LegDTO("CM001", "AAAAA", "BBBBB", new Date(), new Date()));
+    legs.add(new LegDTO("CM001", "BBBBB", "CCCCC", new Date(), new Date()));
 
     final LocationRepository locationRepository = createMock(LocationRepository.class);
     expect(locationRepository.find(new UnLocode("AAAAA"))).andReturn(HONGKONG);
@@ -66,7 +66,7 @@ public class ItineraryCandidateDTOAssemblerTest extends TestCase {
 
 
     // Tested call
-    final Itinerary itinerary = assembler.fromDTO(new ItineraryCandidateDTO(legs), voyageRepository, locationRepository);
+    final Itinerary itinerary = assembler.fromDTO(new RouteCandidateDTO(legs), voyageRepository, locationRepository);
 
     
     assertNotNull(itinerary);

dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -32,29 +32,29 @@ public class CargoTrackingViewAdapterTest extends TestCase {
     CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN, events);
 
     assertEquals("XYZ", adapter.getTrackingId());
-    assertEquals("CNHGH (Hangzhou)", adapter.getOrigin());
-    assertEquals("FIHEL (Helsinki)", adapter.getDestination());
-    assertEquals("In port FIHEL (Helsinki)", adapter.getStatusText());
+    assertEquals("Hangzhou", adapter.getOrigin());
+    assertEquals("Helsinki", adapter.getDestination());
+    assertEquals("In port Helsinki", adapter.getStatusText());
 
     Iterator<CargoTrackingViewAdapter.HandlingEventViewAdapter> it = adapter.getEvents().iterator();
 
     CargoTrackingViewAdapter.HandlingEventViewAdapter event = it.next();
     assertEquals("RECEIVE", event.getType());
-    assertEquals("CNHGH", event.getLocation());
+    assertEquals("Hangzhou", event.getLocation());
     assertEquals("1970-01-01 01:00", event.getTime());
     assertEquals("", event.getVoyageNumber());
     assertTrue(event.isExpected());
 
     event = it.next();
     assertEquals("LOAD", event.getType());
-    assertEquals("CNHGH", event.getLocation());
+    assertEquals("Hangzhou", event.getLocation());
     assertEquals("1970-01-01 01:00", event.getTime());
     assertEquals("CM001", event.getVoyageNumber());
     assertTrue(event.isExpected());
 
     event = it.next();
     assertEquals("UNLOAD", event.getType());
-    assertEquals("FIHEL", event.getLocation());
+    assertEquals("Helsinki", event.getLocation());
     assertEquals("1970-01-01 01:00", event.getTime());
     assertEquals("CM001", event.getVoyageNumber());
     assertTrue(event.isExpected());

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

@@ -135,12 +135,13 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt1 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(100), trackingId, null, RECEIVE, HONGKONG.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt1);
+    handlingEventService.registerHandlingEvent(attempt1.getCompletionTime(), attempt1.getTrackingId(), attempt1.getVoyageNumber(), attempt1.getUnLocode(), attempt1.getType());
 
     // Next event: Load onto voyage CM003 in Hongkong
-    handlingEventService.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+    final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(200), trackingId, CM003.voyageNumber(), LOAD, HONGKONG.unLocode()
-    ));
+    );
+    handlingEventService.registerHandlingEvent(attempt.getCompletionTime(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getUnLocode(), attempt.getType());
 
     // Check current state - should be ok
     assertEquals(CM003, cargo.delivery().currentVoyage());
@@ -160,13 +161,14 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt failingAttempt = new HandlingEventRegistrationAttempt(
       new Date(), new Date(300), trackingId, noSuchVoyageNumber, LOAD, noSuchUnLocode
     );
-    handlingEventService.registerHandlingEvent(failingAttempt);
+    handlingEventService.registerHandlingEvent(failingAttempt.getCompletionTime(), failingAttempt.getTrackingId(), failingAttempt.getVoyageNumber(), failingAttempt.getUnLocode(), failingAttempt.getType());
 
 
     // Cargo is now (incorrectly) unloaded in Tokyo
-    handlingEventService.registerHandlingEvent(new HandlingEventRegistrationAttempt(
+    final HandlingEventRegistrationAttempt attempt7 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(400), trackingId, CM003.voyageNumber(), UNLOAD, TOKYO.unLocode()
-    ));
+    );
+    handlingEventService.registerHandlingEvent(attempt7.getCompletionTime(), attempt7.getTrackingId(), attempt7.getVoyageNumber(), attempt7.getUnLocode(), attempt7.getType());
 
     // Check current state - cargo is misdirected!
     assertEquals(NONE, cargo.delivery().currentVoyage());
@@ -201,7 +203,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt2 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(500), trackingId, CM003.voyageNumber(), LOAD, TOKYO.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt2);
+    handlingEventService.registerHandlingEvent(attempt2.getCompletionTime(), attempt2.getTrackingId(), attempt2.getVoyageNumber(), attempt2.getUnLocode(), attempt2.getType());
 
     // Check current state - should be ok
     assertEquals(CM003, cargo.delivery().currentVoyage());
@@ -213,7 +215,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt3 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(600), trackingId, CM003.voyageNumber(), UNLOAD, HAMBURG.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt3);
+    handlingEventService.registerHandlingEvent(attempt3.getCompletionTime(), attempt3.getTrackingId(), attempt3.getVoyageNumber(), attempt3.getUnLocode(), attempt3.getType());
 
     // Check current state - should be ok
     assertEquals(NONE, cargo.delivery().currentVoyage());
@@ -225,7 +227,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt4 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(700), trackingId, CM005.voyageNumber(), LOAD, HAMBURG.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt4);
+    handlingEventService.registerHandlingEvent(attempt4.getCompletionTime(), attempt4.getTrackingId(), attempt4.getVoyageNumber(), attempt4.getUnLocode(), attempt4.getType());
 
     // Check current state - should be ok
     assertEquals(CM005, cargo.delivery().currentVoyage());
@@ -237,7 +239,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt5 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(800), trackingId, CM005.voyageNumber(), UNLOAD, STOCKHOLM.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt5);
+    handlingEventService.registerHandlingEvent(attempt5.getCompletionTime(), attempt5.getTrackingId(), attempt5.getVoyageNumber(), attempt5.getUnLocode(), attempt5.getType());
 
     // Check current state - should be ok
     assertEquals(NONE, cargo.delivery().currentVoyage());
@@ -249,7 +251,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     HandlingEventRegistrationAttempt attempt6 = new HandlingEventRegistrationAttempt(
       new Date(), new Date(900), trackingId, null, CLAIM, STOCKHOLM.unLocode()
     );
-    handlingEventService.registerHandlingEvent(attempt6);
+    handlingEventService.registerHandlingEvent(attempt6.getCompletionTime(), attempt6.getTrackingId(), attempt6.getVoyageNumber(), attempt6.getUnLocode(), attempt6.getType());
 
     // Check current state - should be ok
     assertEquals(NONE, cargo.delivery().currentVoyage());