Minor cleanups, moving towards ctor-DI everywhere in core.

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/CargoRoutingDTO.java

@@ -60,10 +60,6 @@ public final class CargoRoutingDTO implements Serializable {
     return misrouted;
   }
 
-  public boolean isRouted() {
-    return !legs.isEmpty();
-  }
-
   public Date getArrivalDeadline() {
     return arrivalDeadline;
   }

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

@@ -16,9 +16,15 @@ import javax.jms.Session;
  */
 public final class JmsSystemEventsImpl implements SystemEvents {
 
-  private JmsOperations jmsOperations;
-  private Destination cargoHandledDestination;
-  private Destination cargoUpdateDestination;
+  private final JmsOperations jmsOperations;
+  private final Destination cargoHandledDestination;
+  private final Destination cargoUpdateDestination;
+
+  public JmsSystemEventsImpl(final JmsOperations jmsOperations, final Destination cargoHandledDestination, final Destination cargoUpdateDestination) {
+    this.jmsOperations = jmsOperations;
+    this.cargoHandledDestination = cargoHandledDestination;
+    this.cargoUpdateDestination = cargoUpdateDestination;
+  }
 
   @Override
   public void notifyOfHandlingEvent(final HandlingEvent event) {
@@ -33,22 +39,10 @@ public final class JmsSystemEventsImpl implements SystemEvents {
   @Override
   public void notifyOfCargoUpdate(final Cargo cargo) {
     jmsOperations.send(cargoUpdateDestination, new MessageCreator() {
-      public Message createMessage(Session session) throws JMSException {
+      public Message createMessage(final Session session) throws JMSException {
         return session.createObjectMessage(cargo.trackingId());
       }
     });
   }
 
-  public void setJmsOperations(JmsOperations jmsOperations) {
-    this.jmsOperations = jmsOperations;
-  }
-
-  public void setCargoHandledDestination(Destination cargoHandledDestination) {
-    this.cargoHandledDestination = cargoHandledDestination;
-  }
-
-  public void setCargoUpdateDestination(Destination cargoUpdateDestination) {
-    this.cargoUpdateDestination = cargoUpdateDestination;
-  }
-
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/DatabaseTrackingIdGenerator.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdGenerator.java

@@ -4,7 +4,7 @@
  * @created 2009-sep-17
  * $Id$
  */
-package se.citerus.dddsample.tracking.core.infrastructure.persistence;
+package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
 
 import org.hibernate.SessionFactory;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/TrackingIdGeneratorInMem.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/inmemory/TrackingIdGeneratorInMem.java

@@ -4,7 +4,7 @@
  * @created 2009-sep-07
  * $Id$
  */
-package se.citerus.dddsample.tracking.core.infrastructure.persistence;
+package se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdGenerator;

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/routing/ExternalRoutingService.java

@@ -28,12 +28,20 @@ import java.util.Properties;
  */
 public class ExternalRoutingService implements RoutingService {
 
-  private GraphTraversalService graphTraversalService;
-  private LocationRepository locationRepository;
-  private VoyageRepository voyageRepository;
+  private final GraphTraversalService graphTraversalService;
+  private final LocationRepository locationRepository;
+  private final VoyageRepository voyageRepository;
   private static final Log log = LogFactory.getLog(ExternalRoutingService.class);
 
-  public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
+  public ExternalRoutingService(final GraphTraversalService graphTraversalService,
+                                final LocationRepository locationRepository,
+                                final VoyageRepository voyageRepository) {
+    this.graphTraversalService = graphTraversalService;
+    this.locationRepository = locationRepository;
+    this.voyageRepository = voyageRepository;
+  }
+
+  public List<Itinerary> fetchRoutesForSpecification(final RouteSpecification routeSpecification) {
     /*
       The RouteSpecification is picked apart and adapted to the external API.
      */
@@ -81,7 +89,7 @@ public class ExternalRoutingService implements RoutingService {
     return new Itinerary(legs);
   }
 
-  private Leg toLeg(TransitEdge edge) {
+  private Leg toLeg(final TransitEdge edge) {
     return new Leg(
       voyageRepository.find(new VoyageNumber(edge.getVoyageNumber())),
       locationRepository.find(new UnLocode(edge.getFromUnLocode())),
@@ -90,16 +98,4 @@ public class ExternalRoutingService implements RoutingService {
     );
   }
 
-  public void setGraphTraversalService(GraphTraversalService graphTraversalService) {
-    this.graphTraversalService = graphTraversalService;
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setVoyageRepository(VoyageRepository voyageRepository) {
-    this.voyageRepository = voyageRepository;
-  }
-
 }

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

@@ -27,9 +27,9 @@
   </bean>
 
   <bean id="applicationEvents" class="se.citerus.dddsample.tracking.core.infrastructure.messaging.jms.JmsSystemEventsImpl">
-    <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="cargoHandledDestination" ref="cargoHandledQueue"/>
-    <property name="cargoUpdateDestination" ref="cargoUpdateTopic"/>
+    <constructor-arg ref="jmsOperations"/>
+    <constructor-arg ref="cargoHandledQueue"/>
+    <constructor-arg ref="cargoUpdateTopic"/>
   </bean>
 
   <bean id="listener1" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">

dddsample/tracking/core/src/main/resources/context-infrastructure-persistence.xml

@@ -52,6 +52,6 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="trackingIdGenerator" class="se.citerus.dddsample.tracking.core.infrastructure.persistence.TrackingIdGeneratorInMem"/>
+  <bean id="trackingIdGenerator" class="se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem"/>
   
 </beans>

dddsample/tracking/core/src/main/resources/context-infrastructure.xml

@@ -10,9 +10,9 @@
   <!-- External graph traversal routing service  -->
 
   <bean id="routingService" class="se.citerus.dddsample.tracking.core.infrastructure.routing.ExternalRoutingService">
-    <property name="graphTraversalService" ref="internalGraphTraversalService"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="voyageRepository" ref="voyageRepository"/>
+    <constructor-arg ref="graphTraversalService"/>
+    <constructor-arg ref="locationRepository"/>
+    <constructor-arg ref="voyageRepository"/>
   </bean>
 
   <bean id="graphTraversalService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/CargoFactoryTest.java

@@ -12,7 +12,7 @@ import org.junit.Test;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.ROTTERDAM;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 
 public class CargoFactoryTest {

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/TrackingIdGeneratorTest.java

@@ -4,7 +4,7 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdGenerator;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
 
 public class TrackingIdGeneratorTest extends TestCase {
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/routing/ExternalRoutingServiceTest.java

@@ -26,12 +26,8 @@ public class ExternalRoutingServiceTest extends TestCase {
   private VoyageRepository voyageRepository;
 
   protected void setUp() throws Exception {
-    externalRoutingService = new ExternalRoutingService();
     LocationRepository locationRepository = new LocationRepositoryInMem();
-    externalRoutingService.setLocationRepository(locationRepository);
-
     voyageRepository = createMock(VoyageRepository.class);
-    externalRoutingService.setVoyageRepository(voyageRepository);
 
     GraphTraversalService graphTraversalService = EasyMock.createMock(GraphTraversalService.class);
     expect(
@@ -40,7 +36,8 @@ public class ExternalRoutingServiceTest extends TestCase {
     
     EasyMock.replay(graphTraversalService);
     // TODO expectations on GTS
-    externalRoutingService.setGraphTraversalService(graphTraversalService);
+    externalRoutingService = new ExternalRoutingService(graphTraversalService, locationRepository, voyageRepository);
+
       /*new GraphTraversalServiceImpl(new GraphDAO() {
       public List<String> listLocations() {
         return Arrays.asList(TOKYO.unLocode().stringValue(), STOCKHOLM.unLocode().stringValue(), GOTHENBURG.unLocode().stringValue());

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/scenario/CargoLifecycleScenarioTest.java

@@ -23,7 +23,7 @@ import static se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage.NONE
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 import se.citerus.dddsample.tracking.core.domain.service.RoutingService;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.CargoRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/scenario/VoyageRescheduledScenarioTest.java

@@ -21,7 +21,7 @@ import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLoc
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.TrackingIdGeneratorInMem;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 
 import java.util.Date;