Merge 31c2ee6660f6ea9e683e7d6be9559054136870ab into ecca53f8d466159975602d0d7961c90223e2efd5

src/main/java/com/pathfinder/api/GraphTraversalService.java

@@ -13,14 +13,14 @@ import java.util.Properties;
 public interface GraphTraversalService extends Remote {
 
   /**
-   * @param originUnLocode origin UN Locode
-   * @param destinationUnLocode destination UN Locode
+   * @param origin origin point
+   * @param destination destination point
    * @param limitations restrictions on the path selection, as key-value according to some API specification
    * @return A list of transit paths
    * @throws RemoteException RMI problem
    */
-  List<TransitPath> findShortestPath(String originUnLocode,
-                                     String destinationUnLocode,
+  List<TransitPath> findShortestPath(String origin,
+                                     String destination,
                                      Properties limitations) throws RemoteException;
 
 }

src/main/java/com/pathfinder/api/TransitEdge.java

@@ -10,43 +10,43 @@ import java.util.Date;
  */
 public final class TransitEdge implements Serializable {
 
-  private final String voyageNumber;
-  private final String fromUnLocode;
-  private final String toUnLocode;
+  private final String edge;
+  private final String fromNode;
+  private final String toNode;
   private final Date fromDate;
   private final Date toDate;
 
   /**
    * Constructor.
    *
-   * @param voyageNumber
-   * @param fromUnLocode
-   * @param toUnLocode
+   * @param edge
+   * @param fromNode
+   * @param toNode
    * @param fromDate
    * @param toDate
    */
-  public TransitEdge(final String voyageNumber,
-                     final String fromUnLocode,
-                     final String toUnLocode,
+  public TransitEdge(final String edge,
+                     final String fromNode,
+                     final String toNode,
                      final Date fromDate,
                      final Date toDate) {
-    this.voyageNumber = voyageNumber;
-    this.fromUnLocode = fromUnLocode;
-    this.toUnLocode = toUnLocode;
+    this.edge = edge;
+    this.fromNode = fromNode;
+    this.toNode = toNode;
     this.fromDate = fromDate;
     this.toDate = toDate;
   }
 
-  public String getVoyageNumber() {
-    return voyageNumber;
+  public String getEdge() {
+    return edge;
   }
 
-  public String getFromUnLocode() {
-    return fromUnLocode;
+  public String getFromNode() {
+    return fromNode;
   }
 
-  public String getToUnLocode() {
-    return toUnLocode;
+  public String getToNode() {
+    return toNode;
   }
 
   public Date getFromDate() {

src/main/java/com/pathfinder/internal/GraphDAO.java

@@ -1,27 +1,8 @@
 package com.pathfinder.internal;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 
-public class GraphDAO {
-
-  private static final Random random = new Random();
-
-  public List<String> listLocations() {
-    return new ArrayList<String>(Arrays.asList(
-      "CNHKG", "AUMEL", "SESTO", "FIHEL", "USCHI", "JNTKO", "DEHAM", "CNSHA", "NLRTM", "SEGOT", "CNHGH", "USNYC", "USDAL"
-    ));
-  }
-
-  public String getVoyageNumber(String from, String to) {
-    final int i = random.nextInt(5);
-    if (i == 0) return "0100S";
-    if (i == 1) return "0200T";
-    if (i == 2) return "0300A";
-    if (i == 3) return "0301S";
-    return "0400S";
-  }
-  
+public interface GraphDAO {
+	List<String> listAllNodes();
+	String getTransitEdge(String from, String to);
 }

src/main/java/com/pathfinder/internal/GraphDAOStub.java

@@ -0,0 +1,27 @@
+package com.pathfinder.internal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+public class GraphDAOStub implements GraphDAO{
+
+  private static final Random random = new Random();
+
+  public List<String> listAllNodes() {
+    return new ArrayList<String>(Arrays.asList(
+      "CNHKG", "AUMEL", "SESTO", "FIHEL", "USCHI", "JNTKO", "DEHAM", "CNSHA", "NLRTM", "SEGOT", "CNHGH", "USNYC", "USDAL"
+    ));
+  }
+
+  public String getTransitEdge(String from, String to) {
+    final int i = random.nextInt(5);
+    if (i == 0) return "0100S";
+    if (i == 1) return "0200T";
+    if (i == 2) return "0300A";
+    if (i == 3) return "0301S";
+    return "0400S";
+  }
+  
+}

src/main/java/com/pathfinder/internal/GraphTraversalServiceImpl.java

@@ -18,20 +18,20 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
     this.random = new Random();
   }
 
-  public List<TransitPath> findShortestPath(final String originUnLocode,
-                                            final String destinationUnLocode,
+  public List<TransitPath> findShortestPath(final String originNode,
+                                            final String destinationNode,
                                             final Properties limitations) {
     Date date = nextDate(new Date());
 
-    List<String> allVertices = dao.listLocations();
-    allVertices.remove(originUnLocode);
-    allVertices.remove(destinationUnLocode);
+    List<String> allVertices = dao.listAllNodes();
+    allVertices.remove(originNode);
+    allVertices.remove(destinationNode);
 
     final int candidateCount = getRandomNumberOfCandidates();
     final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
 
     for (int i = 0; i < candidateCount; i++) {
-      allVertices = getRandomChunkOfLocations(allVertices);
+      allVertices = getRandomChunkOfNodes(allVertices);
       final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
       final String firstLegTo = allVertices.get(0);
 
@@ -40,8 +40,8 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
       date = nextDate(toDate);
 
       transitEdges.add(new TransitEdge(
-        dao.getVoyageNumber(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo, fromDate, toDate));
+        dao.getTransitEdge(originNode, firstLegTo),
+        originNode, firstLegTo, fromDate, toDate));
 
       for (int j = 0; j < allVertices.size() - 1; j++) {
         final String curr = allVertices.get(j);
@@ -49,15 +49,15 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
         fromDate = nextDate(date);
         toDate = nextDate(fromDate);
         date = nextDate(toDate);
-        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next, fromDate, toDate));
+        transitEdges.add(new TransitEdge(dao.getTransitEdge(curr, next), curr, next, fromDate, toDate));
       }
 
       final String lastLegFrom = allVertices.get(allVertices.size() - 1);
       fromDate = nextDate(date);
       toDate = nextDate(fromDate);
       transitEdges.add(new TransitEdge(
-        dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode, fromDate, toDate));
+        dao.getTransitEdge(lastLegFrom, destinationNode),
+        lastLegFrom, destinationNode, fromDate, toDate));
 
       candidates.add(new TransitPath(transitEdges));
     }
@@ -73,11 +73,11 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
     return 3 + random.nextInt(3);
   }
 
-  private List<String> getRandomChunkOfLocations(List<String> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
+  private List<String> getRandomChunkOfNodes(List<String> allNodes) {
+    Collections.shuffle(allNodes);
+    final int total = allNodes.size();
     final int chunk = total > 4 ? 1 + new Random().nextInt(5) : total;
-    return allLocations.subList(0, chunk);
+    return allNodes.subList(0, chunk);
   }
 
 }

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

@@ -84,9 +84,9 @@ public class ExternalRoutingService implements RoutingService {
 
   private Leg toLeg(TransitEdge edge) {
     return new Leg(
-      voyageRepository.find(new VoyageNumber(edge.getVoyageNumber())),
-      locationRepository.find(new UnLocode(edge.getFromUnLocode())),
-      locationRepository.find(new UnLocode(edge.getToUnLocode())),
+      voyageRepository.find(new VoyageNumber(edge.getEdge())),
+      locationRepository.find(new UnLocode(edge.getFromNode())),
+      locationRepository.find(new UnLocode(edge.getToNode())),
       edge.getFromDate(), edge.getToDate()
     );
   }

src/main/resources/com/pathfinder/internal/applicationContext.xml

@@ -8,7 +8,7 @@
     <constructor-arg ref="graphDAO"/>
   </bean>
 
-  <bean id="graphDAO" class="com.pathfinder.internal.GraphDAO"/>
+  <bean id="graphDAO" class="com.pathfinder.internal.GraphDAOStub"/>
 
   <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
     <property name="port" value="1199"/>
@@ -21,4 +21,4 @@
     <property name="registry" ref="registry"/>
   </bean>
 
-</beans>
+</beans>

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

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.infrastructure.routing;
 
 import com.pathfinder.api.GraphTraversalService;
-import com.pathfinder.internal.GraphDAO;
+import com.pathfinder.internal.GraphDAOStub;
 import com.pathfinder.internal.GraphTraversalServiceImpl;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
@@ -31,8 +31,8 @@ public class ExternalRoutingServiceTest extends TestCase {
     voyageRepository = createMock(VoyageRepository.class);
     externalRoutingService.setVoyageRepository(voyageRepository);
 
-    GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO() {
-      public List<String> listLocations() {
+    GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAOStub() {
+      public List<String> listAllNodes() {
         return Arrays.asList(TOKYO.unLocode().idString(), STOCKHOLM.unLocode().idString(), GOTHENBURG.unLocode().idString());
       }