Altered application events and emssaging infrastructure to reflect that handling event registration is now synchronous.

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.application;
 
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
 
 /**
  * This interface provides a way to let other parts
@@ -21,6 +20,14 @@ public interface ApplicationEvents {
   void cargoWasHandled(HandlingEvent event);
 
   /**
+   * 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
@@ -34,11 +41,4 @@ public interface ApplicationEvents {
    */
   void cargoHasArrived(Cargo cargo);
 
-  /**
-   * A handling event regitration attempt is received.
-   *
-   * @param attempt handling event registration attempt
-   */
-  void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt);
-
 }

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

@@ -51,6 +51,9 @@ public class CargoInspectionServiceImpl implements CargoInspectionService {
     }
 
     cargoRepository.store(cargo);
+
+    // TODO replace the inspections above with subscribers to this event
+    //applicationEvents.cargoDeliveryWasUpdated(cargo);
   }
 
 }

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.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -23,8 +22,7 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
   private Destination cargoHandledQueue;
   private Destination misdirectedCargoQueue;
   private Destination deliveredCargoQueue;
-  private Destination rejectedRegistrationAttemptsQueue;
-  private Destination handlingEventQueue;
+  private Destination cargoDeliveryUpdateQueue;
 
   private static final Log logger = LogFactory.getLog(JmsApplicationEventsImpl.class);
 
@@ -34,37 +32,37 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
     logger.info("Cargo was handled " + cargo);
     jmsOperations.send(cargoHandledQueue, new MessageCreator() {
       public Message createMessage(final Session session) throws JMSException {
-        return session.createTextMessage(cargo.trackingId().idString());
+        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 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().idString());
+        return session.createTextMessage(cargo.trackingId().stringValue());
       }
     });
   }
 
   @Override
-  public void cargoHasArrived(final Cargo cargo) {
-    logger.info("Cargo has arrived " + cargo);
-    jmsOperations.send(deliveredCargoQueue, new MessageCreator() {
+  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().idString());
+        return session.createTextMessage(cargo.trackingId().stringValue());
       }
     });
   }
 
   @Override
-  public void receivedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt) {
-    logger.info("Received handling event registration attempt " + attempt);
-    jmsOperations.send(handlingEventQueue, new MessageCreator() {
+  public void cargoHasArrived(final Cargo cargo) {
+    logger.info("Cargo has arrived " + cargo);
+    jmsOperations.send(deliveredCargoQueue, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
-        return session.createObjectMessage(attempt);
+        return session.createTextMessage(cargo.trackingId().stringValue());
       }
     });
   }
@@ -85,11 +83,7 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
     this.deliveredCargoQueue = destination;
   }
 
-  public void setRejectedRegistrationAttemptsQueue(Destination destination) {
-    this.rejectedRegistrationAttemptsQueue = destination;
-  }
-
-  public void setHandlingEventQueue(Destination destination) {
-    this.handlingEventQueue = destination;
+  public void setCargoDeliveryUpdateQueue(Destination cargoDeliveryUpdateQueue) {
+    this.cargoDeliveryUpdateQueue = cargoDeliveryUpdateQueue;
   }
 }

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

@@ -16,12 +16,10 @@
   <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="handlingEventRegistrationAttemptQueue" name="HandlingEventRegistrationAttemptQueue" physicalName="HandlingEventRegistrationAttemptQueue"/>
-  <amq:queue id="rejectedRegistrationAttemptsQueue" name="RejectedRegistrationAttemptsQueue" physicalName="RejectedRegistrationAttemptsQueue"/>
+  <amq:queue id="cargoDeliveryUpdateQueue" name="CargoDeliveryUpdateQueue" physicalName="CargoDeliveryUpdateQueue"/>
 
   <jms:listener-container connection-factory="jmsConnectionFactory">
     <jms:listener destination="CargoHandledQueue" ref="cargoHandledConsumer" />
-    <jms:listener destination="HandlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
     <jms:listener destination="MisdirectedCargoQueue" ref="simpleLoggingConsumer"/>
     <jms:listener destination="DeliveredCargoQueue" ref="simpleLoggingConsumer"/>
     <jms:listener destination="RejectedRegistrationAttemptsQueue" ref="simpleLoggingConsumer"/>
@@ -36,18 +34,13 @@
     <property name="cargoHandledQueue" ref="cargoHandledQueue"/>
     <property name="misdirectedCargoQueue" ref="misdirectedCargoQueue"/>
     <property name="deliveredCargoQueue" ref="deliveredCargoQueue"/>
-    <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
-    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
+    <property name="cargoDeliveryUpdateQueue" ref="cargoDeliveryUpdateQueue"/>
   </bean>
 
   <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
     <property name="cargoInspectionService" ref="cargoInspectionService"/>
   </bean>
 
-  <bean id="handlingEventRegistrationAttemptConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.HandlingEventRegistrationAttemptConsumer">
-    <property name="handlingEventService" ref="handlingEventService"/>
-  </bean>
-
   <bean id="simpleLoggingConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.SimpleLoggingConsumer"/>
 
 </beans>

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

@@ -6,7 +6,6 @@ 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;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
 
 public class SynchronousApplicationEventsStub implements ApplicationEvents {
 
@@ -24,17 +23,18 @@ public class SynchronousApplicationEventsStub implements ApplicationEvents {
   }
 
   @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().idString());
+    logger.debug("EVENT: cargo has arrived: " + cargo.trackingId().stringValue());
   }
 
-  @Override
-  public void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt) {
-    logger.debug("EVENT: received handling event registration attempt");
-  }
 }