Pārlūkot izejas kodu

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

peter_backlund 16 gadus atpakaļ
vecāks
revīzija
7a28ceed3c

+ 4
- 20
dddsample/external/pathfinder-api/src/main/java/com/pathfinder/api/TransitEdge.java Parādīt failu

1
 package com.pathfinder.api;
1
 package com.pathfinder.api;
2
 
2
 
3
 import java.io.Serializable;
3
 import java.io.Serializable;
4
-import java.util.Date;
5
 
4
 
6
 /**
5
 /**
7
  * Represents an edge in a path through a graph,
6
  * Represents an edge in a path through a graph,
12
   private final String voyageNumber;
11
   private final String voyageNumber;
13
   private final String fromUnLocode;
12
   private final String fromUnLocode;
14
   private final String toUnLocode;
13
   private final String toUnLocode;
15
-  private final Date fromDate;
16
-  private final Date toDate;
17
 
14
 
18
   /**
15
   /**
19
    * Constructor.
16
    * Constructor.
20
    *
17
    *
21
-   * @param voyageNumber
22
-   * @param fromUnLocode
23
-   * @param toUnLocode
24
-   * @param fromDate
25
-   * @param toDate
18
+   * @param voyageNumber    voyage number
19
+   * @param fromUnLocode    UN Locode of start location
20
+   * @param toUnLocode      UN Locode of end location    
26
    */
21
    */
27
   public TransitEdge(final String voyageNumber,
22
   public TransitEdge(final String voyageNumber,
28
                      final String fromUnLocode,
23
                      final String fromUnLocode,
29
-                     final String toUnLocode,
30
-                     final Date fromDate,
31
-                     final Date toDate) {
24
+                     final String toUnLocode) {
32
     this.voyageNumber = voyageNumber;
25
     this.voyageNumber = voyageNumber;
33
     this.fromUnLocode = fromUnLocode;
26
     this.fromUnLocode = fromUnLocode;
34
     this.toUnLocode = toUnLocode;
27
     this.toUnLocode = toUnLocode;
35
-    this.fromDate = fromDate;
36
-    this.toDate = toDate;
37
   }
28
   }
38
 
29
 
39
   public String getVoyageNumber() {
30
   public String getVoyageNumber() {
48
     return toUnLocode;
39
     return toUnLocode;
49
   }
40
   }
50
 
41
 
51
-  public Date getFromDate() {
52
-    return fromDate;
53
-  }
54
-
55
-  public Date getToDate() {
56
-    return toDate;
57
-  }
58
 }
42
 }

+ 3
- 3
dddsample/external/pathfinder/src/main/java/com/pathfinder/internal/GraphTraversalServiceImpl.java Parādīt failu

41
 
41
 
42
       transitEdges.add(new TransitEdge(
42
       transitEdges.add(new TransitEdge(
43
         dao.getVoyageNumber(originUnLocode, firstLegTo),
43
         dao.getVoyageNumber(originUnLocode, firstLegTo),
44
-        originUnLocode, firstLegTo, fromDate, toDate));
44
+        originUnLocode, firstLegTo));
45
 
45
 
46
       for (int j = 0; j < allVertices.size() - 1; j++) {
46
       for (int j = 0; j < allVertices.size() - 1; j++) {
47
         final String curr = allVertices.get(j);
47
         final String curr = allVertices.get(j);
49
         fromDate = nextDate(date);
49
         fromDate = nextDate(date);
50
         toDate = nextDate(fromDate);
50
         toDate = nextDate(fromDate);
51
         date = nextDate(toDate);
51
         date = nextDate(toDate);
52
-        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next, fromDate, toDate));
52
+        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next));
53
       }
53
       }
54
 
54
 
55
       final String lastLegFrom = allVertices.get(allVertices.size() - 1);
55
       final String lastLegFrom = allVertices.get(allVertices.size() - 1);
57
       toDate = nextDate(fromDate);
57
       toDate = nextDate(fromDate);
58
       transitEdges.add(new TransitEdge(
58
       transitEdges.add(new TransitEdge(
59
         dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
59
         dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
60
-        lastLegFrom, destinationUnLocode, fromDate, toDate));
60
+        lastLegFrom, destinationUnLocode));
61
 
61
 
62
       candidates.add(new TransitPath(transitEdges));
62
       candidates.add(new TransitPath(transitEdges));
63
     }
63
     }

+ 3
- 4
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/routing/ExternalRoutingService.java Parādīt failu

5
 import com.pathfinder.api.TransitPath;
5
 import com.pathfinder.api.TransitPath;
6
 import org.apache.commons.logging.Log;
6
 import org.apache.commons.logging.Log;
7
 import org.apache.commons.logging.LogFactory;
7
 import org.apache.commons.logging.LogFactory;
8
-import org.springframework.stereotype.Service;
9
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.stereotype.Service;
10
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
10
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
11
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
11
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
12
 import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
12
 import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
94
   }
94
   }
95
 
95
 
96
   private Leg toLeg(final TransitEdge edge) {
96
   private Leg toLeg(final TransitEdge edge) {
97
-    return new Leg(
97
+    return Leg.deriveLeg(
98
       voyageRepository.find(new VoyageNumber(edge.getVoyageNumber())),
98
       voyageRepository.find(new VoyageNumber(edge.getVoyageNumber())),
99
       locationRepository.find(new UnLocode(edge.getFromUnLocode())),
99
       locationRepository.find(new UnLocode(edge.getFromUnLocode())),
100
-      locationRepository.find(new UnLocode(edge.getToUnLocode())),
101
-      edge.getFromDate(), edge.getToDate()
100
+      locationRepository.find(new UnLocode(edge.getToUnLocode()))
102
     );
101
     );
103
   }
102
   }
104
 
103