refactor: Rename HttpRequestScoped to OtpServerRequestScope

t2gran · t2gran · commit 103e08e33c15 · 2024-01-24T15:46:03.000+01:00
Signed-off-by: Thomas Gran &lt;t2gran@gmail.com&gt;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java
@@ -12,15 +12,15 @@
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.error.PathNotFoundException;
 import org.opentripplanner.routing.impl.GraphPathFinder;
-import org.opentripplanner.standalone.api.HttpRequestScoped;
 import org.opentripplanner.standalone.api.OtpServerRequestContext;
+import org.opentripplanner.standalone.api.OtpServerRequestScope;
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.service.TransitService;
 
-@HttpRequestScoped
+@OtpServerRequestScope
 public class DirectStreetRouter {
 
   private final OtpServerRequestContext serverContext;
diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
@@ -51,12 +51,12 @@
  * for the synchronization. Only request scoped components need to be synchronized - they are
  * potentially lazy initialized.
  */
-@HttpRequestScoped
+@OtpServerRequestScope
 public interface OtpServerRequestContext {
   /**
    * A RouteRequest containing default parameters that will be cloned when handling each request.
    */
-  @HttpRequestScoped
+  @OtpServerRequestScope
   RouteRequest defaultRouteRequest();
 
   /**
@@ -68,7 +68,7 @@ public interface OtpServerRequestContext {
 
   Graph graph();
 
-  @HttpRequestScoped
+  @OtpServerRequestScope
   @Deprecated
   TransitService transitService();
 
@@ -78,7 +78,7 @@ public interface OtpServerRequestContext {
    * realtime update that happens during the request will not affect the returned service and will
    * not be visible to the request.
    */
-  @HttpRequestScoped
+  @OtpServerRequestScope
   RoutingService routingService();
 
   /**
@@ -111,7 +111,7 @@ public interface OtpServerRequestContext {
    * Callback which is injected into the {@code DirectStreetRouter}, used to visualize the
    * search.
    */
-  @HttpRequestScoped
+  @OtpServerRequestScope
   TraverseVisitor<State, Edge> traverseVisitor();
 
   default GraphFinder graphFinder() {
diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestScope.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestScope.java
@@ -14,5 +14,5 @@
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.SOURCE)
 @Inherited
-public @interface HttpRequestScoped {
+public @interface OtpServerRequestScope {
 }
diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java
@@ -21,13 +21,13 @@
 import org.opentripplanner.service.realtimevehicles.RealtimeVehicleService;
 import org.opentripplanner.service.vehiclerental.VehicleRentalService;
 import org.opentripplanner.service.worldenvelope.WorldEnvelopeService;
-import org.opentripplanner.standalone.api.HttpRequestScoped;
 import org.opentripplanner.standalone.api.OtpServerRequestContext;
+import org.opentripplanner.standalone.api.OtpServerRequestScope;
 import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig;
 import org.opentripplanner.standalone.config.sandbox.FlexConfig;
 import org.opentripplanner.transit.service.TransitService;
 
-@HttpRequestScoped
+@OtpServerRequestScope
 public class DefaultServerRequestContext implements OtpServerRequestContext {
 
   private final List<RideHailingService> rideHailingServices;
diff --git a/src/main/java/org/opentripplanner/transit/configure/TransitModule.java b/src/main/java/org/opentripplanner/transit/configure/TransitModule.java
@@ -2,14 +2,14 @@
 
 import dagger.Binds;
 import dagger.Module;
-import org.opentripplanner.standalone.api.HttpRequestScoped;
+import org.opentripplanner.standalone.api.OtpServerRequestScope;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitService;
 
 @Module
 public abstract class TransitModule {
 
   @Binds
-  @HttpRequestScoped
+  @OtpServerRequestScope
   abstract TransitService bind(DefaultTransitService service);
 }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@`
`14`	`14`	`@Target({ ElementType.METHOD, ElementType.TYPE })`
`15`	`15`	`@Retention(RetentionPolicy.SOURCE)`
`16`	`16`	`@Inherited`
`17`		`-public @interface HttpRequestScoped {`
	`17`	`+public @interface OtpServerRequestScope {`
`18`	`18`	`}`