Made cargo delivery update cause an event to be published and subscribed to (and acted upon), instead of performing checks at the same time the delivery is updated.

Removed unused events from ApplicationEvents.

Removed programmatic JMS adapters in favor of Spring adadpters.

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

@@ -21,24 +21,9 @@ public interface ApplicationEvents {
 
   /**
    * Cargo delivery has been updated.
-   * @param cargo cargo
-   */
-  void cargoDeliveryWasUpdated(Cargo cargo);
-
-  // TODO remove the two below 
-
-  /**
-   * A cargo has been misdirected.
    *
    * @param cargo cargo
    */
-  void cargoWasMisdirected(Cargo cargo);
-
-  /**
-   * A cargo has arrived at its final destination.
-   *
-   * @param cargo cargo
-   */
-  void cargoHasArrived(Cargo cargo);
+  void cargoDeliveryWasUpdated(Cargo cargo);
 
 }

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

@@ -0,0 +1,37 @@
+/**
+ * Purpose
+ * @author peter
+ * @created 2009-aug-03
+ * $Id$
+ */
+package se.citerus.dddsample.application;
+
+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.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+
+public class MisdirectedNotifier {
+
+  private CargoRepository cargoRepository;
+
+  private static final Log LOG = LogFactory.getLog(MisdirectedNotifier.class);
+
+  public MisdirectedNotifier(final CargoRepository cargoRepository) {
+    this.cargoRepository = cargoRepository;
+  }
+
+  @Transactional
+  public void alertIfMisdirected(final TrackingId trackingId) {
+    final Cargo cargo = cargoRepository.find(trackingId);
+
+    if (cargo.delivery().isMisdirected()) {
+      LOG.info("Cargo " + cargo + " is misdirected!");
+    }
+  }
+
+  MisdirectedNotifier() {
+  }
+}

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

@@ -0,0 +1,37 @@
+/**
+ * Purpose
+ * @author peter
+ * @created 2009-aug-03
+ * $Id$
+ */
+package se.citerus.dddsample.application;
+
+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.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+
+public class ReadyToClaimNotfier {
+
+  private CargoRepository cargoRepository;
+
+  private static final Log LOG = LogFactory.getLog(ReadyToClaimNotfier.class);
+
+  public ReadyToClaimNotfier(final CargoRepository cargoRepository) {
+    this.cargoRepository = cargoRepository;
+  }
+
+  @Transactional
+  public void alertIfReadyToClaim(final TrackingId trackingId) {
+    final Cargo cargo = cargoRepository.find(trackingId);
+
+    if (cargo.delivery().isUnloadedAtDestination()) {
+      LOG.info("Cargo " + cargo + " is ready to be claimed");
+    }
+  }
+
+  ReadyToClaimNotfier() {
+  }
+}

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

@@ -39,21 +39,10 @@ public class CargoInspectionServiceImpl implements CargoInspectionService {
     }
 
     final HandlingHistory handlingHistory = handlingEventRepository.lookupHandlingHistoryOfCargo(cargo);
-
     cargo.deriveDeliveryProgress(handlingHistory);
 
-    if (cargo.delivery().isMisdirected()) {
-      applicationEvents.cargoWasMisdirected(cargo);
-    }
-
-    if (cargo.delivery().isUnloadedAtDestination()) {
-      applicationEvents.cargoHasArrived(cargo);
-    }
-
     cargoRepository.store(cargo);
-
-    // TODO replace the inspections above with subscribers to this event
-    //applicationEvents.cargoDeliveryWasUpdated(cargo);
+    applicationEvents.cargoDeliveryWasUpdated(cargo);
   }
 
 }

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

@@ -1,39 +0,0 @@
-package se.citerus.dddsample.infrastructure.messaging.jms;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.application.CargoInspectionService;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-/**
- * Consumes JMS messages and delegates notification of misdirected
- * cargo to the tracking service.
- *
- * This is a programmatic hook into the JMS infrastructure to
- * make cargo inspection message-driven.
- */
-public class CargoHandledConsumer implements MessageListener {
-
-  private CargoInspectionService cargoInspectionService;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  @Override  
-  public void onMessage(final Message message) {
-    try {
-      final TextMessage textMessage = (TextMessage) message;
-      final String trackingidString = textMessage.getText();
-      
-      cargoInspectionService.inspectCargo(new TrackingId(trackingidString));
-    } catch (Exception e) {
-      logger.error(e, e);
-    }
-  }
-
-  public void setCargoInspectionService(CargoInspectionService cargoInspectionService) {
-    this.cargoInspectionService = cargoInspectionService;
-  }
-}

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

