Web service now uses SystemEvents interface to place incoming registration attempts on queue. JMS is now isolated to the infrastructure.messagning.jms package.

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

@@ -26,6 +26,6 @@ public interface SystemEvents {
 
   void rejectHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException problem);
 
-  //void scheduleWasChanged(Voyage voyage);
+  void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt);
 
 }

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

@@ -3,18 +3,13 @@ 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.jms.core.JmsOperations;
-import org.springframework.jms.core.MessageCreator;
 import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
+import se.citerus.dddsample.application.SystemEvents;
 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 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;
@@ -32,8 +27,7 @@ import java.util.List;
 @WebService(endpointInterface = "se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint")
 public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
 
-  private JmsOperations jmsOperations;
-  private Queue handlingEventQueue;
+  private SystemEvents systemEvents;
   private static final Log logger = LogFactory.getLog(HandlingEventServiceEndpointImpl.class);
   
   public static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
@@ -49,25 +43,14 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
     final UnLocode ul = parseUnLocode(unlocode, errors);
 
     if (errors.isEmpty()) {
-      sendRegistrationAttemptMessage(date, tid, voyageNumber, type, ul);
+      final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(new Date(), date, tid, voyageNumber, type, ul);
+      systemEvents.receivedHandlingEventRegistrationAttempt(attempt);
     } else {
-      logger.info("Handling event registration attempt failed: " + errors);
+      logger.warn("Handling event registration attempt failed: " + errors);
       throw new RegistrationFailure(errors);
     }
   }
 
-  private void sendRegistrationAttemptMessage(final Date completionDate, 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(new Date(), completionDate, tid, voyageNumber, type, ul);
-        return session.createObjectMessage(attempt);
-      }
-    });
-    if (logger.isDebugEnabled()) {
-      logger.debug("Incoming handling event registration attempt added to queue");
-    }
-  }
-
   private UnLocode parseUnLocode(final String unlocode, final List<String> errors) {
     try {
       return new UnLocode(unlocode);
@@ -119,11 +102,7 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
     }
   }
 
-  public void setJmsOperations(final JmsOperations jmsOperations) {
-    this.jmsOperations = jmsOperations;
-  }
-
-  public void setHandlingEventQueue(final Queue handlingEventQueue) {
-    this.handlingEventQueue = handlingEventQueue;
+  public void setSystemEvents(SystemEvents systemEvents) {
+    this.systemEvents = systemEvents;
   }
 }

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

@@ -23,6 +23,7 @@ public final class JmsSystemEventsImpl implements SystemEvents {
   private Destination misdirectedCargoTopic;
   private Destination deliveredCargoTopic;
   private Destination rejectedRegistrationAttemptsQueue;
+  private Destination handlingEventQueue;
 
   @Override
   public void cargoWasHandled(final HandlingEvent event) {
@@ -62,6 +63,15 @@ public final class JmsSystemEventsImpl implements SystemEvents {
     });
   }
 
+  @Override
+  public void receivedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt) {
+    jmsOperations.send(handlingEventQueue, new MessageCreator() {
+      public Message createMessage(Session session) throws JMSException {
+        return session.createObjectMessage(attempt);
+      }
+    });
+  }
+
   public void setJmsOperations(final JmsOperations jmsOperations) {
     this.jmsOperations = jmsOperations;
   }
@@ -81,4 +91,8 @@ public final class JmsSystemEventsImpl implements SystemEvents {
   public void setRejectedRegistrationAttemptsQueue(Destination rejectedRegistrationAttemptsQueue) {
     this.rejectedRegistrationAttemptsQueue = rejectedRegistrationAttemptsQueue;
   }
+
+  public void setHandlingEventQueue(Destination handlingEventQueue) {
+    this.handlingEventQueue = handlingEventQueue;
+  }
 }

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

@@ -37,6 +37,7 @@
     <property name="misdirectedCargoTopic" ref="misdirectedCargoTopic"/>
     <property name="deliveredCargoTopic" ref="deliveredCargoTopic"/>
     <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
+    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
   </bean>
 
   <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">

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

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

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

@@ -2,10 +2,9 @@ package se.citerus.dddsample.application.ws;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import org.springframework.jms.core.JmsOperations;
-import org.springframework.jms.core.MessageCreator;
+import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
+import se.citerus.dddsample.application.SystemEvents;
 
-import javax.jms.Queue;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -14,29 +13,25 @@ public class HandlinEventServiceEndpointTest extends TestCase {
   private HandlingEventServiceEndpointImpl endpoint;
   private SimpleDateFormat sdf = new SimpleDateFormat(HandlingEventServiceEndpointImpl.ISO_8601_FORMAT);
   private Date date = new Date(100);
-  private JmsOperations jmsOperations;
-  private Queue queue;
+  private SystemEvents systemEvents;
 
   protected void setUp() throws Exception {
     endpoint = new HandlingEventServiceEndpointImpl();
 
-    jmsOperations = createMock(JmsOperations.class);
-    queue = createMock(Queue.class);
-
-    endpoint.setJmsOperations(jmsOperations);
-    endpoint.setHandlingEventQueue(queue);
+    systemEvents = createMock(SystemEvents.class);
+    endpoint.setSystemEvents(systemEvents);
   }
 
   public void testRegisterValidEvent() throws Exception {
-    jmsOperations.send(eq(queue), isA(MessageCreator.class));
-    replay(jmsOperations, queue);
+    systemEvents.receivedHandlingEventRegistrationAttempt(isA(HandlingEventRegistrationAttempt.class));
+    replay(systemEvents);
 
     // Tested call
     endpoint.register(sdf.format(date), "FOO", "CAR_456", "CNHKG", "LOAD");
   }
 
   public void testRegisterInalidEvent() throws Exception {
-    replay(jmsOperations, queue);
+    replay(systemEvents);
 
     // Tested call
     try {
@@ -48,6 +43,6 @@ public class HandlinEventServiceEndpointTest extends TestCase {
   }
 
   protected void tearDown() throws Exception {
-    verify(jmsOperations, queue);
+    verify(systemEvents);
   }
 }

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

@@ -151,6 +151,8 @@ public class CargoHandlingScenarioTest extends TestCase {
       public void cargoHasArrived(Cargo cargo) {}
       @Override
       public void rejectHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException problem) {}
+      @Override
+      public void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt) {}
     };
 
     // Stub