Skip to content

Update Consumer Data Extraction #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmonington wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Update Consumer Data Extraction #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a82cbd
chore: update JSON traversal logic in `JsonToJavaConverter` to handle…
pmonington Jan 13, 2026
8dfd257
chore: update `updateTimExpiration` to use `Instant` for expiration d…
pmonington Jan 13, 2026
0063cb4
Merge branch 'feat/add-cdot-tim-pathing' into pmonington/feat/update-…
pmonington Jan 15, 2026
6365cd7
test(TimDataConverter): update VSL, Parking, and construction testing…
pmonington Jan 16, 2026
e9bce98
test(TimDataConverter): update testing data to align with new OdeTimJ…
pmonington Jan 16, 2026
47038cb
chore(JsonToJavaConverter): remove deplicate and outdated test data f…
pmonington Jan 23, 2026
858f979
test(TimDataConverter): update test cases with revised TIM payload da…
pmonington Jan 23, 2026
32956a8
chore: update OdeData type definitions
pmonington Feb 2, 2026
e12cd72
chore: handle null expiration dates case in `updateTimExpiration` to …
pmonington Feb 2, 2026
a34123e
Merge branch 'origindev' into pmonington/feat/update-consumer-data-ex…
pmonington Feb 4, 2026
2b2959e
test(TimServiceTest): standardize usage of variable types and update …
pmonington Feb 9, 2026
8437882
test(TimServiceTest): remove unused imports and redundant casting
pmonington Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 2 additions & 113 deletions cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,117 +232,6 @@ else if (geometry != null)
return region;
}

