Move test constructor

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java

@@ -200,7 +200,6 @@ private static List<Edge> createStopLinkEdges(
   }
 
   private void linkVehicleParkingWithLinker(
-    Graph graph,
     VehicleParkingEntranceVertex vehicleParkingVertex
   ) {
     if (vehicleParkingVertex.isWalkAccessible()) {
@@ -301,7 +300,7 @@ private void linkVehicleParks(Graph graph, DataImportIssueStore issueStore) {
       }
 
       if (vehicleParkingEntranceVertex.getParkingEntrance().getVertex() == null) {
-        linkVehicleParkingWithLinker(graph, vehicleParkingEntranceVertex);
+        linkVehicleParkingWithLinker(vehicleParkingEntranceVertex);
         continue;
       }
 

application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java

@@ -98,16 +98,12 @@ public class VertexLinker {
    * given time.
    */
   public VertexLinker(Graph graph, VisibilityMode visibilityMode, int maxAreaNodes) {
-    this.graph = graph;
+    this.graph = Objects.requireNonNull(graph);
     this.vertexFactory = new VertexFactory(graph);
-    this.visibilityMode = visibilityMode;
+    this.visibilityMode = Objects.requireNonNull(visibilityMode);
     this.maxAreaNodes = maxAreaNodes;
   }
 
-  public VertexLinker(Graph graph) {
-    this(graph, VisibilityMode.COMPUTE_AREA_VISIBILITY, StreetConstants.DEFAULT_MAX_AREA_NODES);
-  }
-
   public void linkVertexPermanently(
     Vertex vertex,
     TraverseModeSet traverseModes,

application/src/main/java/org/opentripplanner/standalone/OTPMain.java

@@ -192,7 +192,6 @@ private static void startOtpWebServer(CommandLineParameters params, ConstructApp
     app.timetableRepository().index();
     app.graph().index();
 
-    //app.graph().getLinker().setMaxAreaNodes(app.streetLimitationParameters().maxAreaNodes());
     // publishing the config version info make it available to the APIs
     setOtpConfigVersionsOnServerInfo(app);
 

application/src/test/java/org/opentripplanner/ConstantsForTests.java

@@ -19,6 +19,7 @@
 import org.opentripplanner.graph_builder.module.DirectTransferGenerator;
 import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
 import org.opentripplanner.graph_builder.module.TurnRestrictionModule;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.graph_builder.module.ned.ElevationModule;
 import org.opentripplanner.graph_builder.module.ned.GeotiffGridCoverageFactoryImpl;
 import org.opentripplanner.graph_builder.module.osm.OsmModule;
@@ -346,7 +347,7 @@ public static void addGtfsToGraph(
 
   private static void addPortlandVehicleRentals(Graph graph) {
     try {
-      VertexLinker linker = new VertexLinker(graph);
+      VertexLinker linker = TestVertexLinker.of(graph);
       CsvReader reader = new CsvReader(PORTLAND_BIKE_SHARE_CSV, ',', StandardCharsets.UTF_8);
       reader.readHeaders();
       while (reader.readRecord()) {

application/src/test/java/org/opentripplanner/TestServerContext.java

@@ -10,6 +10,7 @@
 import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository;
 import org.opentripplanner.ext.emission.internal.DefaultEmissionService;
 import org.opentripplanner.ext.emission.internal.itinerary.EmissionItineraryDecorator;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule;
@@ -122,7 +123,7 @@ public static OtpServerRequestContext createServerContext(
   }
 
   private static VertexLinker createVertexLinker(Graph graph) {
-    return new VertexLinker(graph);
+    return TestVertexLinker.of(graph);
   }
 
   /** Static factory method to create a service for test purposes. */
@@ -164,7 +165,7 @@ public static ViaCoordinateTransferFactory createViaTransferResolver(
   ) {
     return new DefaultViaCoordinateTransferFactory(
       graph,
-      new VertexLinker(graph),
+      TestVertexLinker.of(graph),
       transitService,
       Duration.ofMinutes(30)
     );

application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java

@@ -28,14 +28,14 @@
 import org.opentripplanner.apis.gtfs.TestRoutingService;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.plan.PlanTestConstants;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle;
 import org.opentripplanner.routing.api.request.preference.TransferPreferences;
 import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.GraphFinder;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
 import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
 import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService;
@@ -68,7 +68,7 @@ class LegacyRouteRequestMapperTest implements PlanTestConstants {
       new DefaultVehicleParkingService(new DefaultVehicleParkingRepository()),
       new DefaultRealtimeVehicleService(transitService),
       SchemaFactory.createSchemaWithDefaultInjection(routeRequest),
-      GraphFinder.getInstance(graph, new VertexLinker(graph), transitService),
+      GraphFinder.getInstance(graph, TestVertexLinker.of(graph), transitService),
       routeRequest
     );
   }

application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java

@@ -27,12 +27,12 @@
 import org.opentripplanner.apis.gtfs.SchemaFactory;
 import org.opentripplanner.apis.gtfs.TestRoutingService;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.plan.paging.cursor.PageCursor;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.GraphFinder;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
 import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
 import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService;
@@ -74,7 +74,7 @@ class RouteRequestMapperTest {
       new DefaultVehicleParkingService(new DefaultVehicleParkingRepository()),
       new DefaultRealtimeVehicleService(transitService),
       SchemaFactory.createSchemaWithDefaultInjection(routeRequest),
-      GraphFinder.getInstance(graph, new VertexLinker(graph), transitService),
+      GraphFinder.getInstance(graph, TestVertexLinker.of(graph), transitService),
       routeRequest
     );
   }

application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java

@@ -18,10 +18,10 @@
 import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.graph_builder.module.osm.OsmModule;
 import org.opentripplanner.osm.DefaultOsmProvider;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildRepository;
 import org.opentripplanner.service.osminfo.internal.DefaultOsmInfoGraphBuildService;
 import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository;
@@ -126,7 +126,7 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set<String> linkedVerti
     assertEquals(0, platformVertex.getOutgoing().size());
 
     var osmService = new DefaultOsmInfoGraphBuildService(osmInfoRepository);
-    new OsmBoardingLocationsModule(graph, new VertexLinker(graph), osmService).buildGraph();
+    new OsmBoardingLocationsModule(graph, TestVertexLinker.of(graph), osmService).buildGraph();
 
     var boardingLocations = graph.getVerticesOfType(OsmBoardingLocationVertex.class);
     assertEquals(5, boardingLocations.size()); // 3 nodes connected to the street network, plus one "floating" and one area centroid created by the module
@@ -302,7 +302,7 @@ TransitStopVertex getPlatformVertex() {
 
     new OsmBoardingLocationsModule(
       graph,
-      new VertexLinker(graph),
+      TestVertexLinker.of(graph),
       new DefaultOsmInfoGraphBuildService(osmInfoRepository)
     ).buildGraph();
 

application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java

@@ -64,7 +64,7 @@ public static void link(Graph graph, TimetableRepository timetableRepository) {
     timetableRepository.index();
     graph.index();
 
-    VertexLinker linker = new VertexLinker(graph);
+    VertexLinker linker = TestVertexLinker.of(graph);
 
     for (TransitStopVertex tStop : graph.getVerticesOfType(TransitStopVertex.class)) {
       linker.linkVertexPermanently(

application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestVertexLinker.java

@@ -0,0 +1,16 @@
+package org.opentripplanner.graph_builder.module.linking;
+
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.street.model.StreetConstants;
+
+public class TestVertexLinker {
+
+  public static VertexLinker of(Graph graph) {
+    return new VertexLinker(
+      graph,
+      VertexLinker.VisibilityMode.COMPUTE_AREA_VISIBILITY,
+      StreetConstants.DEFAULT_MAX_AREA_NODES
+    );
+  }
+}

application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java

@@ -21,13 +21,13 @@
 import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.linking.DisposableEdgeCollection;
 import org.opentripplanner.routing.linking.SameEdgeAdjuster;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.routing.services.notes.StreetNotesService;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model._data.StreetModelForTest;
@@ -574,7 +574,7 @@ public void testTemporaryVerticesContainer() {
     try (
       var container = new TemporaryVerticesContainer(
         graph,
-        new VertexLinker(graph),
+        TestVertexLinker.of(graph),
         walking.from(),
         walking.to(),
         StreetMode.WALK,

application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java

@@ -8,11 +8,11 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.graph_builder.module.TestStreetLinkerModule;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
@@ -204,7 +204,7 @@ private void assertLinking(
       // Remove to, so that origin and destination are different
       routingRequest.setTo(new GenericLocation(null, null));
 
-      var linker = new VertexLinker(graph);
+      var linker = TestVertexLinker.of(graph);
       try (
         var temporaryVertices = new TemporaryVerticesContainer(
           graph,

application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java

@@ -8,14 +8,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.algorithm.GraphRoutingTest;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.api.request.request.StreetRequest;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.street.model.vertex.TransitStopVertex;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
 import org.opentripplanner.street.search.state.State;
@@ -259,7 +259,7 @@ private Collection<NearbyStop> findAccessEgressFromTo(
     try (
       var verticesContainer = new TemporaryVerticesContainer(
         graph,
-        new VertexLinker(graph),
+        TestVertexLinker.of(graph),
         from,
         to,
         StreetMode.WALK,

application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java

@@ -15,10 +15,10 @@
 import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.framework.geometry.SphericalDistanceLibrary;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model._data.StreetModelForTest;
 import org.opentripplanner.street.model.edge.Edge;
@@ -29,7 +29,6 @@
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
 import org.opentripplanner.transit.model.framework.Deduplicator;
-import org.opentripplanner.transit.service.SiteRepository;
 
 public class TemporaryVerticesContainerTest {
 
@@ -63,7 +62,7 @@ public void temporaryChangesRemovedOnClose() {
     // When - the container is created
     subject = new TemporaryVerticesContainer(
       g,
-      new VertexLinker(g),
+      TestVertexLinker.of(g),
       from,
       to,
       StreetMode.WALK,

application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java

@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.routing.algorithm.GraphRoutingTest;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.service.vehicleparking.model.VehicleParking;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
 import org.opentripplanner.street.model.StreetTraversalPermission;
@@ -111,7 +111,7 @@ public void build() {
     );
 
     transitService = new DefaultTransitService(otpModel.timetableRepository());
-    graphFinder = new StreetGraphFinder(otpModel.graph(), new VertexLinker(otpModel.graph()));
+    graphFinder = new StreetGraphFinder(otpModel.graph(), TestVertexLinker.of(otpModel.graph()));
   }
 
   @Test

application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java

@@ -16,6 +16,7 @@
 import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.LocalizedString;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 import org.opentripplanner.street.model.edge.Area;
@@ -26,7 +27,6 @@
 import org.opentripplanner.street.model.edge.LinkingDirection;
 import org.opentripplanner.street.model.edge.StreetTransitStopLink;
 import org.opentripplanner.street.model.vertex.IntersectionVertex;
-import org.opentripplanner.street.model.vertex.LabelledIntersectionVertex;
 import org.opentripplanner.street.model.vertex.TransitStopVertex;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.model.vertex.VertexFactory;
@@ -245,7 +245,7 @@ void testAddPermanentAreaVertex() {
 
     var vertexFactory = new VertexFactory(graph);
     var v = vertexFactory.intersection("boardingLocation", 10.00000001, 60.00000001);
-    new VertexLinker(graph).addPermanentAreaVertex(v, ag);
+    TestVertexLinker.of(graph).addPermanentAreaVertex(v, ag);
 
     // vertex links to the single visibility point with 2 edges
     assertEquals(10, graph.getEdges().size());

application/src/test/java/org/opentripplanner/routing/linking/VertexLinkerTest.java

@@ -6,6 +6,7 @@
 import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.framework.application.OTPFeature;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.street.model._data.StreetModelForTest;
 import org.opentripplanner.street.model.edge.LinkingDirection;
@@ -41,7 +42,7 @@ void flex() {
       graph.addVertex(v2);
       graph.index();
 
-      var linker = new VertexLinker(graph);
+      var linker = TestVertexLinker.of(graph);
 
       linker.linkVertexPermanently(
         toBeLinked,

application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java

@@ -20,6 +20,7 @@
 import org.opentripplanner.TestOtpModel;
 import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.framework.geometry.EncodedPolyline;
+import org.opentripplanner.graph_builder.module.linking.TestVertexLinker;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.model.plan.leg.StreetLeg;
@@ -29,7 +30,6 @@
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.impl.GraphPathFinder;
-import org.opentripplanner.routing.linking.VertexLinker;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
 import org.opentripplanner.street.search.TraverseMode;
 import org.opentripplanner.test.support.ResourceLoader;
@@ -183,7 +183,7 @@ private static String computePolyline(
 
     var temporaryVertices = new TemporaryVerticesContainer(
       graph,
-      new VertexLinker(graph),
+      TestVertexLinker.of(graph),
       from,
       to,
       streetMode,