Merge branch 'kryo-serialization' into kryo-merge

# Conflicts:
#	src/main/java/org/opentripplanner/api/common/RoutingResource.java
#	src/main/java/org/opentripplanner/routing/core/RoutingRequest.java
#	src/main/java/org/opentripplanner/routing/graph/Graph.java

Author: TeemuP

docs/Changelog.md

@@ -4,6 +4,7 @@
 
 - Update onebusaway-gtfs to latest version from OBA project (#2636)
 - Remove the coupling to OneBusAway GTFS within OTP's internal model by creating new classes replacing the external classes (#2494)
+- Allow itineraries in response to be sorted by duration (#2593)
 
 ## 1.3 (2018-08-03)
 
@@ -364,4 +365,4 @@ This release was made to consolidate all the development that had occurred with
 - and of course, lots of bugfixes
 
 ## 0.4.4 (2012-02-06)
-Release in anticipation of upcoming merges.
+Release in anticipation of upcoming merges.

docs/Governance.md

@@ -7,14 +7,16 @@ OpenTripPlanner is a member project of the [Software Freedom Conservancy](https:
 | Sean Barbeau      | University of South Florida |
 | Torbjørn Barslett | Ruter Oslo |
 | Sheldon Brown     | Cambridge Systematics |
-| Andrew Byrd       | Conveyal |
+| Andrew Byrd       | PlannerStack Foundation |
 | Drew Dara-Abrams  | Interline |
 | David Emory       | Conveyal |
-| Jasper Hartong    | PlannerStack Foundation |
 | Tuukka Hastrup    | Helsingin Seudun Liikenne |
 | Frank Purcell     | TriMet |
 | David Turner      | ex-OpenPlans |
 
 The PLC holds a quarterly video conference on the first Thursday of June, September, December, and March. An agenda is prepared as a collaborative document in advance of each quarterly meeting. These meetings are held at 9AM US Pacific time to accommodate members in the US Pacific, US Eastern, and Central European time zones.
 
 We take care to avoid a governance system that is too conceptual or process-heavy. The main goal is to have regular agenda-driven meetings that yield clear decisions and action items assigned to specific people. The committee should ideally be composed of active, professional contributors to the OpenTripPlanner project, including representatives of organizations that host official public deployments of OTP.
+
+We enfore a policy on the review and merging of new changes to the OTP system, guided by a roadmap maintained by the committee. All changes must be reviewed and approved by at least two people from two different organizations. The list of approved reviewers is the PLC Github group, visible here https://github.com/orgs/opentripplanner/teams/plc/members
+

enunciate.xml

@@ -19,7 +19,10 @@
     <ruby-json-client disabled="true"/>
     <idl disabled="true"/>
     <swagger disabled="true"/>
-    <docs disableRestMountpoint="true"/>
+    <docs disableRestMountpoint="true"  includeApplicationPath="true"/>
+    <jaxrs>
+       <application path="/otp/" />
+    </jaxrs>
   </modules>
 
 </enunciate>

pom.xml

@@ -464,11 +464,17 @@
             <artifactId>aws-java-sdk-sqs</artifactId>
             <version>${aws.version}</version>
         </dependency>
-        <!-- Fast drop-in serialization including compound value types (structs) for Java -->
+        <!-- Kryo serialization, used to save graphs to disk. -->
         <dependency>
-            <groupId>de.ruedigermoeller</groupId>
-            <artifactId>fst</artifactId>
-            <version>2.34</version>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+        <!-- Extra serializers for Kryo -->
+        <dependency>
+            <groupId>de.javakaffee</groupId>
+            <artifactId>kryo-serializers</artifactId>
+            <version>0.42</version>
         </dependency>
         <!-- XXX: temporary fox for the build that is currently broken because some transitive deps are not handled correctly -->
         <dependency>
@@ -823,11 +829,11 @@
             <artifactId>traffic-engine</artifactId>
             <version>0.2</version>
         </dependency>
-        <!-- R5 may eventually be an alternate routing option within OTP, and provides Graph serialization. -->
+        <!-- OTP 2.0 will adopt routing methods based on those in R5. This also contains a serialization test framework. -->
         <dependency>
             <groupId>com.conveyal</groupId>
             <artifactId>r5</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.4.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>slf4j-simple</artifactId>

src/main/java/org/opentripplanner/api/common/RoutingResource.java

@@ -415,6 +415,14 @@ public abstract class RoutingResource {
     @QueryParam("heuristicStepsPerMainStep")
     private Integer heuristicStepsPerMainStep;
 
+    /**
+     * Set the method of sorting itineraries in the response. Right now, the only supported value is "duration";
+     * otherwise it uses default sorting. More sorting methods may be added in the future.
+     */
+    @QueryParam("pathComparator")
+    private String pathComparator;
+
+
     /*
      * somewhat ugly bug fix: the graphService is only needed here for fetching per-graph time zones. 
      * this should ideally be done when setting the routing context, but at present departure/
@@ -545,7 +553,7 @@ protected RoutingRequest buildRequest() throws ParameterException {
             request.setWhiteListedAgencies(whiteListedAgencies);
 
         HashMap<FeedScopedId, BannedStopSet> bannedTripMap = makeBannedTripMap(bannedTrips);
-
+      
         if (bannedTripMap != null)
             request.bannedTrips = bannedTripMap;
 
@@ -670,6 +678,9 @@ protected RoutingRequest buildRequest() throws ParameterException {
         if (heuristicStepsPerMainStep != null)
             request.heuristicStepsPerMainStep = heuristicStepsPerMainStep;
 
+        if (pathComparator != null)
+            request.pathComparator = pathComparator;
+
         //getLocale function returns defaultLocale if locale is null
         request.locale = ResourceBundleSingleton.INSTANCE.getLocale(locale);
         return request;

src/main/java/org/opentripplanner/api/resource/Routers.java

@@ -32,7 +32,6 @@
 import org.opentripplanner.graph_builder.GraphBuilder;
 import org.opentripplanner.routing.error.GraphNotFoundException;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.graph.Graph.LoadLevel;
 import org.opentripplanner.routing.impl.DefaultStreetVertexIndexFactory;
 import org.opentripplanner.routing.impl.MemoryGraphSource;
 import org.opentripplanner.routing.services.GraphService;
@@ -189,7 +188,6 @@ public Response putGraphId(@PathParam("routerId") String routerId,
     public Response postGraphOverWire (
             @PathParam("routerId") String routerId, 
             @QueryParam("preEvict") @DefaultValue("true") boolean preEvict, 
-            @QueryParam("loadLevel") @DefaultValue("FULL") LoadLevel level,
             InputStream is) {
         if (preEvict) {
             LOG.debug("pre-evicting graph");
@@ -198,7 +196,7 @@ public Response postGraphOverWire (
         LOG.debug("deserializing graph from POST data stream...");
         Graph graph;
         try {
-            graph = Graph.load(is, level);
+            graph = Graph.load(is);
             GraphService graphService = otpServer.getGraphService();
             graphService.registerGraph(routerId, new MemoryGraphSource(routerId, graph));
             return Response.status(Status.CREATED).entity(graph.toString() + "\n").build();

src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java

@@ -23,7 +23,6 @@
 import org.opentripplanner.reflect.ReflectionLibrary;
 import org.opentripplanner.routing.core.RoutingRequest;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.graph.Graph.LoadLevel;
 import org.opentripplanner.standalone.CommandLineParameters;
 import org.opentripplanner.standalone.GraphBuilderParameters;
 import org.opentripplanner.standalone.OTPMain;
@@ -91,7 +90,7 @@ public void setAlwaysRebuild(boolean alwaysRebuild) {
     public void setBaseGraph(String baseGraph) {
         this.baseGraph = baseGraph;
         try {
-            graph = Graph.load(new File(baseGraph), LoadLevel.FULL);
+            graph = Graph.load(new File(baseGraph));
         } catch (Exception e) {
             throw new RuntimeException("error loading base graph");
         }

src/main/java/org/opentripplanner/graph_builder/GraphStats.java

@@ -95,7 +95,7 @@ private void run() {
         /* open input graph (same for all commands) */
         File graphFile = new File(graphPath);
         try {
-            graph = Graph.load(graphFile, Graph.LoadLevel.FULL);
+            graph = Graph.load(graphFile);
         } catch (Exception e) {
             LOG.error("Exception while loading graph from " + graphFile);
             return;

src/main/java/org/opentripplanner/kryo/HashBiMapSerializer.java

@@ -0,0 +1,19 @@
+package org.opentripplanner.kryo;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.serializers.MapSerializer;
+import com.google.common.collect.HashBiMap;
+
+import java.util.Map;
+
+/**
+ * Created by abyrd on 2018-10-25
+ */
+public class HashBiMapSerializer extends MapSerializer {
+
+    protected Map create(Kryo kryo, Input input, Class<Map> type) {
+        return HashBiMap.create();
+    }
+
+}

src/main/java/org/opentripplanner/routing/core/RoutingRequest.java

@@ -16,17 +16,21 @@
 import org.opentripplanner.routing.graph.Edge;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graph.Vertex;
+import org.opentripplanner.routing.impl.DurationComparator;
+import org.opentripplanner.routing.impl.PathComparator;
 import org.opentripplanner.routing.request.BannedStopSet;
 import org.opentripplanner.routing.spt.DominanceFunction;
+import org.opentripplanner.routing.spt.GraphPath;
 import org.opentripplanner.routing.spt.ShortestPathTree;
 import org.opentripplanner.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -464,6 +468,9 @@ public class RoutingRequest implements Cloneable, Serializable {
     /** Whether to apply the ellipsoid->geoid offset to all elevations in the response */
     public boolean geoidElevation = false;
 
+    /** Which path comparator to use */
+    public String pathComparator = null;
+
     /** Saves split edge which can be split on origin/destination search
      *
      * This is used so that TrivialPathException is thrown if origin and destination search would split the same edge
@@ -680,14 +687,14 @@ public void setOtherThanPreferredRoutesPenalty(int penalty) {
         if(penalty < 0) penalty = 0;
         this.otherThanPreferredRoutesPenalty = penalty;
     }
-    
+
     public void setUnpreferredAgencies(String s) {
         if (!s.isEmpty()) {
             unpreferredAgencies = new HashSet<>();
             Collections.addAll(unpreferredAgencies, s.split(","));
         }
     }
-    
+
     public void setUnpreferredRoutes(String s) {
         if (!s.isEmpty()) {
         //RouteMatcher expects route ids in format [FeedId]__[RouteId] -> replace ":" in ids with "__"
@@ -740,7 +747,7 @@ public void setBannedStopsHard(String s) {
             bannedStopsHard = StopMatcher.emptyMatcher();
         }
     }
-    
+
     public void setBannedAgencies(String s) {
         if (!s.isEmpty()) {
             bannedAgencies = new HashSet<>();
@@ -801,7 +808,7 @@ public void setDateTime(String date, String time, TimeZone tz) {
         setDateTime(dateObject);
     }
 
-    public int getNumItineraries() { 
+    public int getNumItineraries() {
         if (modes.isTransit()) {
             return numItineraries;
         } else {
@@ -837,14 +844,14 @@ public void setIntermediatePlacesFromStrings(List<String> intermediates) {
             intermediatePlaces.add(GenericLocation.fromOldStyleString(place));
         }
     }
-    
+
     /** Clears any intermediate places from this request. */
     public void clearIntermediatePlaces() {
         if (this.intermediatePlaces != null) {
             this.intermediatePlaces.clear();
         }
     }
-    
+
     /**
      * Returns true if there are any intermediate places set.
      */
@@ -946,7 +953,7 @@ public void setRoutingContext(Graph graph, Edge fromBackEdge, Vertex from, Verte
         this.rctx = new RoutingContext(this, graph, from, to);
         this.rctx.originBackEdge = fromBackEdge;
     }
-    
+
     public void setRoutingContext(Graph graph, Vertex from, Vertex to) {
         setRoutingContext(graph, null, from, to);
     }
@@ -1429,4 +1436,12 @@ public List<Integer> getLocationSlacks() {
         }
         return locationSlacks;
     }
+
+    public Comparator<GraphPath> getPathComparator(boolean compareStartTimes) {
+        if ("duration".equals(pathComparator)) {
+            return new DurationComparator();
+        }
+        return new PathComparator(compareStartTimes);
+    }
+
 }