Fixed Tim Decoding

CDOT-CV · May 10, 2024 · 8e6de09 · 8e6de09
1 parent c047b4a
commit 8e6de09
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 76 deletions.
diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictApiApplication.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictApiApplication.java
@@ -7,12 +7,7 @@
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 import us.dot.its.jpo.ode.api.asn1.DecoderManager;
-import us.dot.its.jpo.ode.api.models.MessageType;
-import us.dot.its.jpo.ode.api.models.messages.BsmDecodedMessage;
-import us.dot.its.jpo.ode.api.models.messages.DecodedMessage;
-import us.dot.its.jpo.ode.api.models.messages.EncodedMessage;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -33,32 +28,7 @@ public static void main(String[] args) {
         SpringApplication.run(ConflictApiApplication.class, args);
         System.out.println("Started Conflict Monitor API");
         System.out.println("Conflict Monitor API docs page found here: http://localhost:8081/swagger-ui/index.html");
-        System.out.println("Startup Complete");
-
-        // DecodedMessage bsm = manager.decode(new EncodedMessage("00145144ad0b7947c2ed9ad2748035a4e8ff880000000fd2229199307d7d07d0b17fff05407d12720038c000fe72c107b001ea88fffeb4002127c0009000000fdfffe3ffff9407344704000041910120100000000efc10609c26e900e11f61a947802127c0009000000fdfffe3ffff9407453304000041910120100000008ffffe501ca508100000000000a508100000404804000000849f00024000003f7fff8ffffe501ca508100000fe501ca508100000fffe501ca51c10000000024000003f7fff8ffffe501ca51c1", MessageType.BSM));
-
-        // System.out.println(bsm);
-
-
-
-
-        // System.out.println("Fully Decoded BSM" + bsm.getBsm());
-        // OdeBsmData decodeTest;
-        // try {
-        //     decodeTest = OdeBsmDataCreatorHelper.createOdeBsmData("<?xml version=\"1.0\"?><OdeAsn1Data><metadata><bsmSource>RV</bsmSource><logFileName/><recordType>bsmTx</recordType><securityResultCode>success</securityResultCode><receivedMessageDetails><locationData><latitude/><longitude/><elevation/><speed/><heading/></locationData><rxSource>RV</rxSource></receivedMessageDetails><encodings><encodings><elementName>unsecuredData</elementName><elementType>MessageFrame</elementType><encodingRule>UPER</encodingRule></encodings></encodings><payloadType>us.dot.its.jpo.ode.model.OdeAsn1Payload</payloadType><serialId><streamId>f48cd9fa-cf32-4542-9cfd-4ff0542d56b0</streamId><bundleSize>1</bundleSize><bundleId>0</bundleId><recordId>0</recordId><serialNumber>0</serialNumber></serialId><odeReceivedAt>2024-05-07T18:45:29.796137Z</odeReceivedAt><schemaVersion>6</schemaVersion><maxDurationTime>0</maxDurationTime><recordGeneratedAt/><recordGeneratedBy/><sanitized>false</sanitized><odePacketID/><odeTimStartDateTime/><originIp>10.165.5.230</originIp></metadata><payload><dataType>MessageFrame</dataType><data><MessageFrame><messageId>20</messageId><value><BasicSafetyMessage><coreData><msgCnt>105</msgCnt><id>21234841</id><secMark>29609</secMark><lat>403192909</lat><long>-1117049264</long><elev>14321</elev><accuracy><semiMajor>40</semiMajor><semiMinor>40</semiMinor><orientation>8100</orientation></accuracy><transmission><forwardGears/></transmission><speed>542</speed><heading>13208</heading><angle>127</angle><accelSet><long>2001</long><lat>2001</lat><vert>-127</vert><yaw>0</yaw></accelSet><brakes><wheelBrakes>01111</wheelBrakes><traction><unavailable/></traction><abs><unavailable/></abs><scs><unavailable/></scs><brakeBoost><unavailable/></brakeBoost><auxBrakes><unavailable/></auxBrakes></brakes><size><width>320</width><length>1280</length></size></coreData><partII><PartIIcontent><partII-Id>0</partII-Id><partII-Value><VehicleSafetyExtensions><pathHistory><crumbData><PathHistoryPoint><latOffset>-14434</latOffset><lonOffset>6167</lonOffset><elevationOffset>8</elevationOffset><timeOffset>1268</timeOffset></PathHistoryPoint><PathHistoryPoint><latOffset>-32277</latOffset><lonOffset>13981</lonOffset><elevationOffset>12</elevationOffset><timeOffset>2522</timeOffset></PathHistoryPoint></crumbData></pathHistory><pathPrediction><radiusOfCurve>4079</radiusOfCurve><confidence>120</confidence></pathPrediction></VehicleSafetyExtensions></partII-Value></PartIIcontent><PartIIcontent><partII-Id>2</partII-Id><partII-Value><SupplementalVehicleExtensions><classification>54</classification><classDetails><keyType>54</keyType><hpmsType><none/></hpmsType></classDetails><vehicleData><height>58</height><mass>109</mass></vehicleData><weatherReport><isRaining><error/></isRaining><rainRate>65535</rainRate><precipSituation><unknown/></precipSituation><solarRadiation>65535</solarRadiation><friction>101</friction><roadFriction>0</roadFriction></weatherReport><weatherProbe><airTemp>51</airTemp></weatherProbe></SupplementalVehicleExtensions></partII-Value></PartIIcontent></partII></BasicSafetyMessage></value></MessageFrame></data></payload></OdeAsn1Data>");
-        //     System.out.println(decodeTest);
-        // } catch (XmlUtilsException e) {
-        //     // TODO Auto-generated catch block
-        //     e.printStackTrace();
-        // }   
-    }
-
-    @Bean
-    public void test(){
-        System.out.println("Running Decoder");
-        DecodedMessage map = manager.decode(new EncodedMessage("0012839338023000205e96094d40df4c2ca626c8516e02dc3c2010640000000289e01c009f603f42e88039900000000a41107b027d80fd0a4200c6400000002973021c09f603de0c16029200000080002a8a008d027d98fee805404fb0e1085f60588200028096021200000080002aa0007d027d98fe9802e04fb1200c214456228000a02b1240005022c03240000020000d56b40bc04fb35ff655e2c09f623fb81c835fec0db240a0a2bff4aebf82c660000804b0089000000800025670034013ecd7fb9578e027d9aff883c4e050515ffa567a41635000040258024800000400012b8f81f409f663fac094013ecd7fc83ddb02829affa480bc04fb02c6e0000804b09c5000000200035ea98a9604f60da6c7c113d505c35ffe941d409f65c05034c050500c9880004409bc800000006d2bd3cec813c40cde062c1fd400000200008791ea3db3cf380a009f666f05005813d80ffe0a0588c00040092106a00000000bc75cac009f66db54c04a813d80a100801241ed40000000078ebae3b6da7a008809e2050904008811f100000000bc72389009f60eca8002049c400000002f1b2ca3027d93a71fa813ec204bc400000002f1b2b34027b0397608880cd10000000039b8e1a51036820505080d51000000003a7461ed1036760505080dd1000000003b2f62311006260505160bca00000080002b785e2a80a0a6c028de728145037f1f9e456488000202b2540001022c1894000001000057058c5b81414d806dbcd4028a18f4df23a050502c8d0000404b05a5000000800035b6471bc05053602431f380a2864087bdb0141458064ab0d6c00053fc013ec0b0680006012c15940000020000d6c06c6581414d807fb972028a1901d78dc050536020ec1800a0a6c039d639813d80b0780006012c1494000002000096ab8c6581414d8062be32028a1b01417e04050a360172d77009e2058440003009409c200000040006b3486a480a0a1cab7134c8117dcc02879b018fae2c050f3601ced54809e21012720000000067fbad0007e7e84045c80000000100661580958004041c8000000019f3658401cdfa2c0d64000002000144016c02c36ddfff0282984acc1ee05052c36f0ac02828669d82da8f821480a0a10f140002c8e0001004b03190000008000519fd190c43b2e0066108b08401428c342a0ce02828258a0604a6be959aee0e6050502c920001004b02d90000008000459fa164404fb30a8580a00a14619c306701414c32ce10e02829659081f814141029030164b000080200",MessageType.MAP));
-        System.out.println(map);
-
+        System.out.println("Startup Complete"); 
     }
 
 //    @Bean

diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/asn1/DecoderManager.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/asn1/DecoderManager.java
@@ -94,20 +94,16 @@ public DecodedMessage decode(EncodedMessage message){
                 decoder = new BsmDecoder();
             }
             else if(message.getType() == MessageType.MAP){
-                // decoder = new MapDecoder();
                 decoder = mapDecoder;
             }else if(message.getType() == MessageType.SPAT){
-                // decoder = new SpatDecoder();
                 decoder = spatDecoder;
             }else if(message.getType() == MessageType.SRM){
-                // decoder = new SrmDecoder();
                 decoder = srmDecoder;
             }else if(message.getType() == MessageType.SSM){
-                // decoder = new SsmDecoder();
                 decoder = ssmDecoder;
             }else if(message.getType() == MessageType.TIM){
-                // decoder = new TimDecoder();
                 decoder = timDecoder;
+                // return new DecodedMessage(payload, message.getType(), "Ode Does not support ODE Serialization / Deserialization");
             }else{
                 return new DecodedMessage(payload, message.getType(), "No Valid Decoder found for Message Type");
             }

diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/asn1/TimDecoder.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/asn1/TimDecoder.java
@@ -3,8 +3,12 @@
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import net.minidev.json.JSONObject;
 import us.dot.its.jpo.ode.api.models.messages.TimDecodedMessage;
 import us.dot.its.jpo.ode.api.models.messages.DecodedMessage;
 import us.dot.its.jpo.ode.api.models.messages.EncodedMessage;
