improvement(Addressed PR feedback):

Author: br648

Diff for: README.md

@@ -309,8 +309,8 @@ The special E2E client settings should be defined in `env.yml`:
 | OTP_ADMIN_DASHBOARD_NAME | string | Optional | OTP Admin Dashboard | Config setting for linking to the OTP Admin Dashboard. |
 | OTP_ADMIN_DASHBOARD_URL | string | Optional | https://admin.example.com | Config setting for linking to the OTP Admin Dashboard. |
 | OTP_API_ROOT | string | Required | http://otp-server.example.com/otp | The URL of an operational OTP (v2.x) server. |
-| OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS | integer | Optional | 60 | The maximum time for making requests to OTP as part of itinerary existence checks. |
 | OTP_REQUESTS_THREADING_ENABLED | string | Optional | true | Use multi-threading to handle OTP requests and responses. |
+| OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS | integer | Optional | 30 | The maximum time for making requests to OTP. |
 | OTP_TIMEZONE | string | Required | America/Los_Angeles | The timezone identifier that OTP is using to parse dates and times. OTP will use the timezone identifier that it finds in the first available agency to parse dates and times. |
 | OTP_UI_NAME | string | Optional | Trip Planner | Config setting for linking to the OTP UI (trip planner). |
 | OTP_UI_URL | string | Optional | https://plan.example.com | Config setting for linking to the OTP UI (trip planner). |

Diff for: configurations/default/env.yml.tmp

@@ -119,8 +119,8 @@ TRUSTED_COMPANION_CONFIRMATION_PAGE_URL: https://otp-server.example.com/trusted/
 # A window used in conjunction with tracking update frequency to define a consecutive deviation threshold.
 CONSECUTIVE_DEVIATIONS_WINDOW_SECONDS: 30
 
-# The maximum time for making requests to OTP as part of itinerary existence checks.
-OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS: 60
+# The maximum time for making requests to OTP.
+OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS: 60
 
 # Use multi-threading to handle OTP requests and responses.
 OTP_REQUESTS_THREADING_ENABLED: "true"

Diff for: src/main/java/org/opentripplanner/middleware/models/ItineraryExistence.java

@@ -35,7 +35,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.opentripplanner.middleware.utils.ConfigUtils.getConfigPropertyAsInt;
+import static org.opentripplanner.middleware.otp.OtpDispatcher.OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS;
 import static org.opentripplanner.middleware.utils.ConfigUtils.getConfigPropertyAsText;
 import static org.opentripplanner.middleware.utils.DateTimeUtils.DEFAULT_DATE_FORMAT_PATTERN;
 
@@ -46,9 +46,6 @@
  */
 public class ItineraryExistence extends Model {
     private static final Logger LOG = LoggerFactory.getLogger(ItineraryExistence.class);
-    private static final int OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS = getConfigPropertyAsInt(
-        "OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS", 60
-    );
     private static final String OTP_REQUESTS_THREADING_ENABLED = getConfigPropertyAsText(
         "OTP_REQUESTS_THREADING_ENABLED", "true"
     );
@@ -306,10 +303,10 @@ private Map<DayOfWeek, OtpResponse> getOtpResponses(List<OtpRequest> otpRequests
 
         executor.shutdown();
         try {
-            if (!executor.awaitTermination(OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+            if (!executor.awaitTermination(OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS)) {
                 LOG.warn(
                     "OTP requests terminated, time out reached ({} seconds). Shutting down executor.",
-                    OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS
+                    OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS
                 );
                 executor.shutdownNow();
             }
@@ -321,7 +318,7 @@ private Map<DayOfWeek, OtpResponse> getOtpResponses(List<OtpRequest> otpRequests
     }
 
     /**
-     * Assign an OTP request to a day of the week.
+     * Assign an OTP request to a day of the week and start each call async to the OTP server.
      */
     private ConcurrentMap<DayOfWeek, CompletableFuture<OtpResponse>> assignOtpRequestToDayOfWeek(
         List<OtpRequest> otpRequests,

Diff for: src/main/java/org/opentripplanner/middleware/otp/OtpDispatcher.java

@@ -17,6 +17,7 @@
 import java.net.URI;
 import java.util.function.Supplier;
 
+import static org.opentripplanner.middleware.utils.ConfigUtils.getConfigPropertyAsInt;
 import static org.opentripplanner.middleware.utils.ConfigUtils.getConfigPropertyAsText;
 
 /**
@@ -37,7 +38,9 @@ public class OtpDispatcher {
      * Match the OTP GraphQL request timeout defined at
      * https://github.com/opentripplanner/OpenTripPlanner/blob/176e5f51923e82f8a4c2aa2a0b8284e1497b4439/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java#L54
      */
-    private static final int OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS = 30;
+    public static final int OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS = getConfigPropertyAsInt(
+        "OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS", 30
+    );
 
     /**
      * Provides a response from the OTP server target service based on the query parameters provided.

Diff for: src/main/resources/env.schema.json

@@ -224,16 +224,16 @@
       "examples": ["http://otp-server.example.com/otp"],
       "description": "The URL of an operational OTP (v2.x) server."
     },
-    "OTP_REQUESTS_TERMINATION_TIMEOUT_SECONDS": {
-      "type": "integer",
-      "examples": ["60"],
-      "description": "The maximum time for making requests to OTP as part of itinerary existence checks."
-    },
     "OTP_REQUESTS_THREADING_ENABLED": {
       "type": "string",
       "examples": ["true"],
       "description": "Use multi-threading to handle OTP requests and responses."
     },
+    "OTP_SERVER_REQUEST_TIMEOUT_IN_SECONDS": {
+      "type": "integer",
+      "examples": ["30"],
+      "description": "The maximum time for making requests to OTP."
+    },
     "OTP_TIMEZONE": {
       "type": "string",
       "examples": ["America/Los_Angeles"],

Diff for: src/test/java/org/opentripplanner/middleware/controllers/api/ApiUserFlowTest.java

@@ -221,8 +221,6 @@ void canSimulateApiUserFlow() throws Exception {
 
         // After POST is complete, reset OTP response provider to default.
         ItineraryExistence.otpResponseProviderOverride = null;
-        // Make sure all mocks were used
-        assertTrue(mockResponses.areAllMocksUsed());
 
         String responseBody = createTripResponseAsApiUser.responseBody;
         assertEquals(HttpStatus.OK_200, createTripResponseAsApiUser.status);

Diff for: src/test/java/org/opentripplanner/middleware/utils/ItineraryUtilsTest.java

@@ -150,9 +150,6 @@ void canCheckAllItinerariesExist(boolean insertInvalidDay, String message) throw
         // Days not monitored had an error response, so the check should return invalid for those days.
         assertFalse(existence.wednesday.isValid());
         assertFalse(existence.friday.isValid());
-
-        // Make sure all mocks were used
-        assertTrue(mockResponses.areAllMocksUsed());
     }
 
     private static Stream<Arguments> createCheckAllItinerariesExistTestCases() {

Diff for: src/test/java/org/opentripplanner/middleware/utils/MockOtpResponseProvider.java

@@ -10,19 +10,13 @@
  * Provides a set of mock OTP responses in the order they are expected to be used.
  */
 public class MockOtpResponseProvider {
-    private int index = 0;
     private final Map<DayOfWeek, OtpResponse> mockResponses;
 
     public MockOtpResponseProvider(Map<DayOfWeek, OtpResponse> mockResponses) {
         this.mockResponses = mockResponses;
     }
 
     public OtpResponse getMockResponse(OtpRequest otpRequest) {
-        index++;
         return mockResponses.get(otpRequest.dateTime.getDayOfWeek());
     }
-
-    public boolean areAllMocksUsed() {
-        return index == mockResponses.size();
-    }
 }