Sync CDOT fork with upstream repository #11
Merged
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
…ons in CleanupStaleActiveTimHoldingRecords class
…imHoldingService & ActiveTimService
Co-authored-by: Matt Cook <mattheworion.cook@gmail.com>
….com:Trihydro/TIM-Manager into fix/insert-into-holding-for-all-destinations
This reverts commit 2b383c9.
…destinations' into fix/handle-stale-ath-records
…success of deleting active TIMs
…ement Fix Message Count Increment in TimGenerationHelper
# 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
…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
v2.0 Release: ODE 2025 Q1 Integration and Other Updates
Member
Author
dmccoystephenson
left a comment
dmccoystephenson
left a comment
There was a problem hiding this comment.
I reviewed these changes and I did not see anything that should not go into the CDOT fork. Please take a look when you have a chance! @mcook42
Once this is merged we can open a PR to merge CDOT main into CDOT dev.
mcook42
reviewed
Sep 29, 2025
| . | ||
| ├── cv-data-controller | ||
| │ ├── cv-data-controller-1.4.0-SNAPSHOT.jar | ||
| │ ├── cv-data-controller-x.x.x.jar |
There was a problem hiding this comment.
suggestion(non-blocking): use x.y.z for the version to follow semver guidance https://semver.org/
mcook42
approved these changes
Sep 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Problem
The
mainbranch of the CDOT fork has fallen behind the upstream repository, causing divergence and potential inconsistencies.Solution
Synchronize the CDOT fork’s
mainbranch with the latest changes from the upstreammainbranch to bring them back in alignment.Testing