redid using existing model

dan-du-car · Feb 1, 2018 · a2a8217 · a2a8217
1 parent 034368e
commit a2a8217
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 62 deletions.
diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeAsn1Metadata.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeAsn1Metadata.java
@@ -3,22 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class OdeAsn1Metadata extends OdeLogMetadata {
+public class OdeAsn1Metadata extends OdeLogMetadataReceived {
 
  private static final long serialVersionUID = -8601265839394150140L;
 
  private List<Asn1Encoding> encodings = new ArrayList<Asn1Encoding>();
 
- private ReceivedMessageDetails receivedMessageDetails;
-
- public ReceivedMessageDetails getReceivedMessageDetails() {
- return receivedMessageDetails;
- }
-
- public void setReceivedMessageDetails(ReceivedMessageDetails receivedMessageDetails) {
- this.receivedMessageDetails = receivedMessageDetails;
- }
-
  public OdeAsn1Metadata() {
  super();
  }

diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeDriverAlertMetadata.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeDriverAlertMetadata.java
diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeLogMetadataReceived.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeLogMetadataReceived.java
@@ -0,0 +1,25 @@
+package us.dot.its.jpo.ode.model;
+
+public class OdeLogMetadataReceived extends OdeLogMetadata {
+
+ private static final long serialVersionUID = -705610489887212191L;
+
+ private ReceivedMessageDetails receivedMessageDetails;
+
+ public OdeLogMetadataReceived() {
+ super();
+ }
+
+ public OdeLogMetadataReceived(OdeMsgPayload payload) {
+ super(payload);
+ }
+
+ public ReceivedMessageDetails getReceivedMessageDetails() {
+ return receivedMessageDetails;
+ }
+
+ public void setReceivedMessageDetails(ReceivedMessageDetails receivedMessageDetails) {
+ this.receivedMessageDetails = receivedMessageDetails;
+ }
+
+}
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/OdeLogMetadataCreatorHelper.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/OdeLogMetadataCreatorHelper.java
@@ -3,11 +3,11 @@
 import us.dot.its.jpo.ode.importer.parser.BsmLogFileParser;
 import us.dot.its.jpo.ode.importer.parser.LogFileParser;
 import us.dot.its.jpo.ode.importer.parser.TimLogFileParser;
-import us.dot.its.jpo.ode.model.OdeAsn1Metadata;
 import us.dot.its.jpo.ode.model.OdeAsn1WithBsmMetadata;
 import us.dot.its.jpo.ode.model.OdeLogMetadata;
-import us.dot.its.jpo.ode.model.ReceivedMessageDetails;
+import us.dot.its.jpo.ode.model.OdeLogMetadataReceived;
 import us.dot.its.jpo.ode.model.OdeMsgMetadata.GeneratedBy;
+import us.dot.its.jpo.ode.model.ReceivedMessageDetails;
 
 public class OdeLogMetadataCreatorHelper {
 
@@ -27,11 +27,11 @@ public static void updateLogMetadata(OdeLogMetadata metadata, LogFileParser logF
  OdeAsn1WithBsmMetadata odeAsn1WithBsmMetadata = (OdeAsn1WithBsmMetadata) metadata;
  odeAsn1WithBsmMetadata.setBsmSource(bsmLogFileParser.getBsmSource());
  } else if (logFileParser instanceof TimLogFileParser &&
- metadata instanceof OdeAsn1Metadata) {
+ metadata instanceof OdeLogMetadataReceived) {
  ReceivedMessageDetails receivedMsgDetails = 
  TimDecoderHelper.buildReceivedMessageDetails((TimLogFileParser) logFileParser);
- OdeAsn1Metadata odeAsn1Metadata = (OdeAsn1Metadata) metadata;
- odeAsn1Metadata.setReceivedMessageDetails(receivedMsgDetails);
+ OdeLogMetadataReceived odeLogMetadataReceived = (OdeLogMetadataReceived) metadata;
+ odeLogMetadataReceived.setReceivedMessageDetails(receivedMsgDetails);
  }
  }
 

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisher.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisher.java
@@ -10,13 +10,11 @@
 
 import us.dot.its.jpo.ode.coder.OdeLogMetadataCreatorHelper;
 import us.dot.its.jpo.ode.coder.StringPublisher;
-import us.dot.its.jpo.ode.coder.TimDecoderHelper;
 import us.dot.its.jpo.ode.importer.ImporterDirectoryWatcher.ImporterFileType;
 import us.dot.its.jpo.ode.importer.parser.BsmLogFileParser;
 import us.dot.its.jpo.ode.importer.parser.DriverAlertFileParser;
 import us.dot.its.jpo.ode.importer.parser.FileParser.ParserStatus;
 import us.dot.its.jpo.ode.importer.parser.LogFileParser;
-import us.dot.its.jpo.ode.importer.parser.TimLogFileParser;
 import us.dot.its.jpo.ode.model.Asn1Encoding;
 import us.dot.its.jpo.ode.model.Asn1Encoding.EncodingRule;
 import us.dot.its.jpo.ode.model.OdeAsn1Data;
@@ -25,11 +23,10 @@
 import us.dot.its.jpo.ode.model.OdeAsn1WithBsmMetadata;
 import us.dot.its.jpo.ode.model.OdeData;
 import us.dot.its.jpo.ode.model.OdeDriverAlertData;
-import us.dot.its.jpo.ode.model.OdeDriverAlertMetadata;
 import us.dot.its.jpo.ode.model.OdeDriverAlertPayload;
 import us.dot.its.jpo.ode.model.OdeLogMetadata;
+import us.dot.its.jpo.ode.model.OdeLogMetadataReceived;
 import us.dot.its.jpo.ode.model.OdeMsgPayload;
-import us.dot.its.jpo.ode.model.ReceivedMessageDetails;
 import us.dot.its.jpo.ode.util.JsonUtils;
 import us.dot.its.jpo.ode.util.XmlUtils;
 
@@ -98,9 +95,7 @@ private void publish(XmlUtils xmlUtils) throws JsonProcessingException {
  if (fileParser instanceof DriverAlertFileParser){
  logger.debug("Publishing a driverAlert.");
  msgPayload = new OdeDriverAlertPayload(((DriverAlertFileParser) fileParser).getAlert());
-
- ReceivedMessageDetails receivedMsgDetails = TimDecoderHelper.buildReceivedMessageDetails((TimLogFileParser) fileParser);
- msgMetadata = new OdeDriverAlertMetadata(msgPayload, receivedMsgDetails);
+ msgMetadata = new OdeLogMetadataReceived(msgPayload);
 
  msgMetadata.getSerialId().setBundleId(bundleId.get()).addRecordId(1);
  OdeLogMetadataCreatorHelper.updateLogMetadata(msgMetadata, fileParser);