v2.0 Release: ODE 2025 Q1 Integration and Other Updates #49
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…iolation-tim-rsu-service' into feature/support-gvw-restriction-through-incident-endpoint
…ent code should be returned
…lem ITIS code is present
…lem ITIS code is present
…oblemGVW_ShouldReturnGVWItisCodes` unit test
… set instance variables to final and added null check
Sync dev with latest changes from main
Sync dev with latest changes from main
Converted the inline comment for `performTaskUsingCron` into a detailed JavaDoc. This enhances clarity by explaining the method's purpose and behavior directly in the documentation.
Adjusted the cron expression to trigger at 1:00 AM daily across multiple files for consistency. Replaced hardcoded value with environment variable reference in local-deployment files.
…ka-consumer-log-volume # Conflicts: # logger-kafka-consumer/src/main/java/com/trihydro/loggerkafkaconsumer/app/services/DataFrameService.java
…r-log-volume Structured Logging Improvements in Logger Kafka Consumer
# Conflicts: # cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/controller/ActiveTimController.java # docker-compose.yml
# Conflicts: # docker-compose.yml
Sync dev with latest changes from main (4/8/2025)
…ent-endpoint # Conflicts: # ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimIncidentController.java
dmccoystephenson
commented
Apr 9, 2025
| generatedKeys.close(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| log.trace("------ Generated {} {} --------------", type, id); |
Member
Author
There was a problem hiding this comment.
Note: This log statement was flooding the console. Changing the log level to TRACE ensures it won't appear in the logs under normal circumstances.
Comment on lines
-62
to
-65
| dataFrame.setNotUsed((short) 0); // as of J2735 2020 this should be set to 0 and is ignored | ||
| dataFrame.setNotUsed1((short) 0); // as of J2735 2020 this should be set to 0 and is ignored | ||
| dataFrame.setNotUsed2((short) 0); // as of J2735 2020 this should be set to 0 and is ignored | ||
| dataFrame.setNotUsed3((short) 0); // as of J2735 2020 this should be set to 0 and is ignored |
Member
Author
There was a problem hiding this comment.
Note: Testing has shown that when these values are not provided, the ODE applies default values. Since they are not used, we do not need to set them in the TIM Manager.
cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java
Outdated
Show resolved
Hide resolved
cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java
Outdated
Show resolved
Hide resolved
cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java
Show resolved
Hide resolved
Comment on lines
+92
to
+94
| log.trace("Before processing JSON: {}", tdw.getData()); | ||
| odeData = timDataConverter.processTimJson(tdw.getData()); | ||
| log.trace("After processing JSON: {}", gson.toJson(odeData)); |
Member
Author
There was a problem hiding this comment.
Note: These log statements were sometimes overwhelming the console. Looking at the JSON can be useful for debugging though, so maybe these should be DEBUG level instead of TRACE level.
| } | ||
|
|
||
| @Test | ||
| public void processTimJson_unsigned() throws IOException { |
Member
Author
There was a problem hiding this comment.
Note: This test case was removed in the CDOT fork and a relevant note can be found at CDOT-CV#7 (comment)
Member
Author
There was a problem hiding this comment.
Note: This file was used in a removed test case that used to be in TimDataConverterTest
…when converting TMC TIM
…in item when converting TMC TIM
Added a fallback mechanism in JsonToJavaConverter to handle cases where frameType is not present in the TravelerDataFrame during the conversion process. A warning is logged, and the frameType defaults to 'advisory' to ensure proper handling and avoid potential null values.
Removed `convertJ2735SpecialVehicleExtensionsJsonToJava` and `convertJ2735SupplementalVehicleExtensionsJsonToJava` methods, as well as their associated imports.
Marking the ObjectMapper as final ensures its immutability and prevents accidental reassignment. This change improves code stability and readability, aligning with best practices.
Moved mock OdeTravelerInformationMessage JSON content to an external file for better readability and maintainability. Updated test methods and helper functions to read the JSON data from the new file, ensuring consistency and reducing code duplication. Adjusted method signatures to handle IOException as needed.
Updated `docker-compose.yml` to use the `ACM_LOG_LEVEL` value from the `.env` file for better configurability. Added `ACM_LOG_LEVEL` to `sample.env` with a default value of `ERROR`.
…through-incident-endpoint Support GVW Restrictions via problemOtherText in Incident Submissions
…se-2.0 Address Comments from #49: Improve Logging and JSON Handling
mcook42
approved these changes
Apr 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
The following changes affect a subset of files and were not sweeping changes.
Code Quality & Style
thisfor clarityprivateandfinalwhere applicableLogging Enhancements
utility.logWithDateandSystem.outto SLF4J@Slf4jannotationLOGGING_LEVEL_COM_TRIHYDROACM_LOG_LEVELmore easily configurable in local deploymentTesting Improvements
Dependency & Deployment Updates
milepost-graph-dbdirectory and related service fromlocal-deploymentcompose file2025-q12.0.0topic.OdeTimJsonformatCode Behavior & Resource Management
ActiveTimController: now defaults to "advisory" when original value is unusableDbInteractions.validateDbConfigto reduce nesting by returning early ifdataSourceis not null"other"problem type:"other"is selected, the system now checks theproblemOtherTextfield for GVW-related keywordsDocumentation
sample.envTesting
Other Info
Purpose
This PR proposes merging release/v2.0 into the main branch. The release/v2.0 branch includes the latest updates from both main and dev, which contain additional changes beyond the ODE upgrade.
Version Tag
Once merged, a new version tag will be created to reflect the update.
Major Version Bump
The major version bump is due to the integration of the 2025 Q1 ODE release, which introduces breaking changes, along with other updates from main and dev.