Rename AccessEgressRouter -> DefaultAccessEgressRouter

Author: optionsome

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java

@@ -24,9 +24,9 @@
 import org.opentripplanner.raptor.spi.ExtraMcRouterSearch;
 import org.opentripplanner.routing.algorithm.mapping.RaptorPathToItineraryMapper;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressPenaltyDecorator;
-import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses;
+import org.opentripplanner.routing.algorithm.raptoradapter.router.street.DefaultAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress;
@@ -64,7 +64,7 @@ public class TransitRouter {
   private final AdditionalSearchDays additionalSearchDays;
   private final ViaCoordinateTransferFactory viaTransferResolver;
   private final LinkingContext linkingContext;
-  private final AccessEgressRouter accessEgressRouter;
+  private final DefaultAccessEgressRouter accessEgressRouter;
 
   private TransitRouter(
     RouteRequest request,
@@ -83,7 +83,7 @@ private TransitRouter(
     this.debugTimingAggregator = debugTimingAggregator;
     this.viaTransferResolver = serverContext.viaTransferResolver();
     this.linkingContext = linkingContext;
-    this.accessEgressRouter = new AccessEgressRouter(
+    this.accessEgressRouter = new DefaultAccessEgressRouter(
       new TransitServiceResolver(serverContext.transitService())
     );
   }

…er/router/street/AccessEgressRouter.java …er/street/DefaultAccessEgressRouter.javaapplication/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java renamed to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DefaultAccessEgressRouter.java application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java renamed to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DefaultAccessEgressRouter.java

@@ -20,13 +20,13 @@
 /**
  * This uses a street search to find paths to all the access/egress stop within range
  */
-public class AccessEgressRouter {
+public class DefaultAccessEgressRouter {
 
-  private static final Logger LOG = LoggerFactory.getLogger(AccessEgressRouter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultAccessEgressRouter.class);
   private final StopResolver stopResolver;
   private final NearbyStopFactory nearbyStopFactory;
 
-  public AccessEgressRouter(StopResolver stopResolver) {
+  public DefaultAccessEgressRouter(StopResolver stopResolver) {
     this.stopResolver = stopResolver;
     this.nearbyStopFactory = new NearbyStopFactory(stopResolver::getRegularStop);
   }

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java

@@ -24,7 +24,7 @@ public static List<Itinerary> route(
     AdditionalSearchDays additionalSearchDays,
     LinkingContext linkingContext
   ) {
-    var accessEgressRouter = new AccessEgressRouter(
+    var accessEgressRouter = new DefaultAccessEgressRouter(
       new TransitServiceResolver(serverContext.transitService())
     );
     if (!StreetMode.FLEXIBLE.equals(request.journey().direct().mode())) {

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java

@@ -23,7 +23,7 @@ private FlexAccessEgressRouter() {}
 
   public static Collection<FlexAccessEgress> routeAccessEgress(
     RouteRequest request,
-    AccessEgressRouter accessEgressRouter,
+    DefaultAccessEgressRouter accessEgressRouter,
     OtpServerRequestContext serverContext,
     AdditionalSearchDays searchDays,
     FlexParameters config,

…outer/street/AccessEgressRouterTest.java …treet/DefaultAccessEgressRouterTest.javaapplication/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java renamed to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DefaultAccessEgressRouterTest.java application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java renamed to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DefaultAccessEgressRouterTest.java

@@ -28,7 +28,7 @@
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TimetableRepository;
 
-class AccessEgressRouterTest extends GraphRoutingTest {
+class DefaultAccessEgressRouterTest extends GraphRoutingTest {
 
   private Graph graph;
   private TimetableRepository timetableRepository;
@@ -272,7 +272,7 @@ private Collection<NearbyStop> findAccessEgressFromTo(
       var linkingRequest = LinkingContextRequestMapper.map(request);
       var linkingContext = linkingContextFactory.create(verticesContainer, linkingRequest);
 
-      return new AccessEgressRouter(
+      return new DefaultAccessEgressRouter(
         new SiteRepositoryResolver(timetableRepository.getSiteRepository())
       ).findAccessEgresses(
         request,