Introduced infrastructure.messagning.jms package and moved all consumers and the implementation of SystemEvents there.

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

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.messaging;
+package se.citerus.dddsample.application;
 
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;

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

@@ -1,8 +1,5 @@
 package se.citerus.dddsample.application;
 
-import se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttempt;
-
-
 /**
  * Handling event service.
  */

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

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.application;
 
-import se.citerus.dddsample.application.messaging.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;

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

@@ -1,9 +1,9 @@
 package se.citerus.dddsample.application.impl;
 
 import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.application.HandlingEventService;
 import se.citerus.dddsample.application.SystemEvents;
-import se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;

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

@@ -1,75 +0,0 @@
-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.Cargo;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.service.DomainEventNotifier;
-
-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 cargoHandledTopic;
-  private Destination misdirectedCargoTopic;
-  private Destination deliveredCargoTopic;
-
-  @Override
-  public void cargoWasHandled(final HandlingEvent event) {
-    final Cargo cargo = event.cargo();
-    jmsOperations.send(cargoHandledTopic, new MessageCreator() {
-      public Message createMessage(final Session session) throws JMSException {
-        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());
-      }
-    });
-  }
-
-  @Override
-  public void rejectHandlingEventRegistrationAttempt(CannotCreateHandlingEventException e) {
-    // TODO send to dedicated queue
-    System.err.println("Rejected handling event registration attempt: " + e);
-  }
-
-  public void setJmsOperations(final JmsOperations jmsOperations) {
-    this.jmsOperations = jmsOperations;
-  }
-
-  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/ws/HandlingEventServiceEndpointImpl.java

@@ -5,7 +5,7 @@ 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.messaging.HandlingEventRegistrationAttempt;
+import se.citerus.dddsample.application.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;

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

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.messaging;
+package se.citerus.dddsample.infrastructure.messaging.jms;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

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

@@ -1,7 +1,8 @@
-package se.citerus.dddsample.application.messaging;
+package se.citerus.dddsample.infrastructure.messaging.jms;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.application.HandlingEventService;
 
 import javax.jms.Message;

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

@@ -1,7 +1,8 @@
-package se.citerus.dddsample.application.messaging;
+package se.citerus.dddsample.infrastructure.messaging.jms;
 
 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.Cargo;
 import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;

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

@@ -31,7 +31,7 @@
     <property name="connectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
-  <bean id="systemEvents" class="se.citerus.dddsample.application.messaging.JmsSystemEventsImpl">
+  <bean id="systemEvents" class="se.citerus.dddsample.infrastructure.messaging.jms.JmsSystemEventsImpl">
     <property name="jmsOperations" ref="jmsOperations"/>
     <property name="cargoHandledTopic" ref="cargoHandledTopic"/>
     <property name="misdirectedCargoTopic" ref="misdirectedCargoTopic"/>
@@ -39,11 +39,11 @@
     <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
   </bean>
 
-  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.application.messaging.CargoHandledConsumer">
+  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
     <property name="trackingService" ref="trackingService"/>
   </bean>
 
-  <bean id="handlingEventRegistrationAttemptConsumer" class="se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttemptConsumer">
+  <bean id="handlingEventRegistrationAttemptConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.HandlingEventRegistrationAttemptConsumer">
     <property name="handlingEventService" ref="handlingEventService"/>
   </bean>
   

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

@@ -3,7 +3,6 @@ package se.citerus.dddsample.application;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
-import se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;

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

@@ -1,12 +1,12 @@
 package se.citerus.dddsample.scenario;
 
 import junit.framework.TestCase;
+import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.application.HandlingEventService;
 import se.citerus.dddsample.application.SystemEvents;
 import se.citerus.dddsample.application.TrackingService;
 import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
 import se.citerus.dddsample.application.impl.TrackingServiceImpl;
-import se.citerus.dddsample.application.messaging.HandlingEventRegistrationAttempt;
 import se.citerus.dddsample.domain.model.cargo.*;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
 import se.citerus.dddsample.domain.model.carrier.Voyage;