Merge pull request #101 from usdot-jpo-ode/content-type-fixes

Updated mock event generation to match dark events.
usdot-jpo-ode · Jul 3, 2024 · 6aebd0f · 6aebd0f
2 parents d5d0933 + e042f43
commit 6aebd0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/api/jpo-conflictmonitor b/api/jpo-conflictmonitor
diff --git a/...-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/mockdata/MockEventGenerator.java b/...-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/mockdata/MockEventGenerator.java
@@ -135,6 +135,7 @@ public static StopLineStopEvent getStopLineStopEvent() {
         event.setTimeStoppedDuringRed(0.1);
         event.setTimeStoppedDuringGreen(1);
         event.setTimeStoppedDuringYellow(0.0);
+        event.setTimeStoppedDuringDark(0);
         event.setSignalGroup(3);
 
         return event;
+2 −1		docker-compose.yml
+2 −0		...nitor/scripts/ConfigController_Tests/concurrent_permissive/deleteIntersection_concurrentPermissiveList.http
+2 −0		...nflictmonitor/scripts/ConfigController_Tests/concurrent_permissive/getDefault_concurrentPermissiveList.http
+2 −0		...tmonitor/scripts/ConfigController_Tests/concurrent_permissive/getIntersection_concurrentPermissiveList.http
+35 −0		...monitor/scripts/ConfigController_Tests/concurrent_permissive/postIntersection_concurrentPermissiveList.http
+35 −0		jpo-conflictmonitor/scripts/monitor-topic.py
+70 −92		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/AppHealthMonitor.java
+60 −9		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/ConfigController.java
+32 −0		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/WebConfig.java
+24 −7		.../jpo/conflictmonitor/monitor/algorithms/map_spat_message_assessment/MapSpatMessageAssessmentParameters.java
+2 −0		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/analytics/StopLineStopAnalytics.java
+0 −16		...flictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/AllowConcurrentPermissiveList.java
+0 −24		...onflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/AllowedConcurrentPermissive.java
+1 −1		...or/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/assessments/StopLineStopAssessmentGroup.java
+16 −0		...nitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/concurrent_permissive/ConnectedLanes.java
+73 −0		...r/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/concurrent_permissive/ConnectedLanesPair.java
+12 −0		...c/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/concurrent_permissive/ConnectedLanesPairList.java
+0 −19		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/BaseConfigMap.java
+0 −3		...onflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultBooleanConfig.java
+0 −13		...lictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultConfigCollection.java
+0 −6		...conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultDoubleConfig.java
+0 −3		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultIntConfig.java
+0 −3		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultLongConfig.java
+0 −5		...conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/DefaultStringConfig.java
+6 −5		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/IntersectionConfig.java
+0 −14		...onitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/IntersectionConfigCollection.java
+0 −96		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/IntersectionKey.java
+0 −75		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/config/RsuConfigKey.java
+1 −0		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/models/events/StopLineStopEvent.java
+0 −7		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/serialization/JsonSerdes.java
+4 −1		...main/java/us/dot/its/jpo/conflictmonitor/monitor/serialization/deserialization/GenericJsonDeserializer.java
+45 −0		...ava/us/dot/its/jpo/conflictmonitor/monitor/serialization/deserialization/GenericJsonStringDeserializer.java
+24 −14		...nitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/topologies/MapSpatMessageAssessmentTopology.java
+1 −1		...main/java/us/dot/its/jpo/conflictmonitor/monitor/topologies/assessments/StopLineStopAssessmentTopology.java
+22 −16		...nflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/topologies/config/ConfigInitializer.java
+22 −4		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/topologies/config/ConfigTopology.java
+15 −2		jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/monitor/utils/SpatUtils.java
+1 −0		jpo-conflictmonitor/src/main/resources/application.yaml
+4 −1		jpo-conflictmonitor/src/test/java/us/dot/its/jpo/conflictmonitor/ConflictMonitorPropertiesTest.java
+49 −1		jpo-conflictmonitor/src/test/java/us/dot/its/jpo/conflictmonitor/monitor/ConfigControllerTest.java
+5 −11		...or/src/test/java/us/dot/its/jpo/conflictmonitor/monitor/assessments/StopLineStopAssessmentTopologyTest.java
+57 −0		...a/us/dot/its/jpo/conflictmonitor/monitor/serialization/deserialization/BaseGenericJsonDeserializerTest.java
+83 −0		...lictmonitor/monitor/serialization/deserialization/BaseGenericJsonDeserializer_ConcurrentPermissiveTest.java
+11 −44		.../java/us/dot/its/jpo/conflictmonitor/monitor/serialization/deserialization/GenericJsonDeserializerTest.java
+22 −0		...conflictmonitor/monitor/serialization/deserialization/GenericJsonDeserializer_ConcurrentPermissiveTest.java
+51 −0		...us/dot/its/jpo/conflictmonitor/monitor/serialization/deserialization/GenericJsonStringDeserializerTest.java
+32 −0		...ctmonitor/monitor/serialization/deserialization/GenericJsonStringDeserializer_ConcurrentPermissiveTest.java
+1 −1		jpo-conflictmonitor/src/test/resources/logback-test.xml
+120 −0		jpo-deduplicator/src/main/java/us/dot/its/jpo/deduplicator/DeduplicatorProperties.java
+41 −26		jpo-deduplicator/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/DeduplicatorServiceController.java
+20 −0		jpo-deduplicator/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/models/OdeBsmPair.java
+7 −0		jpo-deduplicator/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/serialization/PairSerdes.java
+171 −0		...deduplicator/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/topologies/BsmDeduplicatorTopology.java
+1 −0		...tor/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/topologies/ProcessedMapDeduplicatorTopology.java
+1 −0		.../src/main/java/us/dot/its/jpo/deduplicator/deduplicator/topologies/ProcessedMapWktDeduplicatorTopology.java
+16 −8		...deduplicator/src/main/java/us/dot/its/jpo/deduplicator/deduplicator/topologies/TimDeduplicatorTopology.java
+40 −9		jpo-deduplicator/src/main/resources/application.yaml
+116 −0		jpo-deduplicator/src/test/java/deduplicator/BsmDeduplicatorTopologyTest.java