@@ -16,6 +20,7 @@
 import us.dot.its.jpo.ode.model.OdeTimData;
 import us.dot.its.jpo.ode.model.OdeTimMetadata;
 import us.dot.its.jpo.ode.model.OdeTimPayload;
+import us.dot.its.jpo.ode.plugin.j2735.builders.TravelerMessageFromHumanToAsnConverter;
 import us.dot.its.jpo.ode.model.OdeData;
 import us.dot.its.jpo.ode.model.OdeHexByteArray;
 import us.dot.its.jpo.ode.model.OdeLogMetadata.RecordType;
@@ -27,7 +32,7 @@
 
 @Component
 public class TimDecoder implements Decoder {
-
+    ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
     public DecodedMessage decode(EncodedMessage message) {
@@ -43,10 +48,10 @@ public DecodedMessage decode(EncodedMessage message) {
 
             // Send String through ASN.1 Decoder to get Decoded XML Data
             String decodedXml = DecoderManager.decodeXmlWithAcm(xml);
-
+            // String decodedXml = mockTim();
 
             // Convert to Ode Json 
-            OdeTimData tim = getAsOdeJson(decodedXml);
+            ObjectNode tim = XmlUtils.toObjectNode(decodedXml);
 
             // build output data structure
             DecodedMessage decodedMessage = new TimDecodedMessage(tim, message.getAsn1Message(), "");
@@ -84,37 +89,14 @@ public OdeData getAsOdeData(String encodedData) {
 
     @Override
     public OdeTimData getAsOdeJson(String consumedData) throws XmlUtilsException {
-        ObjectNode consumed = XmlUtils.toObjectNode(consumedData);
 
-        JsonNode metadataNode = consumed.findValue(AppContext.METADATA_STRING);
-        if (metadataNode instanceof ObjectNode) {
-            ObjectNode object = (ObjectNode) metadataNode;
-            object.remove(AppContext.ENCODINGS_STRING);
-        }
+        // There is no proper deserilizer for TIM data into the ODE tim format. This function is not used here.
 
-        JsonNode payloadNode = consumed.findValue("TravelerInformationMessage");
-        if (payloadNode instanceof ObjectNode) {
-            ObjectNode object = (ObjectNode) payloadNode;
-            object.remove(AppContext.ENCODINGS_STRING);
-        }
-
-        OdeTimMetadata metadata = (OdeTimMetadata) JsonUtils.fromJson(
-            metadataNode.toString(), OdeTimMetadata.class);
-
-        OdeTimPayload payload = (OdeTimPayload) JsonUtils.fromJson(
-            payloadNode.toString(), OdeTimPayload.class);
-
-        /*
-        *  ODE-755 and ODE-765 Starting with schemaVersion=5 receivedMessageDetails 
-        *  will be present in BSM metadata. None should be present in prior versions.
-        */
-        if (metadata.getSchemaVersion() <= 4) {
-            metadata.setReceivedMessageDetails(null);
-        }
-
-        // OdeTimPayload payload = new OdeTimPayload(
-        //     TimBuilder.genericTim(consumed.findValue("TravelerInformationMessage")));
-        return new OdeTimData(metadata, payload);
+        return null;
+    }
+
+    public String mockTim(){
+        return "<?xml version=\"1.0\"?><OdeAsn1Data><metadata><logFileName/><recordType>timMsg</recordType><securityResultCode/><receivedMessageDetails/><encodings><encodings><elementName>unsecuredData</elementName><elementType>MessageFrame</elementType><encodingRule>UPER</encodingRule></encodings></encodings><payloadType>us.dot.its.jpo.ode.model.OdeAsn1Payload</payloadType><serialId><streamId>d768dfa6-9b37-4a98-b16c-c0c68e5989c5</streamId><bundleSize>1</bundleSize><bundleId>0</bundleId><recordId>0</recordId><serialNumber>0</serialNumber></serialId><odeReceivedAt>2024-05-10T17:43:23.093127553Z</odeReceivedAt><schemaVersion>6</schemaVersion><maxDurationTime>0</maxDurationTime><recordGeneratedAt/><recordGeneratedBy>RSU</recordGeneratedBy><sanitized>false</sanitized><odePacketID/><odeTimStartDateTime/><originIp>172.18.0.1</originIp></metadata><payload><dataType>MessageFrame</dataType><data><MessageFrame><messageId>31</messageId><value><TravelerInformation><msgCnt>1</msgCnt><timeStamp>449089</timeStamp><packetID>0000000000000BBC2B</packetID><urlB>null</urlB><dataFrames><TravelerDataFrame><sspTimRights>1</sspTimRights><frameType><advisory/></frameType><msgId><roadSignID><position><lat>411269876</lat><long>-1047269563</long></position><viewAngle>1111111111111111</viewAngle><mutcdCode><warning/></mutcdCode></roadSignID></msgId><startYear>2018</startYear><startTime>448260</startTime><duratonTime>1440</duratonTime><priority>5</priority><sspLocationRights>1</sspLocationRights><regions><GeographicalPath><name>westbound_I-80_366.0_365.0_RSU-10.145.1.100_RW_4456</name><id><region>0</region><id>0</id></id><anchor><lat>411269876</lat><long>-1047269563</long></anchor><laneWidth>32700</laneWidth><directionality><both/></directionality><closedPath><false/></closedPath><direction>0000000000010000</direction><description><path><scale>0</scale><offset><xy><nodes><NodeXY><delta><node-LatLon><lon>-1047287423</lon><lat>411264686</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047305390</lon><lat>411260104</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047323629</lon><lat>411256185</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047342080</lon><lat>411252886</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047360706</lon><lat>411250207</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047379480</lon><lat>411248201</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047398354</lon><lat>411246839</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047417290</lon><lat>411246133</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047436246</lon><lat>411245796</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047455202</lon><lat>411245470</lat></node-LatLon></delta></NodeXY><NodeXY><delta><node-LatLon><lon>-1047474159</lon><lat>411245173</lat></node-LatLon></delta></NodeXY></nodes></xy></offset></path></description></GeographicalPath></regions><sspMsgRights1>1</sspMsgRights1><sspMsgRights2>1</sspMsgRights2><content><advisory><SEQUENCE><item><itis>777</itis></item></SEQUENCE><SEQUENCE><item><itis>13579</itis></item></SEQUENCE></advisory></content><url>null</url></TravelerDataFrame></dataFrames></TravelerInformation></value></MessageFrame></data></payload></OdeAsn1Data>";
     }
 
 }
diff --git a/...ictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/DecoderController.java b/...ictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/DecoderController.java
@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import us.dot.its.jpo.ode.api.models.MessageType;
-import us.dot.its.jpo.ode.api.models.TypePayload;
 import us.dot.its.jpo.ode.api.models.messages.DecodedMessage;
 import us.dot.its.jpo.ode.api.models.messages.EncodedMessage;
 import us.dot.its.jpo.ode.mockdata.MockDecodedMessageGenerator;

diff --git a/...isualizer-api/src/main/java/us/dot/its/jpo/ode/api/models/messages/TimDecodedMessage.java b/...isualizer-api/src/main/java/us/dot/its/jpo/ode/api/models/messages/TimDecodedMessage.java
@@ -1,16 +1,18 @@
 package us.dot.its.jpo.ode.api.models.messages;
 
 import us.dot.its.jpo.ode.api.models.MessageType;
-import us.dot.its.jpo.ode.model.OdeTimData;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Setter
 @Getter
 public class TimDecodedMessage extends DecodedMessage{
-    public OdeTimData tim;
+    public ObjectNode tim;
 
-    public TimDecodedMessage(OdeTimData tim, String asn1Text, String decodeErrors) {
+    public TimDecodedMessage(ObjectNode tim, String asn1Text, String decodeErrors) {
         super(asn1Text, MessageType.TIM, decodeErrors);
         this.tim = tim;
     }

diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/mockdata/MockTimGenerator.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/mockdata/MockTimGenerator.java
@@ -6,21 +6,21 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
-import us.dot.its.jpo.ode.model.OdeTimData;
 public class MockTimGenerator {
 
     static String timString = "{\"metadata\":{\"securityResultCode\":\"\",\"recordGeneratedBy\":\"RSU\",\"schemaVersion\":\"6\",\"odePacketID\":\"\",\"sanitized\":\"false\",\"recordType\":\"timMsg\",\"recordGeneratedAt\":\"\",\"maxDurationTime\":\"0\",\"odeTimStartDateTime\":\"\",\"receivedMessageDetails\":\"\",\"payloadType\":\"us.dot.its.jpo.ode.model.OdeTimPayload\",\"serialId\":{\"recordId\":\"0\",\"serialNumber\":\"0\",\"streamId\":\"02fd3137-f282-4f06-b735-66c5e2e963be\",\"bundleSize\":\"1\",\"bundleId\":\"0\"},\"logFileName\":\"\",\"odeReceivedAt\":\"2024-05-09T15:33:57.386279283Z\",\"originIp\":\"172.18.0.1\"},\"payload\":{\"data\":{\"MessageFrame\":{\"messageId\":\"31\",\"value\":{\"TravelerInformation\":{\"timeStamp\":\"449089\",\"packetID\":\"0000000000000BBC2B\",\"urlB\":\"null\",\"dataFrames\":{\"TravelerDataFrame\":{\"regions\":{\"GeographicalPath\":{\"closedPath\":{\"false\":\"\"},\"anchor\":{\"lat\":\"411269876\",\"long\":\"-1047269563\"},\"name\":\"westbound_I-80_366.0_365.0_RSU-10.145.1.100_RW_4456\",\"laneWidth\":\"32700\",\"directionality\":{\"both\":\"\"},\"description\":{\"path\":{\"offset\":{\"xy\":{\"nodes\":{\"NodeXY\":[{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047287423\",\"lat\":\"411264686\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047305390\",\"lat\":\"411260104\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047323629\",\"lat\":\"411256185\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047342080\",\"lat\":\"411252886\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047360706\",\"lat\":\"411250207\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047379480\",\"lat\":\"411248201\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047398354\",\"lat\":\"411246839\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047417290\",\"lat\":\"411246133\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047436246\",\"lat\":\"411245796\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047455202\",\"lat\":\"411245470\"}}},{\"delta\":{\"node-LatLon\":{\"lon\":\"-1047474159\",\"lat\":\"411245173\"}}}]}}},\"scale\":\"0\"}},\"id\":{\"id\":\"0\",\"region\":\"0\"},\"direction\":\"0000000000010000\"}},\"duratonTime\":\"1440\",\"sspMsgRights1\":\"1\",\"sspMsgRights2\":\"1\",\"startYear\":\"2018\",\"msgId\":{\"roadSignID\":{\"viewAngle\":\"1111111111111111\",\"mutcdCode\":{\"warning\":\"\"},\"position\":{\"lat\":\"411269876\",\"long\":\"-1047269563\"}}},\"priority\":\"5\",\"content\":{\"advisory\":{\"SEQUENCE\":[{\"item\":{\"itis\":\"777\"}},{\"item\":{\"itis\":\"13579\"}}]}},\"url\":\"null\",\"sspTimRights\":\"1\",\"sspLocationRights\":\"1\",\"frameType\":{\"advisory\":\"\"},\"startTime\":\"448260\"}},\"msgCnt\":\"1\"}}}},\"dataType\":\"TravelerInformation\"}}";
 
-    public static List<OdeTimData> getJsonTims(){
+    public static List<ObjectNode> getJsonTims(){
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule());
 
-        ArrayList<OdeTimData> tims = new ArrayList<>();
+        ArrayList<ObjectNode> tims = new ArrayList<>();
 
         try {
-            OdeTimData tim = objectMapper.readValue(timString, OdeTimData.class);
+            ObjectNode tim = objectMapper.readValue(timString, ObjectNode.class);
             tims.add(tim);
         } catch (JsonMappingException e) {
             System.out.println("A Json Mapping Exception Occurred while trying to get data from mocked tim.");