public OdeTimPayload convertTimPayloadJsonToJava(String value) {
Copy link
Author

@pmonington pmonington Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: the removal of this class is due to the fact that with the changes to update how the string value from the Kafka topic caused it to match up almost exactly with the other method. The only difference had been that this method had not set the StartDateTime, DurationTime, Priority, or FrameType, however, these are required fields so should be set anyway.


OdeTimPayload odeTimPayload = null;

try {
OdeTravelerInformationMessage.DataFrame[] dataFrames = new OdeTravelerInformationMessage.DataFrame[1];
OdeTravelerInformationMessage.DataFrame dataFrame = new OdeTravelerInformationMessage.DataFrame();
List<OdeTravelerInformationMessage.DataFrame.Region> regions = new ArrayList<>();

// JsonNode payloadNode = JsonUtils.getJsonNode(value, "payload");
JsonNode timNode = JsonUtils.getJsonNode(value, "payload").get("data").get("MessageFrame").get("value")
.get("TravelerInformation");
JsonNode travelerDataFrame = timNode.get("dataFrames").get("TravelerDataFrame");
JsonNode regionsNode = travelerDataFrame.get("regions");

JsonNode sequenceArrNode = null;
JsonNode contentNode = travelerDataFrame.get("content");
if (contentNode.has(ContentEnum.advisory.getStringValue())) {
sequenceArrNode = contentNode.get(ContentEnum.advisory.getStringValue()).get("SEQUENCE");
dataFrame.setContent(ContentEnum.advisory.getStringValue());
} else if (contentNode.has(ContentEnum.speedLimit.getStringValue())) {
sequenceArrNode = contentNode.get(ContentEnum.speedLimit.getStringValue()).get("SEQUENCE");
dataFrame.setContent(ContentEnum.advisory.getStringValue());
} else if (contentNode.has(ContentEnum.exitService.getStringValue())) {
sequenceArrNode = contentNode.get(ContentEnum.exitService.getStringValue()).get("SEQUENCE");
dataFrame.setContent(ContentEnum.advisory.getStringValue());
} else if (contentNode.has(ContentEnum.genericSign.getStringValue())) {
sequenceArrNode = contentNode.get(ContentEnum.genericSign.getStringValue()).get("SEQUENCE");
dataFrame.setContent(ContentEnum.advisory.getStringValue());
} else if (contentNode.has(ContentEnum.workZone.getStringValue())) {
sequenceArrNode = contentNode.get(ContentEnum.workZone.getStringValue()).get("SEQUENCE");
dataFrame.setContent(ContentEnum.advisory.getStringValue());
}

LocalDate now = LocalDate.now();
LocalDate firstDay = now.with(firstDayOfYear());
OdeTravelerInformationMessage tim = new OdeTravelerInformationMessage();

JsonNode timeStampNode = timNode.get("timeStamp");
if (timeStampNode != null) {
LocalDateTime timeStampDate = firstDay.atStartOfDay().plus(timeStampNode.asInt(), ChronoUnit.MINUTES);
tim.setTimeStamp(timeStampDate.toString());
}
tim.setMsgCnt(timNode.get("msgCnt").asInt());

JsonNode packetIDNode = timNode.get("packetID");
if (packetIDNode != null) {
tim.setPacketID(packetIDNode.asText());
}

// if ITIS codes are in an array
List<String> itemsList = new ArrayList<String>();
String item = null;
if (sequenceArrNode != null && sequenceArrNode.isArray()) {
for (final JsonNode objNode : sequenceArrNode) {
if (objNode.get("item").get("itis") != null)
item = mapper.treeToValue(objNode.get("item").get("itis"), String.class);
else if (objNode.get("item").get("text") != null)
item = mapper.treeToValue(objNode.get("item").get("text"), String.class);

itemsList.add(item);
}
}

// ADD NON ARRAY ELEMENT
if (sequenceArrNode != null && !sequenceArrNode.isArray()) {
if (sequenceArrNode.get("item").get("itis") != null)
item = mapper.treeToValue(sequenceArrNode.get("item").get("itis"), String.class);
else if (sequenceArrNode.get("item").get("text") != null)
item = mapper.treeToValue(sequenceArrNode.get("item").get("text"), String.class);

itemsList.add(item);
}

String[] items = new String[itemsList.size()];
items = itemsList.toArray(items);

JsonNode geographicalPathNode = regionsNode.get("GeographicalPath");

// geographicalPathNode may be an object or an array; if it is an object, treat
// it as a region
if (geographicalPathNode.isObject()) {
// single region
JsonNode regionNode = geographicalPathNode;
Region region = getRegion(regionNode);
regions.add(region);
} else if (geographicalPathNode.isArray()) {
// multiple regions
for (final JsonNode regionNode : geographicalPathNode) {
Region region = getRegion(regionNode);
regions.add(region);
}
} else {
log.warn("geographicalPathNode is not an object or an array");
}

dataFrame.setRegions(regions.toArray(new OdeTravelerInformationMessage.DataFrame.Region[regions.size()]));
dataFrame.setItems(items);
dataFrames[0] = dataFrame;
tim.setDataframes(dataFrames);
odeTimPayload = new OdeTimPayload();
odeTimPayload.setData(tim);
} catch (IOException e) {
log.error("An IOException occurred while converting TIM JSON to Java", e);
} catch (NullPointerException e) {
log.error("A NullPointerException occurred while converting TIM JSON to Java: {}", e.getMessage());
}

return odeTimPayload;
}

public OdeTravelerInformationMessage.DataFrame.Region.Path GetPathData(JsonNode pathNode) {
try {
if (pathNode == null)
Expand Down Expand Up @@ -438,7 +327,7 @@ public OdeTravelerInformationMessage.DataFrame.Region.Geometry GetGeometryData(J
}
}

public OdeTimPayload convertTmcTimTopicJsonToJava(String value) {
public OdeTimPayload convertTimTopicJsonToJava(String value) {

OdeTimPayload odeTimPayload = null;

Expand All @@ -448,7 +337,7 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) {
List<OdeTravelerInformationMessage.DataFrame.Region> regions = new ArrayList<>();

OdeTravelerInformationMessage tim = new OdeTravelerInformationMessage();
JsonNode timNode = JsonUtils.getJsonNode(value, "payload").findValue("data");
JsonNode timNode = JsonUtils.getJsonNode(value, "payload").findValue("data").findValue("value").findValue("TravelerInformation");
tim.setMsgCnt(timNode.get("msgCnt").asInt());
JsonNode packetIDNode = timNode.get("packetID");
if (packetIDNode != null) {
Expand Down
Loading