Moved ExternalRoutingService into impl subpackage and renamed it RoutingServiceImpl, for consistency. We probably should try to find use-case based package names below application though.

dddsample/src/main/java/se/citerus/dddsample/application/routing/ExternalRoutingService.java → dddsample/src/main/java/se/citerus/dddsample/application/impl/RoutingServiceImpl.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.routing;
+package se.citerus.dddsample.application.impl;
 
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.application.RoutingService;
@@ -24,7 +24,7 @@ import java.util.List;
  * by the routing team, which operates in a different context from us.
  *
  */
-public class ExternalRoutingService implements RoutingService {
+public class RoutingServiceImpl implements RoutingService {
 
   private GraphTraversalService graphTraversalService;
   private LocationRepository locationRepository;

dddsample/src/main/java/se/citerus/dddsample/domain/service/RoutingService.java

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
-
-import java.util.List;
-
-/**
- * Routing service.
- *
- */
-public interface RoutingService {
-
-  /**
-   * @param routeSpecification route specification
-   * @return A list of itineraries that satisfy the specification. May be an empty list if no route is found.
-   */
-  List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification);
-
-}

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

@@ -32,7 +32,7 @@
 
   <tx:annotation-driven transaction-manager="transactionManager"/>
 
-  <bean id="routingService" class="se.citerus.dddsample.application.routing.ExternalRoutingService">
+  <bean id="routingService" class="se.citerus.dddsample.application.impl.RoutingServiceImpl">
     <property name="locationRepository" ref="locationRepository"/>
     <property name="voyageRepository" ref="voyageRepository"/>
     <property name="graphTraversalService" ref="graphTraversalService"/>

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

@@ -2,7 +2,7 @@ package se.citerus.dddsample.application;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.routing.ExternalRoutingService;
+import se.citerus.dddsample.application.impl.RoutingServiceImpl;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
@@ -22,16 +22,16 @@ import java.util.List;
 
 public class RoutingServiceTest extends TestCase {
 
-  private ExternalRoutingService routingService;
+  private RoutingServiceImpl routingServiceImpl;
   private VoyageRepository voyageRepository;
 
   protected void setUp() throws Exception {
-    routingService = new ExternalRoutingService();
+    routingServiceImpl = new RoutingServiceImpl();
     LocationRepository locationRepository = new LocationRepositoryInMem();
-    routingService.setLocationRepository(locationRepository);
+    routingServiceImpl.setLocationRepository(locationRepository);
 
     voyageRepository = createMock(VoyageRepository.class);
-    routingService.setVoyageRepository(voyageRepository);
+    routingServiceImpl.setVoyageRepository(voyageRepository);
 
     GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO(createMock(DataSource.class)) {
       public List<String> listLocations() {
@@ -41,7 +41,7 @@ public class RoutingServiceTest extends TestCase {
       public void storeCarrierMovementId(String cmId, String from, String to) {
       }
     });
-    routingService.setGraphTraversalService(graphTraversalService);
+    routingServiceImpl.setGraphTraversalService(graphTraversalService);
   }
 
   public void testCalculatePossibleRoutes() {
@@ -53,7 +53,7 @@ public class RoutingServiceTest extends TestCase {
     
     replay(voyageRepository);
 
-    List<Itinerary> candidates = routingService.fetchRoutesForSpecification(routeSpecification);
+    List<Itinerary> candidates = routingServiceImpl.fetchRoutesForSpecification(routeSpecification);
     assertNotNull(candidates);
     
     for (Itinerary itinerary : candidates) {

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java → dddsample/src/test/java/se/citerus/dddsample/application/impl/ExternalRoutingServiceTest.java

@@ -1,8 +1,7 @@
-package se.citerus.dddsample.domain.service;
+package se.citerus.dddsample.application.impl;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.routing.ExternalRoutingService;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
@@ -20,18 +19,18 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-public class RoutingServiceTest extends TestCase {
+public class ExternalRoutingServiceTest extends TestCase {
 
-  private ExternalRoutingService routingService;
+  private RoutingServiceImpl routingServiceImpl;
   private VoyageRepository voyageRepository;
 
   protected void setUp() throws Exception {
-    routingService = new ExternalRoutingService();
+    routingServiceImpl = new RoutingServiceImpl();
     LocationRepository locationRepository = new LocationRepositoryInMem();
-    routingService.setLocationRepository(locationRepository);
+    routingServiceImpl.setLocationRepository(locationRepository);
 
     voyageRepository = createMock(VoyageRepository.class);
-    routingService.setVoyageRepository(voyageRepository);
+    routingServiceImpl.setVoyageRepository(voyageRepository);
 
     GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO(createMock(DataSource.class)) {
       public List<String> listLocations() {
@@ -41,7 +40,7 @@ public class RoutingServiceTest extends TestCase {
       public void storeCarrierMovementId(String cmId, String from, String to) {
       }
     });
-    routingService.setGraphTraversalService(graphTraversalService);
+    routingServiceImpl.setGraphTraversalService(graphTraversalService);
   }
 
   public void testCalculatePossibleRoutes() {
@@ -53,7 +52,7 @@ public class RoutingServiceTest extends TestCase {
     
     replay(voyageRepository);
 
-    List<Itinerary> candidates = routingService.fetchRoutesForSpecification(routeSpecification);
+    List<Itinerary> candidates = routingServiceImpl.fetchRoutesForSpecification(routeSpecification);
     assertNotNull(candidates);
     
     for (Itinerary itinerary : candidates) {
@@ -69,7 +68,7 @@ public class RoutingServiceTest extends TestCase {
       assertEquals(cargo.destination(), lastLegStop);
 
       for (int i = 0; i < legs.size() - 1; i++) {
-        // Assert that all legs are conencted
+        // Assert that all legs are connected
         assertEquals(legs.get(i).unloadLocation(), legs.get(i + 1).loadLocation());
       }
     }