diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/AssessmentController.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/AssessmentController.java index d2e612349..d3ba1f06e 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/AssessmentController.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/AssessmentController.java @@ -8,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.data.mongodb.core.query.Query; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -86,13 +85,12 @@ public ResponseEntity<Long> countConnectionOfTravelAssessment( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = connectionOfTravelAssessmentRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = connectionOfTravelAssessmentRepo.getQuery(intersectionID, startTime, endTime, false); long count = connectionOfTravelAssessmentRepo.getQueryResultCount(query); logger.info("Found: " + count + " Connection of Travel Assessments"); return ResponseEntity.ok(count); @@ -131,13 +129,12 @@ public ResponseEntity<Long> countLaneDirectionOfTravelAssessment( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = laneDirectionOfTravelAssessmentRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = laneDirectionOfTravelAssessmentRepo.getQuery(intersectionID, startTime, endTime, false); long count = laneDirectionOfTravelAssessmentRepo.getQueryResultCount(query); logger.info("Found: " + count + " Lane Direction of Travel Assessments"); return ResponseEntity.ok(count); @@ -177,14 +174,13 @@ public ResponseEntity<Long> countSignalStateAssessment( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = stopLineStopAssessmentRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = stopLineStopAssessmentRepo.getQuery(intersectionID, startTime, endTime, false); long count = stopLineStopAssessmentRepo.getQueryResultCount(query); logger.info("Found: " + count + " Lane Direction of Travel Assessments"); return ResponseEntity.ok(count); @@ -222,13 +218,12 @@ public ResponseEntity<Long> countSignalStateEventAssessment( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalStateEventAssessmentRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalStateEventAssessmentRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalStateEventAssessmentRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal State Event Assessments"); return ResponseEntity.ok(count); diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java index 88f987905..d9040ac0e 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java @@ -143,13 +143,12 @@ public ResponseEntity<Long> countIntersectionReferenceAlignmentEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = intersectionReferenceAlignmentEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = intersectionReferenceAlignmentEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = intersectionReferenceAlignmentEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Intersection Reference Alignment Events"); return ResponseEntity.ok(count); @@ -185,13 +184,12 @@ public ResponseEntity<Long> countConnectionOfTravelEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = connectionOfTravelEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = connectionOfTravelEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = connectionOfTravelEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Connection of Travel Events"); return ResponseEntity.ok(count); @@ -243,13 +241,12 @@ public ResponseEntity<Long> countLaneDirectionOfTravelEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = laneDirectionOfTravelEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = laneDirectionOfTravelEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = laneDirectionOfTravelEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Lane Direction of Travel Events"); return ResponseEntity.ok(count); @@ -301,13 +298,12 @@ public ResponseEntity<Long> countSignalGroupAlignmentEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalGroupAlignmentEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalGroupAlignmentEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalGroupAlignmentEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal Group Alignment Events"); return ResponseEntity.ok(count); @@ -359,13 +355,12 @@ public ResponseEntity<Long> countSignalStateConflictEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalStateConflictEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalStateConflictEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalStateConflictEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal Group Alignment Events"); return ResponseEntity.ok(count); @@ -417,13 +412,12 @@ public ResponseEntity<Long> countSignalStateEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalStateEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalStateEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalStateEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal State Count"); return ResponseEntity.ok(count); @@ -477,13 +471,12 @@ public ResponseEntity<Long> countSignalStateStopEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalStateStopEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalStateStopEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalStateStopEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal State Stop Events"); return ResponseEntity.ok(count); @@ -535,13 +528,12 @@ public ResponseEntity<Long> countTimeChangeDetailsEvent( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = timeChangeDetailsEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = timeChangeDetailsEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = timeChangeDetailsEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Time Change Detail Events"); return ResponseEntity.ok(count); @@ -592,13 +584,12 @@ public ResponseEntity<Long> countSpatMinimumDataEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = spatMinimumDataEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = spatMinimumDataEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = spatMinimumDataEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Spat Minimum Data Events"); return ResponseEntity.ok(count); @@ -633,13 +624,12 @@ public ResponseEntity<Long> countMapMinimumDataEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = mapMinimumDataEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = mapMinimumDataEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = mapMinimumDataEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Map Minimum Data Events"); return ResponseEntity.ok(count); @@ -676,13 +666,12 @@ public ResponseEntity<Long> countMapBroadcastRateEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = mapBroadcastRateEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = mapBroadcastRateEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = mapBroadcastRateEventRepo.getQueryResultCount(query); System.out.println("Map Broadcast Rate Event"); logger.info("Found: " + count + " Map Broadcast Rates"); @@ -720,13 +709,12 @@ public ResponseEntity<Long> countSpatBroadcastRateEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = spatBroadcastRateEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = spatBroadcastRateEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = spatBroadcastRateEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " Spat Broadcast Rate Events"); return ResponseEntity.ok(count); @@ -762,13 +750,12 @@ public ResponseEntity<Long> countBsmEvents( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = bsmEventRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = bsmEventRepo.getQuery(intersectionID, startTime, endTime, false); long count = bsmEventRepo.getQueryResultCount(query); logger.info("Found: " + count + " BSM Events"); return ResponseEntity.ok(count); diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java index b94b2d936..47b94bebe 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java @@ -66,13 +66,12 @@ public ResponseEntity<Long> countMaps( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name= "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(5L); } else { - Query query = processedMapRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = processedMapRepo.getQuery(intersectionID, startTime, endTime, false); long count = processedMapRepo.getQueryResultCount(query); logger.info("Found: " + count + "Processed Map Messages"); diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/NotificationController.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/NotificationController.java index 265cc2733..44c24d9f0 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/NotificationController.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/NotificationController.java @@ -192,12 +192,11 @@ public ResponseEntity<Long> countConnectionOfTravelNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = connectionOfTravelNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = connectionOfTravelNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = connectionOfTravelNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Connection of Travel Notifications"); @@ -240,14 +239,13 @@ public ResponseEntity<Long> countIntersectionReferenceAlignmentNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { Query query = intersectionReferenceAlignmentNotificationRepo.getQuery(intersectionID, startTime, endTime, - latest); + false); long count = intersectionReferenceAlignmentNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Intersection Reference Alignment"); @@ -289,13 +287,12 @@ public ResponseEntity<Long> countLaneDirectionOfTravelNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = laneDirectionOfTravelNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = laneDirectionOfTravelNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = laneDirectionOfTravelNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Lane Direction of Travel"); @@ -338,13 +335,12 @@ public ResponseEntity<Long> countMapBroadcastRateNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = mapBroadcastRateNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = mapBroadcastRateNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = mapBroadcastRateNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Map Broadcast Rate Notifications"); @@ -385,12 +381,11 @@ public ResponseEntity<Long> countSignalGroupAlignmentNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalGroupAlignmentNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalGroupAlignmentNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalGroupAlignmentNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal Group Alignment Notifications"); return ResponseEntity.ok(count); @@ -431,13 +426,12 @@ public ResponseEntity<Long> countSignalStateConflictNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = signalStateConflictNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = signalStateConflictNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = signalStateConflictNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Signal State Conflict Noficiations"); return ResponseEntity.ok(count); @@ -478,13 +472,12 @@ public ResponseEntity<Long> countSpatBroadcastRateNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = spatBroadcastRateNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = spatBroadcastRateNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = spatBroadcastRateNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " SPaT Broadcast Rate Notifications"); return ResponseEntity.ok(count); @@ -524,12 +517,11 @@ public ResponseEntity<Long> countStopLineStopNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = stopLineStopNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = stopLineStopNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = stopLineStopNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Stop Line Stop Notifications"); return ResponseEntity.ok(count); @@ -570,12 +562,11 @@ public ResponseEntity<Long> countStopLinePassageNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = stopLinePassageNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = stopLinePassageNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = stopLinePassageNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Stop Line Passage Notifications"); return ResponseEntity.ok(count); @@ -616,12 +607,11 @@ public ResponseEntity<Long> countTimeChangeDetailsNotification( @RequestParam(name = "intersection_id", required = false) Integer intersectionID, @RequestParam(name = "start_time_utc_millis", required = false) Long startTime, @RequestParam(name = "end_time_utc_millis", required = false) Long endTime, - @RequestParam(name = "latest", required = false, defaultValue = "false") boolean latest, @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) { if (testData) { return ResponseEntity.ok(1L); } else { - Query query = timeChangeDetailsNotificationRepo.getQuery(intersectionID, startTime, endTime, latest); + Query query = timeChangeDetailsNotificationRepo.getQuery(intersectionID, startTime, endTime, false); long count = timeChangeDetailsNotificationRepo.getQueryResultCount(query); logger.info("Found: " + count + " Time Change Detail Notifications"); return ResponseEntity.ok(count);