From 926f994d09f31218b066cbf834148c8c7104e1c7 Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Mon, 9 Dec 2024 16:51:26 +0000 Subject: [PATCH] refactor(Addressed unused params and methods. Updated Swagger docs.): --- .../tripmonitor/jobs/CheckMonitoredTrip.java | 22 +------------------ .../triptracker/TravelerPosition.java | 2 -- .../middleware/utils/ItineraryUtils.java | 22 +++++++++---------- .../latest-spark-swagger-output.yaml | 10 ++++----- 4 files changed, 17 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java index 889004e48..0bfa7c54a 100644 --- a/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java +++ b/src/main/java/org/opentripplanner/middleware/tripmonitor/jobs/CheckMonitoredTrip.java @@ -1,6 +1,5 @@ package org.opentripplanner.middleware.tripmonitor.jobs; -import com.mongodb.lang.Nullable; import org.opentripplanner.middleware.i18n.Message; import org.opentripplanner.middleware.models.ItineraryExistence; import org.opentripplanner.middleware.models.MonitoredTrip; @@ -27,6 +26,7 @@ import org.slf4j.LoggerFactory; import org.slf4j.MDC; +import javax.annotation.Nullable; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; @@ -261,26 +261,6 @@ public void processLegTransition(List legTransitionTypes , Tra sendNotifications(); } - /** - * Get the position of the next leg within the itinerary. - */ - private int getLegIndex(Leg nextLeg) { - return IntStream - .range(0, trip.itinerary.legs.size()) - .filter(i -> ItineraryUtils.legsMatch(nextLeg, trip.itinerary.legs.get(i))) - .findFirst() - .orElse(-1); - } - - /** - * Confirm that the OTP response contains an itinerary that matches the trip itinerary. - */ - private boolean hasMatchingItinerary(OtpResponse otpResponse) { - return otpResponse.plan.itineraries - .stream() - .anyMatch(i -> ItineraryUtils.itinerariesMatch(trip.itinerary, i)); - } - /** * Find and set the matching itinerary from the OTP response that matches the monitored trip's stored itinerary if a * match exists. diff --git a/src/main/java/org/opentripplanner/middleware/triptracker/TravelerPosition.java b/src/main/java/org/opentripplanner/middleware/triptracker/TravelerPosition.java index a76b80a44..fa5c14a87 100644 --- a/src/main/java/org/opentripplanner/middleware/triptracker/TravelerPosition.java +++ b/src/main/java/org/opentripplanner/middleware/triptracker/TravelerPosition.java @@ -1,6 +1,5 @@ package org.opentripplanner.middleware.triptracker; -import org.opentripplanner.middleware.models.MonitoredTrip; import org.opentripplanner.middleware.models.OtpUser; import org.opentripplanner.middleware.models.TrackedJourney; import org.opentripplanner.middleware.otp.response.Itinerary; @@ -13,7 +12,6 @@ import static org.opentripplanner.middleware.triptracker.ManageLegTraversal.getExpectedLeg; import static org.opentripplanner.middleware.triptracker.ManageLegTraversal.getNextLeg; -import static org.opentripplanner.middleware.triptracker.ManageLegTraversal.getPreviousLeg; import static org.opentripplanner.middleware.triptracker.ManageLegTraversal.getSegmentFromPosition; import static org.opentripplanner.middleware.utils.GeometryUtils.getDistanceFromLine; import static org.opentripplanner.middleware.utils.ItineraryUtils.getFirstLeg; diff --git a/src/main/java/org/opentripplanner/middleware/utils/ItineraryUtils.java b/src/main/java/org/opentripplanner/middleware/utils/ItineraryUtils.java index efd339c3d..646c7ec9f 100644 --- a/src/main/java/org/opentripplanner/middleware/utils/ItineraryUtils.java +++ b/src/main/java/org/opentripplanner/middleware/utils/ItineraryUtils.java @@ -200,10 +200,10 @@ public static boolean legsMatch(Leg referenceItineraryLeg, Leg candidateItinerar // - The leg has the same interlining qualities with the previous leg if ( !equalsOrReferenceWasNull(referenceItineraryLeg.mode, candidateItineraryLeg.mode) || - !agenciesMatch(referenceItineraryLeg.agency, candidateItineraryLeg.agency) || - !routesMatch(referenceItineraryLeg.route, candidateItineraryLeg.route) || - !equalsIgnoreCaseOrReferenceWasEmpty(referenceItineraryLeg.headsign, candidateItineraryLeg.headsign) || - (referenceItineraryLeg.interlineWithPreviousLeg != candidateItineraryLeg.interlineWithPreviousLeg) + !agenciesMatch(referenceItineraryLeg.agency, candidateItineraryLeg.agency) || + !routesMatch(referenceItineraryLeg.route, candidateItineraryLeg.route) || + !equalsIgnoreCaseOrReferenceWasEmpty(referenceItineraryLeg.headsign, candidateItineraryLeg.headsign) || + (referenceItineraryLeg.interlineWithPreviousLeg != candidateItineraryLeg.interlineWithPreviousLeg) ) { return false; } @@ -245,8 +245,8 @@ private static boolean stopsMatch(Place stopA, Place stopB) { // stop code must match if ( stopA.stop != null && - stopB.stop != null && - !equalsIgnoreCaseOrReferenceWasEmpty(stopA.stop.code, stopB.stop.code) + stopB.stop != null && + !equalsIgnoreCaseOrReferenceWasEmpty(stopA.stop.code, stopB.stop.code) ) { return false; } @@ -270,8 +270,8 @@ private static boolean stopsMatch(Place stopA, Place stopB) { private static boolean agenciesMatch(Agency agencyA, Agency agencyB) { return ( agencyA != null && - agencyB != null && - equalsIgnoreCaseOrReferenceWasEmpty(agencyA.name, agencyB.name) + agencyB != null && + equalsIgnoreCaseOrReferenceWasEmpty(agencyA.name, agencyB.name) ); } @@ -281,9 +281,9 @@ private static boolean agenciesMatch(Agency agencyA, Agency agencyB) { private static boolean routesMatch(Route routeA, Route routeB) { return ( routeA != null && - routeB != null && - equalsIgnoreCaseOrReferenceWasEmpty(routeA.longName, routeB.longName) && - equalsIgnoreCaseOrReferenceWasEmpty(routeA.shortName, routeB.shortName) + routeB != null && + equalsIgnoreCaseOrReferenceWasEmpty(routeA.longName, routeB.longName) && + equalsIgnoreCaseOrReferenceWasEmpty(routeA.shortName, routeB.shortName) ); } diff --git a/src/main/resources/latest-spark-swagger-output.yaml b/src/main/resources/latest-spark-swagger-output.yaml index 7c15a66bd..1f9ad76cd 100644 --- a/src/main/resources/latest-spark-swagger-output.yaml +++ b/src/main/resources/latest-spark-swagger-output.yaml @@ -1686,10 +1686,10 @@ paths: "200": description: "Successful operation" examples: {} - responseSchema: - $ref: "#/definitions/MobilityProfileLite" schema: $ref: "#/definitions/MobilityProfileLite" + responseSchema: + $ref: "#/definitions/MobilityProfileLite" "400": description: "The request was not formed properly (e.g., some required parameters\ \ may be missing). See the details of the returned response to determine\ @@ -2376,9 +2376,9 @@ definitions: - "ALERT_FOUND" - "ITINERARY_NOT_FOUND" - "INITIAL_REMINDER" - - "MODE_CHANGE" - - "ORIGIN_CHANGE" - - "DESTINATION_CHANGE" + - "MODE_CHANGE_NOTIFICATION" + - "DEPARTED_NOTIFICATION" + - "ARRIVED_NOTIFICATION" body: type: "string" EncodedPolyline: