From aa5746265be6038efb3369dae85dbbe5edd40717 Mon Sep 17 00:00:00 2001 From: Marc Wodahl Date: Fri, 11 Oct 2024 11:20:36 -0600 Subject: [PATCH] Remove Filtered TMC Topic deposit from Asn1DecodedDataRouter, TimDepositController --- .../jpo/ode/services/asn1/Asn1DecodedDataRouter.java | 10 ---------- .../dot/its/jpo/ode/traveler/TimDepositController.java | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1DecodedDataRouter.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1DecodedDataRouter.java index e9276b21f..f2b9c393d 100644 --- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1DecodedDataRouter.java +++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1DecodedDataRouter.java @@ -103,16 +103,6 @@ public Object process(String consumedData) { // Send all TIMs also to OdeTimJson timProducer.send(odeProperties.getKafkaTopicOdeTimJson(), getRecord().key(), odeTimData); logger.debug("Submitted to TIM Pojo topic"); - // If the TIM was generated by the TMC broadcast to the filtered TMC TIM Kafka topic - try { - String generatedBy = (new JSONObject(odeTimData)).getJSONObject("metadata") - .getString("recordGeneratedBy"); - if (generatedBy.equalsIgnoreCase("TMC_VIA_SAT") || generatedBy.equalsIgnoreCase("TMC_VIA_SNMP")) { - timProducer.send(odeProperties.getKafkaTopicOdeTimJsonTMCFiltered(), null, odeTimData); - } - } catch (Exception e) { - logger.error("Error while checking recordGeneratedBy field: {}", e.getMessage()); - } } else if (messageId == J2735DSRCmsgID.SPATMessage.getMsgID()) { String odeSpatData = OdeSpatDataCreatorHelper.createOdeSpatData(consumedData).toString(); if (recordType == RecordType.dnMsg) { diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimDepositController.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimDepositController.java index 32c87e474..56dea7112 100644 --- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimDepositController.java +++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimDepositController.java @@ -202,16 +202,6 @@ public synchronized ResponseEntity depositTim(String jsonString, Request String obfuscatedTimData = TimTransmogrifier.obfuscateRsuPassword(odeTimData.toJson()); stringMsgProducer.send(odeProperties.getKafkaTopicOdeTimBroadcastJson(), null, obfuscatedTimData); - // If the TIM was generated by the TMC broadcast to the filtered TMC TIM Kafka topic - try { - String generatedBy = (new JSONObject(obfuscatedTimData)).getJSONObject("metadata").getString("recordGeneratedBy"); - if (generatedBy.equalsIgnoreCase("TMC")) { - stringMsgProducer.send(odeProperties.getKafkaTopicOdeTimJsonTMCFiltered(), null, obfuscatedTimData); - } - } catch (Exception e) { - logger.error("Error while checking recordGeneratedBy field: {}", e.getMessage()); - } - // Now that the message gas been published to OdeBradcastTim topic, it should be // changed to J2735BroadcastTim serialId timMetadata.setSerialId(serialIdJ2735);