diff --git a/Dockerfile b/Dockerfile index 55f1be473..31f8c6ab5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ WORKDIR /home COPY --from=builder /home/jpo-conflictvisualizer-api/src/main/resources/application.yaml /home COPY --from=builder /home/jpo-conflictvisualizer-api/src/main/resources/logback.xml /home -COPY --from=builder /home/jpo-conflictvisualizer-api/target/jpo-conflictvisualizer-api-0.0.1-SNAPSHOT.jar /home +COPY --from=builder /home/jpo-conflictvisualizer-api/target/jpo-conflictvisualizer-api-1.3.0-SNAPSHOT.jar /home #COPY cert.crt /home/cert.crt #RUN keytool -import -trustcacerts -keystore /opt/java/openjdk/lib/security/cacerts -storepass changeit -noprompt -alias mycert -file cert.crt diff --git a/jpo-conflictmonitor b/jpo-conflictmonitor index b0c3bbcfb..61d14702e 160000 --- a/jpo-conflictmonitor +++ b/jpo-conflictmonitor @@ -1 +1 @@ -Subproject commit b0c3bbcfbf8397738cced3afdde98182de29ec0d +Subproject commit 61d14702e964df7992fb7b20353f9024c32bd469 diff --git a/jpo-conflictvisualizer-api/pom.xml b/jpo-conflictvisualizer-api/pom.xml index 0e4383be2..c0a8c93ff 100644 --- a/jpo-conflictvisualizer-api/pom.xml +++ b/jpo-conflictvisualizer-api/pom.xml @@ -11,7 +11,7 @@ usdot.jpo.ode jpo-conflictvisualizer-api - 0.0.1-SNAPSHOT + 1.3.0-SNAPSHOT jpo-conflictvisualizer-api Conflict Visualizer @@ -108,13 +108,13 @@ usdot.jpo.ode jpo-geojsonconverter - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT jpo-geojsonconverter usdot.jpo.ode jpo-conflictmonitor - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT jpo-conflictmonitor diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java index 73c2039f5..fc86954a6 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java @@ -52,6 +52,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, ConnectionOfTravelAssessment.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java index 4d93dd31b..e70dee6f7 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java @@ -55,6 +55,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, LaneDirectionOfTravelAssessment.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java index 9976860d0..f1ebc5847 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java @@ -52,6 +52,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, StopLineStopAssessment.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java index 9cf52c4df..dbd2974e7 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java @@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, StopLinePassageAssessment.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java index b8ddb077a..10acf5b09 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java @@ -113,9 +113,9 @@ public long countOdeBsmDataGeo(String originIp, String vehicleId, Long startTime if(endTime != null){ endTimeString = Instant.ofEpochMilli(endTime).toString(); } - query.limit(props.getMaximumResponseSize()); query.addCriteria(Criteria.where("metadata.odeReceivedAt").gte(startTimeString).lte(endTimeString)); query.fields().exclude("recordGeneratedAt"); + query.limit(-1); if (longitude!=null && latitude!=null && distance!=null){ Double[] latitudes = calculateLatitudes(latitude, distance); diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java index c897a708c..a0d5d54b7 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java @@ -65,6 +65,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, BsmEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java index 8b9c9e7ec..1ad1e3acf 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java @@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, ConnectionOfTravelEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/IntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/IntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java index 2ef3c7add..d7e39803a 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/IntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/IntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java @@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, IntersectionReferenceAlignmentEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java index 15d5a28eb..c6c599d75 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java @@ -63,6 +63,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, LaneDirectionOfTravelEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java index e36360efc..07dcd43c6 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java @@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, MapBroadcastRateEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java index 81820a306..5e949ccf7 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java @@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, MapMinimumDataEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java index e675b7d7d..0c9482200 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java @@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SignalGroupAlignmentEvent.class, "CmSignalGroupAlignmentEvents"); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java index 56f3c4d26..430d6fba6 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java @@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SignalStateConflictEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java index f22950183..b9b8a15ab 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java @@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, StopLinePassageEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java index 621439430..873b6fe26 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java @@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, StopLineStopEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java index b5cf3815d..fcaac8bcd 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java @@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SpatBroadcastRateEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java index c1e19c92b..c921cc291 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java @@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SpatMinimumDataEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java index 7f10932ab..d968e4bb3 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java @@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, TimeChangeDetailsEvent.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java index 393d9e724..07631ee70 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java @@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, OdeMapData.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java index 36b24b82e..02d018025 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java @@ -89,6 +89,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, ProcessedMap.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java index 9217c5ff4..54648a49c 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java @@ -51,6 +51,7 @@ public Query getQuery(Integer intersectionID, Integer roadRegulatorID, String no } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, Notification.class, "CmNotification"); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java index 3903b673e..89bbe990e 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java @@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, ConnectionOfTravelNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/IntersectionReferenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/IntersectionReferenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java index 82870798a..215f4dcde 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/IntersectionReferenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/IntersectionReferenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java @@ -45,6 +45,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, IntersectionReferenceAlignmentNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/LaneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/LaneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java index 585fc583d..ff3ba2446 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/LaneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/LaneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java @@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, LaneDirectionOfTravelNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java index 5223f0cbd..4781ce6ac 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java @@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, MapBroadcastRateNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java index f12c047b2..5e6338376 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java @@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SignalGroupAlignmentNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java index 1c9965e39..9a9b5154b 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java @@ -49,6 +49,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, SignalStateConflictNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java index 256fe5601..f8ef94964 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java @@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, SpatBroadcastRateNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java index 7b1e29915..70b4d3929 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java @@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, StopLinePassageNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java index b0364a403..1c16fab66 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java @@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, StopLineStopNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java index 8b900993d..396d1d49b 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/notifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java @@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query){ + query.limit(-1); return mongoTemplate.count(query, TimeChangeDetailsNotification.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java index 121ccdac9..2215556c9 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java @@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); return mongoTemplate.count(query, OdeSpatData.class, collectionName); } diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java index c45a7fa2e..6034eb9f1 100644 --- a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java +++ b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java @@ -76,6 +76,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool } public long getQueryResultCount(Query query) { + query.limit(-1); // remove any count limits return mongoTemplate.count(query, ProcessedSpat.class, collectionName); }