Renames and refactoring around ends of line discover and handling. Re…

…moved some deprecated code

main/src/com/tramchester/domain/id/CompositeId.java

@@ -34,11 +34,6 @@ public String getGraphId() {
         return idA.getGraphId()+DIVIDER+idB.getGraphId();
     }
 
-    @Override
-    public boolean notValid() {
-        return !isValid();
-    }
-
     @Override
     public boolean isValid() {
         return idA.isValid() && idB.isValid();

main/src/com/tramchester/domain/id/IdFor.java

@@ -12,12 +12,5 @@ static <T extends GraphProperty> IdFor<T> invalid() {
 
     String getGraphId();
 
-    /***
-     * use !isValid()
-     * @return
-     */
-    @Deprecated
-    boolean notValid();
-
     boolean isValid();
 }

main/src/com/tramchester/domain/id/IdSet.java

@@ -34,7 +34,7 @@ public static <T extends GraphProperty> IdSet<T> emptySet() {
         return new IdSet<>(Collections.emptySet());
     }
 
-    private IdSet<T> addAll(IdSet<T> other) {
+    public IdSet<T> addAll(IdSet<T> other) {
         theSet.addAll(other.theSet);
         return this;
     }
@@ -155,4 +155,8 @@ public boolean equals(Object o) {
     public int hashCode() {
         return theSet.hashCode();
     }
+
+    public boolean containsAll(IdSet<T> other) {
+        return theSet.containsAll(other.theSet);
+    }
 }

main/src/com/tramchester/domain/id/InvalidId.java

@@ -18,11 +18,6 @@ public String getGraphId() {
         throw new RuntimeException("Not implemented");
     }
 
-    @Override
-    public boolean notValid() {
-        return true;
-    }
-
     @Override
     public boolean isValid() {
         return false;

main/src/com/tramchester/domain/id/StringIdFor.java

@@ -51,11 +51,6 @@ public String getGraphId() {
         return theId;
     }
 
-    @Override
-    public boolean notValid() {
-        return theId.isEmpty();
-    }
-
     @Override
     public boolean isValid() {
         return !theId.isEmpty();

main/src/com/tramchester/graph/FindRouteEndPoints.java

@@ -0,0 +1,83 @@
+package com.tramchester.graph;
+
+import com.tramchester.domain.id.IdSet;
+import com.tramchester.domain.places.RouteStation;
+import com.tramchester.domain.reference.TransportMode;
+import com.tramchester.graph.graphbuild.GraphProps;
+import com.tramchester.graph.graphbuild.StagedTransportGraphBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Result;
+import org.neo4j.graphdb.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
+
+public class FindRouteEndPoints {
+    private static final Logger logger = LoggerFactory.getLogger(FindRouteEndPoints.class);
+    private final GraphDatabase graphDatabase;
+
+    @Inject
+    public FindRouteEndPoints(GraphDatabase graphDatabase, StagedTransportGraphBuilder.Ready readyToken) {
+        this.graphDatabase = graphDatabase;
+    }
+
+    public IdSet<RouteStation> searchForStarts(TransportMode mode) {
+        logger.info("Find starts for " +mode);
+
+        String query = "MATCH (a:ROUTE_STATION)-[r1:ON_ROUTE]->(:ROUTE_STATION) " +
+                "WHERE $mode in r1.transport_mode " +
+                "AND " +
+                        "NOT EXISTS { " +
+                            "MATCH (:ROUTE_STATION)-[r2:ON_ROUTE]->(a:ROUTE_STATION) " +
+                            "WHERE $mode in r2.transport_mode AND r1.route_id=r2.route_id" +
+                        "}" +
+                " RETURN a";
+
+        IdSet<RouteStation> stationIds = getIdFors(mode, query);
+
+        logger.info("Found " + stationIds.size() + " starts ");
+        return stationIds;
+    }
+
+    public IdSet<RouteStation> searchForEnds(TransportMode mode) {
+        logger.info("Find ends for " +mode);
+
+        String query = "MATCH (:ROUTE_STATION)-[r1:ON_ROUTE]->(a:ROUTE_STATION) " +
+                "WHERE $mode in r1.transport_mode " +
+                "AND " +
+                "NOT EXISTS { " +
+                "MATCH (a:ROUTE_STATION)-[r2:ON_ROUTE]->(:ROUTE_STATION) " +
+                "WHERE $mode in r2.transport_mode AND r1.route_id=r2.route_id" +
+                "}" +
+                " RETURN a";
+
+        IdSet<RouteStation> stationIds = getIdFors(mode, query);
+        logger.info("Found " + stationIds.size() + " ends");
+        return stationIds;
+    }
+
+    @NotNull
+    private IdSet<RouteStation> getIdFors(TransportMode mode, String query) {
+        logger.debug("Query: '" + query + '"');
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("mode", mode.getNumber());
+
+        IdSet<RouteStation> stationIds = new IdSet<>();
+        try (Transaction txn  = graphDatabase.beginTx()) {
+            Result result = txn.execute(query, params);
+            while (result.hasNext()) {
+                Map<String, Object> row = result.next();
+                Node node = (Node) row.get("a");
+                stationIds.add(GraphProps.getRouteStationIdFrom(node));
+            }
+            result.close();
+        }
+        return stationIds;
+    }
+
+}

main/src/com/tramchester/graph/graphbuild/GraphBuilder.java

@@ -49,21 +49,14 @@ public enum Labels implements Label
         NEIGHBOURS_ENABLED;
 
         public static Labels forMode(TransportMode mode) {
-            switch (mode) {
-                case Tram:
-                    return TRAM_STATION;
-                case Bus:
-                    return BUS_STATION;
-                case Train:
-                case RailReplacementBus:
-                    return TRAIN_STATION;
-                case Ferry:
-                    return FERRY_STATION;
-                case Subway:
-                    return SUBWAY_STATION;
-                default:
-                    throw new RuntimeException("Unsupported mode " + mode);
-            }
+            return switch (mode) {
+                case Tram -> TRAM_STATION;
+                case Bus -> BUS_STATION;
+                case Train, RailReplacementBus -> TRAIN_STATION;
+                case Ferry -> FERRY_STATION;
+                case Subway -> SUBWAY_STATION;
+                default -> throw new RuntimeException("Unsupported mode " + mode);
+            };
         }
 
         public static Set<Labels> forMode(Set<TransportMode> modes) {

main/src/com/tramchester/graph/graphbuild/StagedTransportGraphBuilder.java

@@ -418,6 +418,7 @@ private void createRouteRelationship(Node from, Node to, Route route, int cost)
             Relationship onRoute = from.createRelationshipTo(to, TransportRelationshipTypes.ON_ROUTE);
             setProperty(onRoute, route);
             setCostProp(onRoute, cost);
+            setProperty(onRoute, route.getTransportMode());
         }
     }
 

main/src/com/tramchester/graph/search/MapPathToStages.java

@@ -272,7 +272,7 @@ private void reset() {
         protected Optional<WalkingToStationStage> beginTrip(Relationship relationship) {
             IdFor<Trip> newTripId = GraphProps.getTripIdFrom(relationship);
 
-            if (tripId.notValid()) {
+            if (!tripId.isValid()) {
                 this.tripId = newTripId;
                 boardingTime = GraphProps.getTime(relationship);
             } else if (!tripId.equals(newTripId)){

main/src/com/tramchester/repository/RouteCallingStations.java

@@ -44,16 +44,17 @@ public void start() {
         logger.info("start");
         Collection<Route> routes = transportData.getRoutes();
         logger.info("Populating for " + routes.size() + " routes");
-        routes.forEach(route -> populateFromServices(route, route.getServices()));
+        routes.forEach(this::populateFromServices);
         logger.info("ready");
     }
 
-    private void populateFromServices(Route route, Set<Service> services) {
+    private void populateFromServices(Route route) {
         logger.debug("Populate calling stations for route " + HasId.asId(route));
-        Set<Trip> trips = services.stream().map(service -> service.getTripsFor(route)).flatMap(Collection::stream).collect(Collectors.toSet());
+        Set<Service> services = route.getServices();
+        Set<Trip> allTrips = services.stream().map(Service::getTrips).flatMap(Collection::stream).collect(Collectors.toSet());
 
         // ASSUME: longest trips correspond to full end to end journeys on the whole route
-        Optional<Trip> longest = trips.stream().max(Comparator.comparingInt(a -> a.getStops().numberOfCallingPoints()));
+        Optional<Trip> longest = allTrips.stream().max(Comparator.comparingInt(a -> a.getStops().numberOfCallingPoints()));
 
         longest.ifPresent(longestTrip -> {
             StopCalls stops = longestTrip.getStops();