Skip to content

Fix/merge usdot q2 changes#11

Merged
Michael7371 merged 39 commits into
developfrom
fix/merge-usdot-q2-changes
Jun 4, 2026
Merged

Fix/merge usdot q2 changes#11
Michael7371 merged 39 commits into
developfrom
fix/merge-usdot-q2-changes

Conversation

@Michael7371
Copy link
Copy Markdown

PR Details

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    ODE Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Michael7371 and others added 30 commits April 1, 2026 18:26
…ctor UdpHexDecoder to extract and log untrimmed payload hex
…-ode#594)

* Update ci.yml

* remove unused sonar propetites file
…erage

Enable JaCoCo coverage reporting for SonarCloud
….1 strings end with expected values across multiple receiver test classes.
…o-commit interval and add fetch-max-wait, retries, and linger.ms properties.
…type and improve packet description for troubleshooting.
… to include KAFKA_AUTO_COMMIT_INTERVAL environment variable; enhance README with architecture module reference and improve documentation structure in Architecture.md.
…ove error logging for header stripping failures. Update multiple receiver tests to remove assertions on ASN.1 string endings, ensuring consistency across test cases.
…ngs in JSON output. Update tests to validate that metadata matches CodecUtils serialization, enhancing reliability across various message types.
…c OdeMsgPayload type. Update multiple receiver tests to utilize parameterized tests for improved readability and maintainability, ensuring consistent setup and teardown processes across test classes. Reverting default UDP receiver tests to use unsigned messaging. Added additional tests with signed messages.
…MP header" across multiple test classes for consistency. Refactor test input formatting for improved readability. Adjust test files to ensure proper newline endings and correct expected output values.
…ues and ensure proper newline endings. Remove unnecessary commas in JSON validation file for cleaner formatting.
…l test methods for improved clarity and maintainability. Update test input handling and ensure consistent formatting across all receiver test classes.
…n1-message-signature

ASN Hex 1609.2 Signature Retention (ITSA)
* Use pojos submodule with json schemas in resources

* Update pojos submodule: maven version #

* Use pojos 1.2.0-alpha2.  Update json-schema-validator version to 1.0.88 for tests

* Update version in poms

* Fix distribution management

* package write permission

* update versions

* Update in submodule: use message frame schemas

* fix version
iyourshaw and others added 7 commits June 2, 2026 10:29
* configure listener concurrency

* concurrency setting

* Fix test that fails in ci

* tim test diagnostic

* error logging

* seek to end/autocommit

* Revert test change; only set autocommit

* +seek to end

* test log back to OFF

* add env var to docker-compose
* Adding port remapping receiver configurations

* Updated port map receiver to use application.yaml file config

* Adding log statement for the receiver configurations

* Switched port mapped receiver to inherit functionallity from Generic Receiver

* Removing unused variables from port-mapped receiver

* Removing unused imports

* Adding port-mapped receiver description to readme

* Removing unused imports

* Removing imports entirely
Co-authored-by: John-Wiens <jwiens@neaeraconsulting.com>
* Add env var for adm processes.  Update submodules.  Update pojos dependency version.

* update pojos version

* Add details on how to test acm to release process

* Clarify which repo to run acm test in

* clarify how to set profiles

* fix typo

* set ode concurrency to 1
* Update stage 1 release submodules for the 2026-Q2 release

* Update the compatability matrix and the jpo-ode version

* Update release notes

* Update module pom version numbers to match the parent

* Update jpo-asn version

* Update release notes to include new environment variables for ACM processes and test process enhancements.

---------

Co-authored-by: Michael7371 <40476797+Michael7371@users.noreply.github.com>
@Michael7371 Michael7371 requested a review from iyourshaw June 2, 2026 17:24
…ature Retention enhancement and clarify existing features and fixes.
…ecting enhancements in jpo-ode functionality, including offline JSON schema support and new port remapping configuration.
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Jun 2, 2026

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@iyourshaw iyourshaw requested a review from drewjj June 2, 2026 21:07
Copy link
Copy Markdown

@drewjj drewjj left a comment

Choose a reason for hiding this comment

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

This looks good

Copy link
Copy Markdown

@iyourshaw iyourshaw left a comment

Choose a reason for hiding this comment

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

issue: It looks like some of the submodules need to be updated to point to the current releases.

running "git submodule update --init --recursive" then "git submodule status" on this branch gives:

