ODE-787 publish j2735 TIM

dan-du-car · Sep 4, 2018 · a38c05b · a38c05b
1 parent 7990d33
commit a38c05b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/docs/ODE_Output_Schema_Reference.docx b/docs/ODE_Output_Schema_Reference.docx
diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/context/AppContext.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/context/AppContext.java
@@ -30,6 +30,7 @@ public class AppContext {
  public static final String ODE_HOSTNAME = "ODE_HOSTNAME";
  public static final String PAYLOAD_STRING = "payload";
  public static final String METADATA_STRING = "metadata";
+ public static final String ODE_ASN1_DATA = "OdeAsn1Data";
  public static final String DATA_STRING = "data";
  public static final String ENCODINGS_STRING = "encodings";
  public static final String PAYLOAD_TYPE_STRING = "payloadType";

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java
@@ -104,6 +104,7 @@ public class OdeProperties implements EnvironmentAware {
  private String kafkaTopicOdeTimRxJson= "topic.OdeTimRxJson";
  private String kafkaTopicOdeTimBroadcastPojo= "topic.OdeTimBroadcastPojo";
  private String kafkaTopicOdeTimBroadcastJson= "topic.OdeTimBroadcastJson";
+ private String kafkaTopicJ2735TimBroadcastJson= "topic.J2735TimBroadcastJson";
  private String kafkaTopicFilteredOdeTimJson = "topic.FilteredOdeTimJson";
 
  // DriverAlerts
@@ -697,6 +698,14 @@ public void setKafkaTopicOdeTimBroadcastJson(String kafkaTopicOdeTimBroadcastJso
  this.kafkaTopicOdeTimBroadcastJson = kafkaTopicOdeTimBroadcastJson;
  }
 
+ public String getKafkaTopicJ2735TimBroadcastJson() {
+ return kafkaTopicJ2735TimBroadcastJson;
+ }
+
+ public void setKafkaTopicJ2735TimBroadcastJson(String kafkaTopicJ2735TimBroadcastJson) {
+ this.kafkaTopicJ2735TimBroadcastJson = kafkaTopicJ2735TimBroadcastJson;
+ }
+
  public String getKafkaTopicFilteredOdeTimJson() {
  return kafkaTopicFilteredOdeTimJson;
  }

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1CommandManager.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/services/asn1/Asn1CommandManager.java
@@ -209,7 +209,7 @@ public String packageSignedTimIntoAsd(OdeTravelerInputData travelerInputData, St
  message.set(AppContext.PAYLOAD_STRING, payloadObj);
 
  ObjectNode root = JsonUtils.newNode();
- root.set("OdeAsn1Data", message);
+ root.set(AppContext.ODE_ASN1_DATA, message);
 
  outputXml = XmlUtils.toXmlS(root);
 

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimController.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimController.java
@@ -4,6 +4,7 @@
 import java.text.ParseException;
 import java.util.HashMap;
 
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snmp4j.PDU;
@@ -28,6 +29,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import us.dot.its.jpo.ode.OdeProperties;
+import us.dot.its.jpo.ode.coder.OdeTimDataCreatorHelper;
 import us.dot.its.jpo.ode.context.AppContext;
 import us.dot.its.jpo.ode.model.Asn1Encoding;
 import us.dot.its.jpo.ode.model.Asn1Encoding.EncodingRule;
@@ -319,6 +321,12 @@ public ResponseEntity<String> depositTim(String jsonString, int verb) {
  asd = buildASD(travelerInputData);
  }
  xmlMsg = convertToXml(asd, encodableTim);
+ // publish Broadcast TIM to a J2735 compliant topic.
+ JSONObject jsonMsg = XmlUtils.toJSONObject(xmlMsg);
+ String j2735Tim = OdeTimDataCreatorHelper.createOdeTimData(jsonMsg.getJSONObject(AppContext.ODE_ASN1_DATA)).toString();
+ stringMsgProducer.send(odeProperties.getKafkaTopicJ2735TimBroadcastJson(), null, j2735Tim);
+ // publish J2735 TIM also to general un-filtered TIM topic
+ stringMsgProducer.send(odeProperties.getKafkaTopicOdeTimJson(), null, j2735Tim);
  stringMsgProducer.send(odeProperties.getKafkaTopicAsn1EncoderInput(), null, xmlMsg);
  } catch (JsonUtilsException | XmlUtilsException | ParseException e) {
  String errMsg = "Error sending data to ASN.1 Encoder module: " + e.getMessage();
@@ -474,7 +482,7 @@ private String convertToXml(DdsAdvisorySituationData asd, ObjectNode encodableTi
  message.set(AppContext.PAYLOAD_STRING, payloadObj);
 
  ObjectNode root = JsonUtils.newNode();
- root.set("OdeAsn1Data", message);
+ root.set(AppContext.ODE_ASN1_DATA, message);
 
  // Convert to XML
  logger.debug("pre-xml: {}", root);