@@ -1,7 +1,5 @@
 package se.citerus.dddsample.infrastructure.messaging.jms;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.MessageCreator;
 import se.citerus.dddsample.application.ApplicationEvents;
@@ -19,50 +17,24 @@ import javax.jms.Session;
 public final class JmsApplicationEventsImpl implements ApplicationEvents {
 
   private JmsOperations jmsOperations;
-  private Destination cargoHandledQueue;
-  private Destination misdirectedCargoQueue;
-  private Destination deliveredCargoQueue;
-  private Destination cargoDeliveryUpdateQueue;
-
-  private static final Log logger = LogFactory.getLog(JmsApplicationEventsImpl.class);
+  private Destination cargoHandledDestination;
+  private Destination cargoDeliveryUpdateDestination;
 
   @Override
   public void cargoWasHandled(final HandlingEvent event) {
     final Cargo cargo = event.cargo();
-    logger.info("Cargo was handled " + cargo);
-    jmsOperations.send(cargoHandledQueue, new MessageCreator() {
+    jmsOperations.send(cargoHandledDestination, new MessageCreator() {
       public Message createMessage(final Session session) throws JMSException {
-        return session.createTextMessage(cargo.trackingId().stringValue());
+        return session.createObjectMessage(cargo.trackingId());
       }
     });
   }
 
   @Override
   public void cargoDeliveryWasUpdated(final Cargo cargo) {
-    logger.info("Cargo delivery was updated: " + cargo);
-    jmsOperations.send(cargoDeliveryUpdateQueue, new MessageCreator() {
-      public Message createMessage(Session session) throws JMSException {
-        return session.createTextMessage(cargo.trackingId().stringValue());
-      }
-    });
-  }
-
-  @Override
-  public void cargoWasMisdirected(final Cargo cargo) {
-    logger.info("Cargo was misdirected " + cargo);
-    jmsOperations.send(misdirectedCargoQueue, new MessageCreator() {
-      public Message createMessage(Session session) throws JMSException {
-        return session.createTextMessage(cargo.trackingId().stringValue());
-      }
-    });
-  }
-
-  @Override
-  public void cargoHasArrived(final Cargo cargo) {
-    logger.info("Cargo has arrived " + cargo);
-    jmsOperations.send(deliveredCargoQueue, new MessageCreator() {
+    jmsOperations.send(cargoDeliveryUpdateDestination, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
-        return session.createTextMessage(cargo.trackingId().stringValue());
+        return session.createObjectMessage(cargo.trackingId());
       }
     });
   }
@@ -71,19 +43,12 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
     this.jmsOperations = jmsOperations;
   }
 
-  public void setCargoHandledQueue(Destination destination) {
-    this.cargoHandledQueue = destination;
-  }
-
-  public void setMisdirectedCargoQueue(Destination destination) {
-    this.misdirectedCargoQueue = destination;
+  public void setCargoHandledDestination(Destination cargoHandledDestination) {
+    this.cargoHandledDestination = cargoHandledDestination;
   }
 
-  public void setDeliveredCargoQueue(Destination destination) {
-    this.deliveredCargoQueue = destination;
+  public void setCargoDeliveryUpdateDestination(Destination cargoDeliveryUpdateDestination) {
+    this.cargoDeliveryUpdateDestination = cargoDeliveryUpdateDestination;
   }
 
-  public void setCargoDeliveryUpdateQueue(Destination cargoDeliveryUpdateQueue) {
-    this.cargoDeliveryUpdateQueue = cargoDeliveryUpdateQueue;
-  }
 }

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

@@ -1,18 +0,0 @@
-package se.citerus.dddsample.infrastructure.messaging.jms;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-public class SimpleLoggingConsumer implements MessageListener {
-
-  private final Log logger = LogFactory.getLog(SimpleLoggingConsumer.class);
-
-  @Override
-  public void onMessage(Message message) {
-    logger.debug("Received JMS message: " + message);
-  }
-
-}

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

@@ -2,7 +2,13 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!--context:component-scan base-package="se.citerus.dddsample"/>
+  <context:annotation-config/-->
 
   <bean id="bookingService" class="se.citerus.dddsample.application.impl.BookingServiceImpl">
     <constructor-arg ref="cargoFactory"/>
@@ -23,4 +29,12 @@
     <constructor-arg ref="applicationEvents"/>
   </bean>
 
+  <bean id="misdirectedNotifier" class="se.citerus.dddsample.application.MisdirectedNotifier">
+    <constructor-arg ref="cargoRepository"/>
+  </bean>
+
+  <bean id="readyToClaimNotfier" class="se.citerus.dddsample.application.ReadyToClaimNotfier">
+    <constructor-arg ref="cargoRepository"/>
+  </bean>
+
 </beans>

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

@@ -14,15 +14,12 @@
   <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
 
   <amq:queue id="cargoHandledQueue" name="CargoHandledQueue" physicalName="CargoHandledQueue"/>
-  <amq:queue id="misdirectedCargoQueue" name="MisdirectedCargoQueue" physicalName="MisdirectedCargoQueue"/>
-  <amq:queue id="deliveredCargoQueue" name="DeliveredCargoQueue" physicalName="DeliveredCargoQueue"/>
-  <amq:queue id="cargoDeliveryUpdateQueue" name="CargoDeliveryUpdateQueue" physicalName="CargoDeliveryUpdateQueue"/>
+  <amq:topic id="cargoDeliveryUpdateTopic" name="CargoDeliveryUpdateTopic" physicalName="CargoDeliveryUpdateTopic"/>
 
   <jms:listener-container connection-factory="jmsConnectionFactory">
-    <jms:listener destination="CargoHandledQueue" ref="cargoHandledConsumer" />
-    <jms:listener destination="MisdirectedCargoQueue" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="DeliveredCargoQueue" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="RejectedRegistrationAttemptsQueue" ref="simpleLoggingConsumer"/>
+    <jms:listener destination="CargoHandledQueue" ref="listener3"/>
+    <jms:listener destination="CargoDeliveryUpdateTopic" ref="listener1"/>
+    <jms:listener destination="CargoDeliveryUpdateTopic" ref="listener2"/>
   </jms:listener-container>
 
   <bean id="jmsOperations" class="org.springframework.jms.core.JmsTemplate">
@@ -31,16 +28,23 @@
 
   <bean id="applicationEvents" class="se.citerus.dddsample.infrastructure.messaging.jms.JmsApplicationEventsImpl">
     <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="cargoHandledQueue" ref="cargoHandledQueue"/>
-    <property name="misdirectedCargoQueue" ref="misdirectedCargoQueue"/>
-    <property name="deliveredCargoQueue" ref="deliveredCargoQueue"/>
-    <property name="cargoDeliveryUpdateQueue" ref="cargoDeliveryUpdateQueue"/>
+    <property name="cargoHandledDestination" ref="cargoHandledQueue"/>
+    <property name="cargoDeliveryUpdateDestination" ref="cargoDeliveryUpdateTopic"/>
   </bean>
 
-  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
-    <property name="cargoInspectionService" ref="cargoInspectionService"/>
+  <bean id="listener1" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
+    <constructor-arg ref="misdirectedNotifier"/>
+    <property name="defaultListenerMethod" value="alertIfMisdirected"/>
   </bean>
 
-  <bean id="simpleLoggingConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.SimpleLoggingConsumer"/>
+  <bean id="listener2" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
+    <constructor-arg ref="readyToClaimNotfier"/>
+    <property name="defaultListenerMethod" value="alertIfReadyToClaim"/>
+  </bean>
+
+  <bean id="listener3" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
+    <constructor-arg ref="cargoInspectionService"/>
+    <property name="defaultListenerMethod" value="inspectCargo"/>
+  </bean>
 
 </beans>

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

@@ -1,40 +0,0 @@
-package se.citerus.dddsample.infrastructure.messaging.stub;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.application.ApplicationEvents;
-import se.citerus.dddsample.application.CargoInspectionService;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-public class SynchronousApplicationEventsStub implements ApplicationEvents {
-
-  CargoInspectionService cargoInspectionService;
-  private static final Log logger = LogFactory.getLog(SynchronousApplicationEventsStub.class);
-
-  public void setCargoInspectionService(CargoInspectionService cargoInspectionService) {
-    this.cargoInspectionService = cargoInspectionService;
-  }
-
-  @Override
-  public void cargoWasHandled(HandlingEvent event) {
-    logger.debug("EVENT: cargo was handled: " + event);
-    cargoInspectionService.inspectCargo(event.cargo().trackingId());
-  }
-
-  @Override
-  public void cargoDeliveryWasUpdated(Cargo cargo) {
-    logger.debug("EVENT: cargo delivery was updated");
-  }
-
-  @Override
-  public void cargoWasMisdirected(Cargo cargo) {
-    logger.debug("EVENT: cargo was misdirected");
-  }
-
-  @Override
-  public void cargoHasArrived(Cargo cargo) {
-    logger.debug("EVENT: cargo has arrived: " + cargo.trackingId().stringValue());
-  }
-
-}