Removed from and to timestamps from routing service api, they are derived from the voyage instead.

dddsample/external/pathfinder-api/src/main/java/com/pathfinder/api/TransitEdge.java

@@ -1,7 +1,6 @@
 package com.pathfinder.api;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * Represents an edge in a path through a graph,
@@ -12,28 +11,20 @@ public final class TransitEdge implements Serializable {
   private final String voyageNumber;
   private final String fromUnLocode;
   private final String toUnLocode;
-  private final Date fromDate;
-  private final Date toDate;
 
   /**
    * Constructor.
    *
-   * @param voyageNumber
-   * @param fromUnLocode
-   * @param toUnLocode
-   * @param fromDate
-   * @param toDate
+   * @param voyageNumber    voyage number
+   * @param fromUnLocode    UN Locode of start location
+   * @param toUnLocode      UN Locode of end location    
    */
   public TransitEdge(final String voyageNumber,
                      final String fromUnLocode,
-                     final String toUnLocode,
-                     final Date fromDate,
-                     final Date toDate) {
+                     final String toUnLocode) {
     this.voyageNumber = voyageNumber;
     this.fromUnLocode = fromUnLocode;
     this.toUnLocode = toUnLocode;
-    this.fromDate = fromDate;
-    this.toDate = toDate;
   }
 
   public String getVoyageNumber() {
@@ -48,11 +39,4 @@ public final class TransitEdge implements Serializable {
     return toUnLocode;
   }
 
-  public Date getFromDate() {
-    return fromDate;
-  }
-
-  public Date getToDate() {
-    return toDate;
-  }
 }

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

@@ -41,7 +41,7 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
 
       transitEdges.add(new TransitEdge(
         dao.getVoyageNumber(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo, fromDate, toDate));
+        originUnLocode, firstLegTo));
 
       for (int j = 0; j < allVertices.size() - 1; j++) {
         final String curr = allVertices.get(j);
@@ -49,7 +49,7 @@ 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.getVoyageNumber(curr, next), curr, next));
       }
 
       final String lastLegFrom = allVertices.get(allVertices.size() - 1);
@@ -57,7 +57,7 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
       toDate = nextDate(fromDate);
       transitEdges.add(new TransitEdge(
         dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode, fromDate, toDate));
+        lastLegFrom, destinationUnLocode));
 
       candidates.add(new TransitPath(transitEdges));
     }

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

@@ -5,8 +5,8 @@ import com.pathfinder.api.TransitEdge;
 import com.pathfinder.api.TransitPath;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
@@ -94,11 +94,10 @@ public class ExternalRoutingService implements RoutingService {
   }
 
   private Leg toLeg(final TransitEdge edge) {
-    return new Leg(
+    return Leg.deriveLeg(
       voyageRepository.find(new VoyageNumber(edge.getVoyageNumber())),
       locationRepository.find(new UnLocode(edge.getFromUnLocode())),
-      locationRepository.find(new UnLocode(edge.getToUnLocode())),
-      edge.getFromDate(), edge.getToDate()
+      locationRepository.find(new UnLocode(edge.getToUnLocode()))
     );
   }