a51fc0a8c1ced0654b61667f9fcb79cf799e4db1 asn1_codec (asn1-codec-2.1.0-207-ga51fc0a)
 1ff018d20a64e7f0d8f57f039252618ab9e978b4 jpo-asn-pojos (v1.0.0-324-g1ff018d20)
 04f63c1a3b3e1e6a33bfb5549aabb5564f3a61da jpo-cvdp (jpo-cvdp-1.6.0)
 c29e8d7e93a3a0cbf68de363ab57b8b640287afc jpo-sdw-depositor (jpo-sdw-depositor-1.10.0)
 e21adcc7d8b4e1344a9c044cd0dd2fc43ec66373 jpo-security-svcs (jpo-security-svcs-1.7.0)
+d9298120d603b9ff9ce3a5520ce885c8bd7ec23d jpo-utils (jpo-utils-2.2.0)
 208257ab5b31ff4433c349a53aea0e1bbd83b386 qa/test-harness/ode-output-validator-library (odevalidator-0.0.7-33-g208257a)

the jpo-utils commit hash is invalid, it give this error:

fatal: Fetched in submodule path 'jpo-utils', but it did not contain e38f3e3b5483f41e03a8075c86505b482b0c23f3. Direct fetching of that commit failed.

and the asn1-code and pojos are old

current release tags are:

jpo-utils-2.3.0
asn1-codec-3.3.0
jpo-asn-pojos-1.2.0

return sb.toString();
}

protected void routeMessageByMessageType(String messageType, DatagramPacket packet)
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

disagree with Sonars comment that this method is too complex, looks ok to me

@iyourshaw
Copy link
Copy Markdown

issue: It looks like some of the submodules need to be updated to point to the current releases.

running "git submodule update --init --recursive" then "git submodule status" on this branch gives:

a51fc0a8c1ced0654b61667f9fcb79cf799e4db1 asn1_codec (asn1-codec-2.1.0-207-ga51fc0a)
 1ff018d20a64e7f0d8f57f039252618ab9e978b4 jpo-asn-pojos (v1.0.0-324-g1ff018d20)
 04f63c1a3b3e1e6a33bfb5549aabb5564f3a61da jpo-cvdp (jpo-cvdp-1.6.0)
 c29e8d7e93a3a0cbf68de363ab57b8b640287afc jpo-sdw-depositor (jpo-sdw-depositor-1.10.0)
 e21adcc7d8b4e1344a9c044cd0dd2fc43ec66373 jpo-security-svcs (jpo-security-svcs-1.7.0)
+d9298120d603b9ff9ce3a5520ce885c8bd7ec23d jpo-utils (jpo-utils-2.2.0)
 208257ab5b31ff4433c349a53aea0e1bbd83b386 qa/test-harness/ode-output-validator-library (odevalidator-0.0.7-33-g208257a)

the jpo-utils commit hash is invalid, it give this error:

fatal: Fetched in submodule path 'jpo-utils', but it did not contain e38f3e3b5483f41e03a8075c86505b482b0c23f3. Direct fetching of that commit failed.

and the asn1-code and pojos are old

current release tags are:

jpo-utils-2.3.0 asn1-codec-3.3.0 jpo-asn-pojos-1.2.0

It turned out the issue was just with the local state of the submodules in my copy. Cloned a fresh copy of the repo and the submodules look fine:

$ git submodule status
 a51fc0a8c1ced0654b61667f9fcb79cf799e4db1 asn1_codec (asn1-codec-3.3.0)
 1ff018d20a64e7f0d8f57f039252618ab9e978b4 jpo-asn-pojos (jpo-asn-pojos-1.2.0)
 04f63c1a3b3e1e6a33bfb5549aabb5564f3a61da jpo-cvdp (jpo-cvdp-1.6.0)
 c29e8d7e93a3a0cbf68de363ab57b8b640287afc jpo-sdw-depositor (jpo-sdw-depositor-1.10.0)
 e21adcc7d8b4e1344a9c044cd0dd2fc43ec66373 jpo-security-svcs (jpo-security-svcs-1.7.0)
 e38f3e3b5483f41e03a8075c86505b482b0c23f3 jpo-utils (jpo-utils-2.3.0)
 208257ab5b31ff4433c349a53aea0e1bbd83b386 qa/test-harness/ode-output-validator-library (odevalidator-0.0.7-33-g208257a)

@iyourshaw iyourshaw self-requested a review June 4, 2026 18:00
Copy link
Copy Markdown

@iyourshaw iyourshaw left a comment

Choose a reason for hiding this comment

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

looks good! did the following checks:

  • verified unit tests pass
  • verified runs in docker and udpsender scripts work
  • verified submodules and pom updates

@Michael7371 Michael7371 merged commit f73c930 into develop Jun 4, 2026
7 checks passed
@Michael7371 Michael7371 deleted the fix/merge-usdot-q2-changes branch June 4, 2026 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants