Introduced asynchronous processing of incoming handling event registration attempts.

Removed the plain-delegation track() method from TrackingService (using repository directly in CargoTrackingController instead).

Fixed a few carrier movement -> voyage references in setters and JSP expressions.

Added cargoIsMisdirected() and cargoHasArrived() to DomainEventNotifier (but no consumers yet).

Routing a cargo is still broken due to database changes incompatible with the random route generation algorithm.

dddsample/src/main/java/se/citerus/dddsample/application/messaging/CargoHandledConsumer.java

@@ -0,0 +1,39 @@
+package se.citerus.dddsample.application.messaging;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.service.TrackingService;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+
+/**
+ * Consumes JMS messages and delegates notification of misdirected
+ * cargo to the cargo service.
+ */
+public class CargoHandledConsumer implements MessageListener {
+
+  private TrackingService trackingService;
+  private final Log logger = LogFactory.getLog(getClass());
+
+  @Transactional(readOnly = true)  
+  public void onMessage(final Message message) {
+    if (logger.isDebugEnabled()) {
+      logger.debug("Received message " + message);
+    }
+    try {
+      final TextMessage textMessage = (TextMessage) message;
+      final String trackingidString = textMessage.getText();
+      trackingService.onCargoHandled(new TrackingId(trackingidString));
+    } catch (Exception e) {
+      logger.error(e, e);
+    }
+  }
+
+  public void setTrackingService(TrackingService trackingService) {
+    this.trackingService = trackingService;
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/HandlingEventRegistrationAttempt.java

@@ -0,0 +1,56 @@
+package se.citerus.dddsample.application.messaging;
+
+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.io.Serializable;
+import java.util.Date;
+
+/**
+ * This is a simple data holder for passing incoming handling event
+ * registration attempts to proper the registration procedure.
+ *  
+ */
+public class HandlingEventRegistrationAttempt implements Serializable {
+
+  private final Date date;
+  private final TrackingId trackingId;
+  private final VoyageNumber voyageNumber;
+  private final HandlingEvent.Type type;
+  private final UnLocode unLocode;
+
+  public HandlingEventRegistrationAttempt(final Date date,
+                                          final TrackingId trackingId,
+                                          final VoyageNumber voyageNumber,
+                                          final HandlingEvent.Type type,
+                                          final UnLocode unLocode) {
+    this.date = date;
+    this.trackingId = trackingId;
+    this.voyageNumber = voyageNumber;
+    this.type = type;
+    this.unLocode = unLocode;
+  }
+
+  public Date getDate() {
+    return date;
+  }
+
+  public TrackingId getTrackingId() {
+    return trackingId;
+  }
+
+  public VoyageNumber getVoyageNumber() {
+    return voyageNumber;
+  }
+
+  public HandlingEvent.Type getType() {
+    return type;
+  }
+
+  public UnLocode getUnLocode() {
+    return unLocode;
+  }
+  
+}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/HandlingEventRegistrationAttemptConsumer.java

@@ -0,0 +1,76 @@
+package se.citerus.dddsample.application.messaging;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.transaction.annotation.Transactional;
+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.handling.HandlingEventFactory;
+import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.domain.service.HandlingEventService;
+import se.citerus.dddsample.domain.service.UnknownCargoException;
+import se.citerus.dddsample.domain.service.UnknownLocationException;
+import se.citerus.dddsample.domain.service.UnknownVoyageException;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.ObjectMessage;
+import java.util.Date;
+
+/**
+ */
+public class HandlingEventRegistrationAttemptConsumer implements MessageListener {
+
+  private HandlingEventFactory handlingEventFactory;
+  private HandlingEventService handlingEventService;
+  private static final Log logger = LogFactory.getLog(HandlingEventRegistrationAttemptConsumer.class);
+
+  @Transactional(readOnly = false)
+  public void onMessage(Message message) {
+    try {
+      ObjectMessage om = (ObjectMessage) message;
+      HandlingEventRegistrationAttempt attempt = (HandlingEventRegistrationAttempt) om.getObject();
+      doRegister(attempt.getDate(), attempt.getTrackingId(), attempt.getVoyageNumber(), attempt.getType(), attempt.getUnLocode());
+    } catch (JMSException e) {
+      logger.error(e, e);
+    }
+  }
+
+  private void doRegister(final Date date, final TrackingId trackingId, final VoyageNumber voyageNumber, final HandlingEvent.Type type, final UnLocode unLocode) {
+    try {
+        HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, voyageNumber, unLocode, type);
+        handlingEventService.register(event);
+    } catch (UnknownVoyageException e) {
+      handleUnknownCarrierMovementId(e);
+    } catch (UnknownCargoException e) {
+      handleUnknownTrackingId(e);
+    } catch (UnknownLocationException e) {
+      handleUnknownLocation(e);
+    }
+  }
+
+  private void handleUnknownLocation(UnknownLocationException e) {
+    logger.error(e, e);
+  }
+
+  private void handleUnknownCarrierMovementId(UnknownVoyageException e) {
+    logger.error(e, e);
+  }
+
+  private void handleUnknownTrackingId(Exception e) {
+    logger.error(e, e);
+  }
+
+  // Setters
+
+  public void setHandlingEventService(HandlingEventService handlingEventService) {
+    this.handlingEventService = handlingEventService;
+  }
+
+  public void setHandlingEventFactory(HandlingEventFactory handlingEventFactory) {
+    this.handlingEventFactory = handlingEventFactory;
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/JmsDomainEventNotifierImpl.java

@@ -2,27 +2,49 @@ package se.citerus.dddsample.application.messaging;
 
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.MessageCreator;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.service.DomainEventNotifier;
 
-import javax.jms.*;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
 
 /**
  * JMS based implementation.
  */
 public final class JmsDomainEventNotifierImpl implements DomainEventNotifier {
+
   private JmsOperations jmsOperations;
-  private Destination destination;
-  public static final String TRACKING_ID_KEY = TrackingId.class.getName() + ".KEY";
+  private Destination cargoHandledTopic;
+  private Destination misdirectedCargoTopic;
+  private Destination deliveredCargoTopic;
 
+  @Override
   public void cargoWasHandled(final HandlingEvent event) {
-    // TODO richer message type
-    jmsOperations.send(destination, new MessageCreator() {
+    final Cargo cargo = event.cargo();
+    jmsOperations.send(cargoHandledTopic, new MessageCreator() {
       public Message createMessage(final Session session) throws JMSException {
-        final MapMessage message = session.createMapMessage();
-        message.setStringProperty(TRACKING_ID_KEY, event.cargo().trackingId().idString());
-        return message;
+        return session.createTextMessage(cargo.trackingId().idString());
+      }
+    });
+  }
+
+  @Override
+  public void cargoWasMisdirected(final Cargo cargo) {
+    jmsOperations.send(misdirectedCargoTopic, new MessageCreator() {
+      public Message createMessage(Session session) throws JMSException {
+        return session.createTextMessage(cargo.trackingId().idString());
+      }
+    });
+  }
+
+  @Override
+  public void cargoHasArrived(final Cargo cargo) {
+    jmsOperations.send(deliveredCargoTopic, new MessageCreator() {
+      public Message createMessage(Session session) throws JMSException {
+        return session.createTextMessage(cargo.trackingId().idString());
       }
     });
   }
@@ -31,7 +53,16 @@ public final class JmsDomainEventNotifierImpl implements DomainEventNotifier {
     this.jmsOperations = jmsOperations;
   }
 
-  public void setDestination(final Destination destination) {
-    this.destination = destination;
+  public void setCargoHandledTopic(final Destination cargoHandledTopic) {
+    this.cargoHandledTopic = cargoHandledTopic;
+  }
+
+  public void setMisdirectedCargoTopic(Destination misdirectedCargoTopic) {
+    this.misdirectedCargoTopic = misdirectedCargoTopic;
+  }
+
+  public void setDeliveredCargoTopic(Destination deliveredCargoTopic) {
+    this.deliveredCargoTopic = deliveredCargoTopic;
   }
+  
 }

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java

@@ -109,7 +109,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setCarrierMovementRepository(VoyageRepository voyageRepository) {
+  public void setVoyageRepository(VoyageRepository voyageRepository) {
     this.voyageRepository = voyageRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/application/routing/ExternalRoutingService.java

@@ -78,7 +78,7 @@ public class ExternalRoutingService implements RoutingService {
     this.locationRepository = locationRepository;
   }
 
-  public void setCarrierMovementRepository(VoyageRepository voyageRepository) {
+  public void setVoyageRepository(VoyageRepository voyageRepository) {
     this.voyageRepository = voyageRepository;
   }
 }

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

@@ -17,7 +17,7 @@ public interface HandlingEventServiceEndpoint {
    * @param unlocode          United Nations Location Code for the location where the event occured
    * @param eventType         type of event
    */
-  void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType);
+  void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType) throws RegistrationFailure;
 
   // TODO structured class that holds these fields, and/or a batching method that accepts a list of those
   // TODO contract-first instead of code-first (?)

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

@@ -3,137 +3,127 @@ package se.citerus.dddsample.application.ws;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.jms.core.JmsOperations;
+import org.springframework.jms.core.MessageCreator;
+import se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttempt;
 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.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.HandlingEventService;
-import se.citerus.dddsample.domain.service.UnknownCargoException;
-import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.Session;
 import javax.jws.WebService;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
-
+import java.util.List;
+
+/**
+ * This web service endpoint implementation performs basic validation and parsing
+ * of incoming data, and in case of a valid registration attempt, sends an asynchronous message
+ * with the informtion to the handling event registration system for proper registration.
+ *  
+ */
 @WebService(endpointInterface = "se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint")
 public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
 
-  private HandlingEventFactory handlingEventFactory;
-  private HandlingEventService handlingEventService;
-  private TransactionTemplate transactionTemplate;
-  private final Log logger = LogFactory.getLog(getClass());
-  protected static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
+  private JmsOperations jmsOperations;
+  private Queue handlingEventQueue;
+  private static final Log logger = LogFactory.getLog(HandlingEventServiceEndpointImpl.class);
+  
+  public static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
 
   public void register(final String completionTime, final String trackingId, final String voyageNumberString,
-                       final String unlocode, final String eventType) {
-    try {
-      final Date date = parseIso8601Date(completionTime);
-      final TrackingId tid = new TrackingId(trackingId);
-
-      final VoyageNumber voyageNumber;
-      if (StringUtils.isNotEmpty(voyageNumberString)) {
-        voyageNumber = new VoyageNumber(voyageNumberString);
-      } else {
-        voyageNumber = null;
-      }
-
-      final HandlingEvent.Type type = parseEventType(eventType);
-      final UnLocode ul = new UnLocode(unlocode);
-
-      doRegister(date, tid, voyageNumber, type, ul);
-    } catch (IllegalArgumentException iae) {
-      handleIllegalArgument(iae);
-    } catch (ParseException pe) {
-      handleInvalidDateFormat(completionTime);
-    } catch (InvalidEventTypeException iete) {
-      handleInvalidEventType(iete);
-    } catch (Exception e) {
-      handleOtherError(e);
+                       final String unlocode, final String eventType) throws RegistrationFailure {
+    final List<String> errors = new ArrayList<String>();
+
+    final Date date = parseDate(completionTime, errors);
+    final TrackingId tid = parseTrackingId(trackingId, errors);
+    final VoyageNumber voyageNumber = parseVoyageNumber(voyageNumberString, errors);
+    final HandlingEvent.Type type = parseEventType(eventType, errors);
+    final UnLocode ul = parseUnLocode(unlocode, errors);
+
+    if (errors.isEmpty()) {
+      sendRegistrationAttemptMessage(date, tid, voyageNumber, type, ul);
+    } else {
+      logger.info("Handling event registration attempt failed: " + errors);
+      throw new RegistrationFailure(errors);
     }
   }
 
-  // TODO this entire step would be well suited to move to a consumer of asynchronous messages
-  private void doRegister(final Date date, final TrackingId tid, final VoyageNumber voyageNumber, final HandlingEvent.Type type, final UnLocode ul) {
-    // Using programmatic demarcation here due to weaving conflicts
-    // between jax-ws and Spring transaction annotations
-    transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-        protected void doInTransactionWithoutResult(TransactionStatus status) {
-            try {
-                HandlingEvent event = handlingEventFactory.createHandlingEvent(date, tid, voyageNumber, ul, type);
-                handlingEventService.register(event);
-            } catch (UnknownVoyageException e) {
-                handleUnknownCarrierMovementId(e);
-            } catch (UnknownCargoException e) {
-                handleUnknownTrackingId(e);
-            } catch (UnknownLocationException e) {
-                handleUnknownLocation(e);
-            }
-        }
+  private void sendRegistrationAttemptMessage(final Date date, final TrackingId tid, final VoyageNumber voyageNumber, final HandlingEvent.Type type, final UnLocode ul) {
+    jmsOperations.send(handlingEventQueue, new MessageCreator() {
+      public Message createMessage(Session session) throws JMSException {
+        final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(date, tid, voyageNumber, type, ul);
+        return session.createObjectMessage(attempt);
+      }
     });
+    if (logger.isDebugEnabled()) {
+      logger.debug("Incoming handling event registration attempt added to queue");
+    }
   }
 
-  private HandlingEvent.Type parseEventType(final String eventType) throws InvalidEventTypeException {
+  private UnLocode parseUnLocode(final String unlocode, final List<String> errors) {
     try {
-      return HandlingEvent.Type.valueOf(eventType);
+      return new UnLocode(unlocode);
     } catch (IllegalArgumentException e) {
-      throw new InvalidEventTypeException(eventType);
+      errors.add(e.getMessage());
+      return null;
     }
   }
 
-  private Date parseIso8601Date(final String completionTime) throws ParseException {
-    return new SimpleDateFormat(ISO_8601_FORMAT).parse(completionTime);
-  }
-
-  // Validation/translation errors
-
-  private void handleIllegalArgument(IllegalArgumentException iae) {
-    logger.error(iae, iae);
-  }
-
-  private void handleOtherError(Exception e) {
-    logger.error(e, e);
-  }
-
-  private void handleInvalidEventType(InvalidEventTypeException iete) {
-    logger.error(iete, iete);
-  }
-
-  private void handleInvalidDateFormat(String completionTime) {
-    logger.error("Invalid date format: " + completionTime + ", must be on ISO 8601 format: " + ISO_8601_FORMAT);
-  }
-
-  // Domain errors, don't belong here really
-
-  private void handleUnknownLocation(UnknownLocationException e) {
-    logger.error(e, e);
+  private TrackingId parseTrackingId(final String trackingId, final List<String> errors) {
+    try {
+      return new TrackingId(trackingId);
+    } catch (IllegalArgumentException e) {
+      errors.add(e.getMessage());
+      return null;
+    }
   }
 
-  private void handleUnknownCarrierMovementId(UnknownVoyageException e) {
-    logger.error(e, e);
+  private VoyageNumber parseVoyageNumber(final String voyageNumber, final List<String> errors) {
+    if (StringUtils.isNotEmpty(voyageNumber)) {
+      try {
+        return new VoyageNumber(voyageNumber);
+      } catch (IllegalArgumentException e) {
+        errors.add(e.getMessage());
+        return null;
+      }
+    } else {
+      return null;
+    }
   }
 
-  private void handleUnknownTrackingId(Exception e) {
-    logger.error(e, e);
+  private Date parseDate(final String completionTime, final List<String> errors) {
+    Date date;
+    try {
+      date = new SimpleDateFormat(ISO_8601_FORMAT).parse(completionTime);
+    } catch (ParseException e) {
+      errors.add("Invalid date format: " + completionTime + ", must be on ISO 8601 format: " + ISO_8601_FORMAT);
+      date = null;
+    }
+    return date;
   }
 
-  // Setters
-
-  public void setHandlingEventService(HandlingEventService handlingEventService) {
-    this.handlingEventService = handlingEventService;
+  private HandlingEvent.Type parseEventType(final String eventType, final List<String> errors) {
+    try {
+      return HandlingEvent.Type.valueOf(eventType);
+    } catch (IllegalArgumentException e) {
+      errors.add(eventType + " is not a valid handling event type. Valid types are: " + Arrays.toString(HandlingEvent.Type.values()));
+      return null;      
+    }
   }
 
-  public void setTransactionManager(PlatformTransactionManager transactionManager) {
-      transactionTemplate = new TransactionTemplate(transactionManager);
+  public void setJmsOperations(final JmsOperations jmsOperations) {
+    this.jmsOperations = jmsOperations;
   }
 
-  public void setHandlingEventFactory(HandlingEventFactory handlingEventFactory) {
-    this.handlingEventFactory = handlingEventFactory;
+  public void setHandlingEventQueue(final Queue handlingEventQueue) {
+    this.handlingEventQueue = handlingEventQueue;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/application/ws/RegistrationFailure.java

@@ -0,0 +1,22 @@
+package se.citerus.dddsample.application.ws;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class RegistrationFailure extends Exception {
+  private final String[] errors;
+
+  RegistrationFailure(final List<String> errors) {
+    this.errors = errors.toArray(new String[errors.size()]);
+  }
+
+  public String[] getErrors() {
+    return errors;
+  }
+
+  @Override
+  public String getMessage() {
+    return "Reistration failure: " + Arrays.toString(errors);
+  }
+  
+}

dddsample/src/main/java/se/citerus/dddsample/domain/model/ValueObject.java

@@ -1,10 +1,12 @@
 package se.citerus.dddsample.domain.model;
 
+import java.io.Serializable;
+
 /**
  * A value object, as described in the DDD book.
  * 
  */
-public interface ValueObject<T> {
+public interface ValueObject<T> extends Serializable {
 
   /**
    * Value objects compare by the values of their attributes, they don't have an identity.

dddsample/src/main/java/se/citerus/dddsample/domain/service/DomainEventNotifier.java

@@ -1,5 +1,6 @@
 package se.citerus.dddsample.domain.service;
 
+import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 /**
@@ -20,9 +21,10 @@ public interface DomainEventNotifier {
    */
   void cargoWasHandled(HandlingEvent event);
 
-  //void cargoWasMisdirected(Cargo cargo);
+  void cargoWasMisdirected(Cargo cargo);
 
-  //void cargoHasArrived(Cargo cargo);
+  void cargoHasArrived(Cargo cargo);
 
   //void scheduleWasChanged(Voyage voyage);
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/service/TrackingService.java

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 /**
@@ -10,20 +9,12 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 public interface TrackingService {
 
   /**
-   * Track a particular cargo.
-   *
-   * @param trackingId cargo tracking id
-   * @return A cargo and its delivery history, or null if no cargo with given tracking id is found.
-   */
-  Cargo track(TrackingId trackingId);
-
-  /**
    * Inspect cargo and send relevant notifications to interested parties,
    * for example if a cargo has been misdirected, or unloaded
    * at the final destination.
    *
    * @param trackingId cargo tracking id
    */
-  void inspectCargo(TrackingId trackingId);
+  void onCargoHandled(TrackingId trackingId);
 
 }

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/TrackingServiceImpl.java

@@ -20,20 +20,9 @@ public class TrackingServiceImpl implements TrackingService {
     this.cargoRepository = cargoRepository;
   }
 
-  public Cargo track(final TrackingId trackingId) {
-    // TODO this does not add any value over calling repository
-    // Perhaps this service should be remodeled to only handle inspection
-    // and state updating 
-    Validate.notNull(trackingId);
-
-    return cargoRepository.find(trackingId);
-  }
-
-  public void inspectCargo(final TrackingId trackingId) {
-    // TODO this method name is not descriptive enough
-    // For example, onCargoHandling(), whenCargoIsHandled(), actOnHandling() 
-    // mirrors DomainEventNotifier.cargoWasHandled()
-    Validate.notNull(trackingId);
+  @Override
+  public void onCargoHandled(final TrackingId trackingId) {
+    Validate.notNull(trackingId, "Tracking ID is required");
 
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
@@ -41,16 +30,15 @@ public class TrackingServiceImpl implements TrackingService {
       return;
     }
 
-    // TODO publish events here
+    // TODO cargo delivery status update would happen here
 
     if (cargo.isMisdirected()) {
-      //domainEventNotifier.cargoWasMisdirected(cargo);
+      domainEventNotifier.cargoWasMisdirected(cargo);
     }
 
     if (cargo.isUnloadedAtDestination()) {
-      //domainEventNotifier.cargoHasArrived(cargo);
+      domainEventNotifier.cargoHasArrived(cargo);
     }
-    
   }
 
 }

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java

@@ -6,8 +6,8 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.service.TrackingService;
 import se.citerus.dddsample.ui.command.TrackCommand;
 
 import javax.servlet.http.HttpServletRequest;
@@ -33,7 +33,7 @@ import java.util.Map;
  */
 public final class CargoTrackingController extends SimpleFormController {
 
-  private TrackingService trackingService;
+  private CargoRepository cargoRepository;
 
   public CargoTrackingController() {
     setCommandClass(TrackCommand.class);
@@ -45,7 +45,8 @@ public final class CargoTrackingController extends SimpleFormController {
 
     final TrackCommand trackCommand = (TrackCommand) command;
     final String trackingIdString = trackCommand.getTrackingId();
-    final Cargo cargo = trackingService.track(new TrackingId(trackingIdString));
+    
+    final Cargo cargo = cargoRepository.find(new TrackingId(trackingIdString));
 
     final Map<String, CargoTrackingViewAdapter> model = new HashMap();
     if (cargo != null) {
@@ -53,13 +54,12 @@ public final class CargoTrackingController extends SimpleFormController {
       final Locale locale = RequestContextUtils.getLocale(request);
       model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale));
     } else {
-      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()},
-        "Unknown tracking id");
+      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()}, "Unknown tracking id");
     }
     return showForm(request, response, errors, model);
   }
 
-  public void setTrackingService(TrackingService trackingService) {
-    this.trackingService = trackingService;
+  public void setCargoRepository(CargoRepository cargoRepository) {
+    this.cargoRepository = cargoRepository;
   }
 }

dddsample/src/main/java/se/citerus/routingteam/internal/GraphDAO.java

@@ -29,6 +29,7 @@ public class GraphDAO {
     return result;
   }
 
+  // TODO adapt to Voyage
   public void storeCarrierMovementId(String cmId, String from, String to) {
     final String locationSql = "select id from location where unlocode = ?";
 

dddsample/src/main/resources/context-messaging-jms.xml

@@ -10,25 +10,40 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 
-  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost"/>
+  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false"/>
 
-  <amq:topic id="handlingEventTopic" name="HandlingEventTopic" physicalName="HandlingEventTopic"/>
+  <amq:topic id="cargoHandledTopic" name="CargoHandledTopic"/>
+  <amq:topic id="misdirectedCargoTopic" name="MisdirectedCargoTopic"/>
+  <amq:topic id="deliveredCargoTopic" name="DeliveredCargoTopic"/>
+  <amq:queue id="handlingEventRegistrationAttemptQueue" name="HandlingEventRegistrationAttemptQueue"/>
 
   <jms:listener-container connection-factory="jmsConnectionFactory">
-    <jms:listener destination="handlingEventTopic" ref="handlingEventMessageDelegate" />
+    <jms:listener destination="cargoHandledTopic" ref="cargoHandledConsumer" />
+    <!-- TODO subscribers
+    <jms:listener destination="misdirectedCargoTopic" ref="TODO"/>
+    <jms:listener destination="deliveredCargoTopic" ref="TODO"/>
+    -->
+    <jms:listener destination="handlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
   </jms:listener-container>
 
-  <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.application.messaging.HandlingEventMessageDelegate">
-    <property name="trackingService" ref="trackingService"/>
-  </bean>
-  
   <bean id="jmsOperations" class="org.springframework.jms.core.JmsTemplate">
     <property name="connectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
   <bean id="domainEventNotifier" class="se.citerus.dddsample.application.messaging.JmsDomainEventNotifierImpl">
     <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="destination" ref="handlingEventTopic"/>
+    <property name="cargoHandledTopic" ref="cargoHandledTopic"/>
+    <property name="misdirectedCargoTopic" ref="misdirectedCargoTopic"/>
+    <property name="deliveredCargoTopic" ref="deliveredCargoTopic"/>
+  </bean>
+
+  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.application.messaging.CargoHandledConsumer">
+    <property name="trackingService" ref="trackingService"/>
+  </bean>
+
+  <bean id="handlingEventRegistrationAttemptConsumer" class="se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttemptConsumer">
+    <property name="handlingEventFactory" ref="handlingEventFactory"/>
+    <property name="handlingEventService" ref="handlingEventService"/>
   </bean>
   
 </beans>

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

@@ -22,9 +22,8 @@
   </wss:bindings>
 
   <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl">
-    <property name="handlingEventService" ref="handlingEventService"/>
-    <property name="transactionManager" ref="transactionManager"/>
-    <property name="handlingEventFactory" ref="handlingEventFactory"/>
+    <property name="jmsOperations" ref="jmsOperations"/>
+    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
   </bean>
 
   <!-- RMI exposed booking service facade -->

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

@@ -15,6 +15,7 @@
 
   <bean id="trackingService" class="se.citerus.dddsample.domain.service.impl.TrackingServiceImpl">
     <constructor-arg ref="cargoRepository"/>
+    <constructor-arg ref="domainEventNotifier"/>
   </bean>
 
   <bean id="handlingEventService" class="se.citerus.dddsample.domain.service.impl.HandlingEventServiceImpl">

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -16,7 +16,7 @@
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="cargo/track"/>
     <property name="successView" value="start"/>
-    <property name="trackingService" ref="trackingService"/>
+    <property name="cargoRepository" ref="cargoRepository"/>
     <property name="validator" ref="trackCommandValidator"/>
   </bean>
 

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

@@ -23,7 +23,7 @@
         <caption>Itinerary</caption>
         <thead>
           <tr>
-            <td>Carrier</td>
+            <td>Voyage number</td>
             <td>From</td>
             <td>To</td>
           </tr>
@@ -31,7 +31,7 @@
         <tbody>
           <c:forEach items="${cargo.legs}" var="leg">
             <tr>
-              <td>${leg.carrierMovementId}</td>
+              <td>${leg.voyageNumber}</td>
               <td>${leg.from}</td>
               <td>${leg.to}</td>
             </tr>

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

@@ -47,7 +47,7 @@
             <td>Event</td>
             <td>Location</td>
             <td>Time</td>
-            <td>Carrier Movement</td>
+            <td>Voyage number</td>
             <td></td>
           </tr>
         </thead>
@@ -57,7 +57,7 @@
               <td>${event.type}</td>
               <td>${event.location}</td>
               <td>${event.time}</td>
-              <td>${event.carrierMovement}</td>
+              <td>${event.voyageNumber}</td>
               <td>
                 <img src="${rc.contextPath}/images/${event.expected ? "tick" : "cross"}.png" alt=""/>
               </td>

dddsample/src/test/java/se/citerus/dddsample/CargoHandlingScenarioTest.java

@@ -142,8 +142,10 @@ public class CargoHandlingScenarioTest extends TestCase {
     // Synchronous stub
     domainEventNotifier = new DomainEventNotifier() {
       public void cargoWasHandled(HandlingEvent event) {
-        trackingService.inspectCargo(event.cargo().trackingId());
+        trackingService.onCargoHandled(event.cargo().trackingId());
       }
+      public void cargoWasMisdirected(Cargo cargo) {}
+      public void cargoHasArrived(Cargo cargo) {}
     };
 
     // Stub

dddsample/src/test/java/se/citerus/dddsample/application/routing/ExternalRoutingServiceTest.java

@@ -27,7 +27,7 @@ public class ExternalRoutingServiceTest extends TestCase {
   @Override
   public void setUp() {
     routingService = new ExternalRoutingService();
-    routingService.setCarrierMovementRepository(new VoyageRepositoryInMem());
+    routingService.setVoyageRepository(new VoyageRepositoryInMem());
     routingService.setLocationRepository(new LocationRepositoryInMem());
 
     graphTraversalService = createMock(GraphTraversalService.class);

dddsample/src/test/java/se/citerus/dddsample/application/ws/HandlinEventServiceEndpointTest.java

@@ -2,69 +2,52 @@ package se.citerus.dddsample.application.ws;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.service.InMemTransactionManager;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-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.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.NEWYORK;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.HandlingEventService;
-import se.citerus.dddsample.domain.service.UnknownCargoException;
-import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownVoyageException;
+import org.springframework.jms.core.JmsOperations;
+import org.springframework.jms.core.MessageCreator;
 
+import javax.jms.Queue;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class HandlinEventServiceEndpointTest extends TestCase {
 
   private HandlingEventServiceEndpointImpl endpoint;
-  private HandlingEventService handlingEventService;
-  private SimpleDateFormat sdf;
-  private HandlingEvent event;
+  private SimpleDateFormat sdf = new SimpleDateFormat(HandlingEventServiceEndpointImpl.ISO_8601_FORMAT);
   private Date date = new Date(100);
+  private JmsOperations jmsOperations;
+  private Queue queue;
 
   protected void setUp() throws Exception {
-    sdf = new SimpleDateFormat(HandlingEventServiceEndpointImpl.ISO_8601_FORMAT);
-
     endpoint = new HandlingEventServiceEndpointImpl();
 
-    handlingEventService = createMock(HandlingEventService.class);
-    endpoint.setHandlingEventService(handlingEventService);
-
-    endpoint.setTransactionManager(new InMemTransactionManager());
-
-    Cargo cargo = new Cargo(new TrackingId("FOO"), HONGKONG, NEWYORK);
-
-    event = new HandlingEvent(
-      cargo, date, new Date(), HandlingEvent.Type.LOAD, HONGKONG, SampleVoyages.CM003
-    );
-
-    HandlingEventFactory handlingEventFactory = new HandlingEventFactory(null,null,null) {
-      @Override
-      public HandlingEvent createHandlingEvent(Date completionTime, TrackingId trackingId, VoyageNumber voyageNumber, UnLocode unlocode, HandlingEvent.Type type)
-        throws UnknownCargoException, UnknownVoyageException, UnknownLocationException {
-        
-        return event;
-      }
-    };
+    jmsOperations = createMock(JmsOperations.class);
+    queue = createMock(Queue.class);
 
-    endpoint.setHandlingEventFactory(handlingEventFactory);
+    endpoint.setJmsOperations(jmsOperations);
+    endpoint.setHandlingEventQueue(queue);
   }
 
   public void testRegisterValidEvent() throws Exception {
-    handlingEventService.register(event);
-    replay(handlingEventService);
+    jmsOperations.send(eq(queue), isA(MessageCreator.class));
+    replay(jmsOperations, queue);
 
     // Tested call
     endpoint.register(sdf.format(date), "FOO", "CAR_456", "CNHKG", "LOAD");
   }
 
+  public void testRegisterInalidEvent() throws Exception {
+    replay(jmsOperations, queue);
+
+    // Tested call
+    try {
+      endpoint.register("NOT_A_DATE", "", "", "NOT_A_UN_LOCODE", "NOT_A_TYPE");
+      fail("Should not accept invalid ");
+    } catch (Exception expected) {
+      System.err.println(expected);
+    }
+  }
+
   protected void tearDown() throws Exception {
-    verify(handlingEventService);
+    verify(jmsOperations, queue);
   }
 }

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java

@@ -31,7 +31,7 @@ public class RoutingServiceTest extends TestCase {
     routingService.setLocationRepository(locationRepository);
 
     voyageRepository = createMock(VoyageRepository.class);
-    routingService.setCarrierMovementRepository(voyageRepository);
+    routingService.setVoyageRepository(voyageRepository);
 
     GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO(createMock(DataSource.class)) {
       public List<String> listLocations() {

dddsample/src/test/java/se/citerus/dddsample/domain/service/TrackingServiceTest.java

@@ -1,85 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.CHICAGO;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
-import se.citerus.dddsample.domain.service.impl.TrackingServiceImpl;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-
-public class TrackingServiceTest extends TestCase {
-
-  TrackingServiceImpl cargoService;
-  CargoRepository cargoRepository;
-  DomainEventNotifier domainEventNotifier;
-
-  protected void setUp() throws Exception {
-    cargoRepository = createMock(CargoRepository.class);
-    domainEventNotifier = createMock(DomainEventNotifier.class);
-    cargoService = new TrackingServiceImpl(domainEventNotifier, cargoRepository);
-  }
-
-  public void testTrackingScenario() {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, CHICAGO);
-
-    HandlingEvent claimed = new HandlingEvent(cargo, new Date(10), new Date(20), HandlingEvent.Type.CLAIM, STOCKHOLM);
-
-    HandlingEvent loaded = new HandlingEvent(cargo, new Date(12), new Date(25), HandlingEvent.Type.LOAD, STOCKHOLM, SampleVoyages.CM001);
-    HandlingEvent unloaded = new HandlingEvent(cargo, new Date(100), new Date(110), HandlingEvent.Type.UNLOAD, CHICAGO, SampleVoyages.CM002);
-
-    // Add out of order to verify ordering in DTO
-    List<HandlingEvent> eventList = Arrays.asList(loaded, unloaded, claimed);
-
-    CargoTestHelper.setDeliveryHistory(cargo, eventList);
-
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(cargo);
-
-    replay(cargoRepository);
-
-
-    // Tested call
-    Cargo trackedCargo = cargoService.track(new TrackingId("XYZ"));
-
-    assertEquals(cargo, trackedCargo);
-
-    List<HandlingEvent> events = trackedCargo.delivery().history();
-    assertEquals(3, events.size());
-
-    // Claim happened first
-    HandlingEvent handlingEvent = events.get(0);
-    assertEquals(claimed, handlingEvent);
-
-    // Then load
-    handlingEvent = events.get(1);
-    assertEquals(loaded, handlingEvent);
-
-    // Finally unload
-    handlingEvent = events.get(2);
-    assertEquals(unloaded, handlingEvent);
-  }
-
-  public void testTrackNullResult() {
-    expect(cargoRepository.find(new TrackingId("XYZ"))).andReturn(null);
-    replay(cargoRepository);
-
-    // Tested call
-    Cargo cargo = cargoService.track(new TrackingId("XYZ"));
-    
-    assertNull(cargo);
-  }
-
-  protected void onTearDown() throws Exception {
-    verify(cargoRepository);
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingControllerTest.java

@@ -1,6 +1,7 @@
 package se.citerus.dddsample.ui;
 
 import junit.framework.TestCase;
+import org.easymock.EasyMock;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -10,24 +11,18 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.TOKYO;
-import se.citerus.dddsample.domain.service.TrackingService;
+import se.citerus.dddsample.application.persistence.CargoRepositoryInMem;
+import se.citerus.dddsample.application.persistence.HandlingEventRepositoryInMem;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.ui.command.TrackCommand;
 
-import java.util.Arrays;
-import java.util.Date;
-
 public class CargoTrackingControllerTest extends TestCase {
   CargoTrackingController controller;
   MockHttpServletRequest request;
   MockHttpServletResponse response;
   MockHttpSession session;
   MockServletContext servletContext;
+  private CargoRepositoryInMem cargoRepository;
 
   protected void setUp() throws Exception {
     servletContext = new MockServletContext("test");
@@ -42,27 +37,13 @@ public class CargoTrackingControllerTest extends TestCase {
     controller.setFormView("test-form");
     controller.setSuccessView("test-success");
     controller.setCommandName("test-command-name");
-  }
-
-  private TrackingService getCargoServiceMock() {
-    return new EmptyStubTrackingService() {
-
-      public Cargo track(TrackingId trackingId) {
-        final Cargo cargo = new Cargo(trackingId, HONGKONG, TOKYO);
-        final HandlingEvent event = new HandlingEvent(cargo, new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE, HONGKONG);
-        CargoTestHelper.setDeliveryHistory(cargo, Arrays.asList(event));
-        
-        return cargo;
-      }
-    };
-  }
-
-  private TrackingService getTrackingServiceNullMock() {
-    return new EmptyStubTrackingService();
+    cargoRepository = new CargoRepositoryInMem();
+    cargoRepository.setHandlingEventRepository(new HandlingEventRepositoryInMem());
+    cargoRepository.init();
   }
 
   public void testHandleGet() throws Exception {
-    controller.setTrackingService(getCargoServiceMock());
+    controller.setCargoRepository(new CargoRepositoryInMem());
     request.setMethod("GET");
 
     ModelAndView mav = controller.handleRequest(request, response);
@@ -73,8 +54,8 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   public void testHandlePost() throws Exception {
-    controller.setTrackingService(getCargoServiceMock());
-    request.addParameter("trackingId", "JKL456");
+    controller.setCargoRepository(cargoRepository);
+    request.addParameter("trackingId", "ABC");
     request.setMethod("POST");
 
     ModelAndView mav = controller.handleRequest(request, response);
@@ -83,11 +64,14 @@ public class CargoTrackingControllerTest extends TestCase {
     // Errors, command are two standard map attributes, the third should be the cargo object
     assertEquals(3, mav.getModel().size());
     CargoTrackingViewAdapter cargo = (CargoTrackingViewAdapter) mav.getModel().get("cargo");
-    assertEquals("JKL456", cargo.getTrackingId());
+    assertEquals("ABC", cargo.getTrackingId());
   }
 
   public void testUnknownCargo() throws Exception {
-    controller.setTrackingService(getTrackingServiceNullMock());
+    CargoRepository cargoRepository = EasyMock.createNiceMock(CargoRepository.class);
+    EasyMock.replay(cargoRepository);
+    controller.setCargoRepository(cargoRepository);
+    
     request.setMethod("POST");
     request.setParameter("trackingId", "unknown-id");
 
@@ -106,11 +90,4 @@ public class CargoTrackingControllerTest extends TestCase {
     assertEquals(command.getTrackingId(), fe.getArguments()[0]);
   }
 
-  private class EmptyStubTrackingService implements TrackingService {
-    public Cargo track(TrackingId trackingId) {
-      return null;
-    }
-    public void inspectCargo(TrackingId trackingId) {
-    }
-  }
 }