Live view API Code cleanup

CDOT-CV · Jan 8, 2024 · 1257831 · 1257831
1 parent 230ffc7
commit 1257831
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 178 deletions.
diff --git a/...izer-api/src/main/java/us/dot/its/jpo/ode/api/WebSocketControllers/LiveMapController.java b/...izer-api/src/main/java/us/dot/its/jpo/ode/api/WebSocketControllers/LiveMapController.java
diff --git a/...zer-api/src/main/java/us/dot/its/jpo/ode/api/WebSocketControllers/LiveSpatController.java b/...zer-api/src/main/java/us/dot/its/jpo/ode/api/WebSocketControllers/LiveSpatController.java
diff --git a/...ctvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/LiveFeedController.java b/...ctvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/LiveFeedController.java
diff --git a/...flictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/StompController.java b/...flictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/StompController.java
@@ -16,70 +16,64 @@
 
 @Controller
 public class StompController {
-
 
     @Autowired
     private SimpMessagingTemplate brokerMessagingTemplate;
 
     // @Scheduled(fixedRate = 10000) // Broadcast a message every second
     public void broadcastMessage(String topic, String message) {
-        System.out.println("Sending Message to Topic" + topic);
         brokerMessagingTemplate.convertAndSend(topic, message);
     }
 
-
-    public String buildTopicName(int roadRegulatorID, int intersectionID,  String messageType){
+    public String buildTopicName(int roadRegulatorID, int intersectionID, String messageType) {
         return String.format("/live/%d/%d/%s", roadRegulatorID, intersectionID, messageType);
     }
 
-
-
-    public void broadcastSpat(ProcessedSpat spat){
+    public void broadcastSpat(ProcessedSpat spat) {
         Integer intersectionID = spat.getIntersectionId();
-        if(intersectionID == null){
+        if (intersectionID == null) {
             intersectionID = -1;
         }
 
         Integer roadRegulatorID = spat.getRegion();
-        if(roadRegulatorID == null){
+        if (roadRegulatorID == null) {
             roadRegulatorID = -1;
         }
 
-        if(intersectionID != -1){
-           broadcastMessage(buildTopicName(roadRegulatorID, intersectionID,  "spat"), spat.toString()); 
+        if (intersectionID != -1) {
+            broadcastMessage(buildTopicName(roadRegulatorID, intersectionID, "spat"), spat.toString());
         }
     }
 
-    public void broadcastMap(ProcessedMap<LineString> map){
+    public void broadcastMap(ProcessedMap<LineString> map) {
         Integer intersectionID = map.getProperties().getIntersectionId();
-        if(intersectionID == null){
+        if (intersectionID == null) {
             intersectionID = -1;
         }
 
         Integer roadRegulatorID = map.getProperties().getRegion();
-        if(roadRegulatorID == null){
+        if (roadRegulatorID == null) {
             roadRegulatorID = -1;
         }
 
-        if(intersectionID != -1){
-           broadcastMessage(buildTopicName(roadRegulatorID, intersectionID, "map"), map.toString()); 
+        if (intersectionID != -1) {
+            broadcastMessage(buildTopicName(roadRegulatorID, intersectionID, "map"), map.toString());
         }
     }
 
-    public void broadcastBSM(BsmIntersectionIdKey key, OdeBsmData bsm){
-        if(key.getIntersectionId() != -1){
-           broadcastMessage(buildTopicName(key.getRegion(), key.getIntersectionId(), "bsm"), bsm.toString()); 
+    public void broadcastBSM(BsmIntersectionIdKey key, OdeBsmData bsm) {
+        if (key.getIntersectionId() != -1) {
+            broadcastMessage(buildTopicName(-1, key.getIntersectionId(), "bsm"), bsm.toString());
         }
     }
 
-
-
-    // Sample Format for receiving a message from a client, and broadcasting a response back. Not needed in current model, but left for future reference
+    // Sample Format for receiving a message from a client, and broadcasting a
+    // response back. Not needed in current model, but left for future reference
 
     // @MessageMapping("/server") // Called when Data is received on /broker/server
     // // @SendTo("/live/spat") // Reply with information on /live/spat
     // public String getSpat(String message) {
-    //     System.out.println("Incoming message: " + message);
-    //     return "Response From Server: " + message;
+    // System.out.println("Incoming message: " + message);
+    // return "Response From Server: " + message;
     // }
 }
diff --git a/...ualizer-api/src/main/java/us/dot/its/jpo/ode/api/topologies/BsmSocketForwardTopology.java b/...ualizer-api/src/main/java/us/dot/its/jpo/ode/api/topologies/BsmSocketForwardTopology.java
@@ -56,7 +56,6 @@ public Topology buildTopology() {
         KStream<BsmIntersectionIdKey, OdeBsmData> inputStream = builder.stream(topicName, Consumed.with(JsonSerdes.BsmIntersectionIdKey(), JsonSerdes.OdeBsm()));
 
         inputStream.foreach((key, value) -> {
-            System.out.println("Received BSM Message" + key);
             controller.broadcastBSM(key, value);
         });
 

diff --git a/...ualizer-api/src/main/java/us/dot/its/jpo/ode/api/topologies/MapSocketForwardTopology.java b/...ualizer-api/src/main/java/us/dot/its/jpo/ode/api/topologies/MapSocketForwardTopology.java
@@ -54,7 +54,6 @@ public Topology buildTopology() {
         KStream<String, ProcessedMap<LineString>> inputStream = builder.stream(topicName, Consumed.with(Serdes.String(), JsonSerdes.ProcessedMapGeoJson()));
 
         inputStream.foreach((key, value) -> {
-            System.out.println("Received MAP Message");
             controller.broadcastMap(value);
         });