Slight restructuring of routingteam subpackage to make external API stand out more.

dddsample/src/main/java/se/citerus/routingteam/GraphTraversalService.java

@@ -1,67 +1,14 @@
 package se.citerus.routingteam;
 
-import java.util.*;
+import java.util.List;
 
-public class GraphTraversalService {
+/**
+ * Part of the external graph traversal API exposed by the routing team
+ * and used by us (booking and tracking team).
+ * 
+ */
+public interface GraphTraversalService {
 
-  private GraphDAO dao;
-  private Random random;
-
-  public GraphTraversalService(GraphDAO dao) {
-    this.dao = dao;
-    this.random = new Random();
-  }
-
-  public List<TransitPath> performHeavyCalculations(String originUnLocode, String destinationUnLocode) {
-    List<String> allVertices = dao.listLocations();
-    allVertices.remove(originUnLocode);
-    allVertices.remove(destinationUnLocode);
-
-    final int candidateCount = getRandomNumberOfCandidates();
-    final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
-
-    for (int i = 0; i < candidateCount; i++) {
-      allVertices = getRandomChunkOfLocations(allVertices);
-      final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
-      final String firstLegTo = allVertices.get(0);
-
-      transitEdges.add(new TransitEdge(
-        getRandomCarrierMovementId(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo));
-
-      for (int j = 0; j < allVertices.size() - 1; j++) {
-        final String curr = allVertices.get(j);
-        final String next = allVertices.get(j + 1);
-        transitEdges.add(new TransitEdge(getRandomCarrierMovementId(curr, next), curr, next));
-      }
-
-      final String lastLegFrom = allVertices.get(allVertices.size() - 1);
-      transitEdges.add(new TransitEdge(
-        getRandomCarrierMovementId(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode));
-
-      candidates.add(new TransitPath(transitEdges));
-    }
-
-    return candidates;
-  }
-
-  private String getRandomCarrierMovementId(String from, String to) {
-    final String random = UUID.randomUUID().toString().toUpperCase();
-    final String cmId =  random.substring(0, 4);
-    dao.storeCarrierMovementId(cmId, from, to);
-    return cmId;
-  }
-
-  private int getRandomNumberOfCandidates() {
-    return 1 + random.nextInt(4);
-  }
-
-  private List<String> getRandomChunkOfLocations(List<String> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
-    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
-    return allLocations.subList(0, chunk);
-  }
+  List<TransitPath> performHeavyCalculations(String originUnLocode, String destinationUnLocode);
 
 }

dddsample/src/main/java/se/citerus/routingteam/internal/GraphDAO.java

@@ -0,0 +1,43 @@
+package se.citerus.routingteam.internal;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GraphDAO {
+
+  private final JdbcTemplate jt;
+
+  public GraphDAO(DataSource dataSource) {
+    jt = new JdbcTemplate(dataSource);
+  }
+
+  public List<String> listLocations() {
+    final List<String> result = new ArrayList();
+
+    jt.query("select unlocode from location", new RowCallbackHandler() {
+      public void processRow(ResultSet resultSet) throws SQLException {
+        result.add(resultSet.getString("unlocode"));
+      }
+    });
+
+    return result;
+  }
+
+  public void storeCarrierMovementId(String cmId, String from, String to) {
+    final String locationSql = "select id from location where unlocode = ?";
+
+    final Long fromId = jt.queryForLong(locationSql, new Object[]{ from });
+    final Long toId = jt.queryForLong(locationSql, new Object[]{ to });
+
+    final Object[] params = {cmId, fromId, toId};
+    jt.update(
+      "insert into CarrierMovement (carrier_movement_id,from_id,to_id) " +
+      "values (?,?,?)", params);
+  }
+}

dddsample/src/main/java/se/citerus/routingteam/internal/GraphTraversalServiceImpl.java

@@ -0,0 +1,71 @@
+package se.citerus.routingteam.internal;
+
+import se.citerus.routingteam.GraphTraversalService;
+import se.citerus.routingteam.TransitEdge;
+import se.citerus.routingteam.TransitPath;
+
+import java.util.*;
+
+public class GraphTraversalServiceImpl implements GraphTraversalService {
+
+  private GraphDAO dao;
+  private Random random;
+
+  public GraphTraversalServiceImpl(GraphDAO dao) {
+    this.dao = dao;
+    this.random = new Random();
+  }
+
+  public List<TransitPath> performHeavyCalculations(String originUnLocode, String destinationUnLocode) {
+    List<String> allVertices = dao.listLocations();
+    allVertices.remove(originUnLocode);
+    allVertices.remove(destinationUnLocode);
+
+    final int candidateCount = getRandomNumberOfCandidates();
+    final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
+
+    for (int i = 0; i < candidateCount; i++) {
+      allVertices = getRandomChunkOfLocations(allVertices);
+      final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
+      final String firstLegTo = allVertices.get(0);
+
+      transitEdges.add(new TransitEdge(
+        getRandomCarrierMovementId(originUnLocode, firstLegTo),
+        originUnLocode, firstLegTo));
+
+      for (int j = 0; j < allVertices.size() - 1; j++) {
+        final String curr = allVertices.get(j);
+        final String next = allVertices.get(j + 1);
+        transitEdges.add(new TransitEdge(getRandomCarrierMovementId(curr, next), curr, next));
+      }
+
+      final String lastLegFrom = allVertices.get(allVertices.size() - 1);
+      transitEdges.add(new TransitEdge(
+        getRandomCarrierMovementId(lastLegFrom, destinationUnLocode),
+        lastLegFrom, destinationUnLocode));
+
+      candidates.add(new TransitPath(transitEdges));
+    }
+
+    return candidates;
+  }
+
+  private String getRandomCarrierMovementId(String from, String to) {
+    final String random = UUID.randomUUID().toString().toUpperCase();
+    final String cmId =  random.substring(0, 4);
+    dao.storeCarrierMovementId(cmId, from, to);
+    return cmId;
+  }
+
+  private int getRandomNumberOfCandidates() {
+    return 1 + random.nextInt(4);
+  }
+
+  private List<String> getRandomChunkOfLocations(List<String> allLocations) {
+    Collections.shuffle(allLocations);
+    final int total = allLocations.size();
+    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
+    return allLocations.subList(0, chunk);
+  }
+
+}

dddsample/src/main/java/se/citerus/routingteam/internal/package.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  Internal parts of the routing team application.
+</p>
+</body>
+</html>

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

@@ -5,11 +5,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <!-- TODO start an RMI server on boot and wire this across the network -->
-  <bean id="graphTraversalService" class="se.citerus.routingteam.GraphTraversalService">
+  <bean id="graphTraversalService" class="se.citerus.routingteam.internal.GraphTraversalServiceImpl">
     <constructor-arg ref="graphDAO"/>
   </bean>
 
-  <bean id="graphDAO" class="se.citerus.routingteam.GraphDAO">
+  <bean id="graphDAO" class="se.citerus.routingteam.internal.GraphDAO">
     <constructor-arg ref="dataSource"/>
   </bean>
 

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java

@@ -11,8 +11,9 @@ import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import se.citerus.routingteam.GraphDAO;
 import se.citerus.routingteam.GraphTraversalService;
+import se.citerus.routingteam.internal.GraphDAO;
+import se.citerus.routingteam.internal.GraphTraversalServiceImpl;
 
 import javax.sql.DataSource;
 import java.util.Arrays;
@@ -32,7 +33,7 @@ public class RoutingServiceTest extends TestCase {
     carrierMovementRepository = createMock(CarrierMovementRepository.class);
     routingService.setCarrierMovementRepository(carrierMovementRepository);
 
-    GraphTraversalService graphTraversalService = new GraphTraversalService(new GraphDAO(createMock(DataSource.class)) {
+    GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO(createMock(DataSource.class)) {
       public List<String> listLocations() {
         return Arrays.asList(TOKYO.unLocode().idString(), STOCKHOLM.unLocode().idString(), GOTHENBURG.unLocode().idString());
       }