Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/CDOT-CV/jpo-ode into mcook42…
Browse files Browse the repository at this point in the history
…/spring-kafka/udp-receivers
  • Loading branch information
mcook42 committed Dec 11, 2024
2 parents 7954b4a + cd232b6 commit 0ffbff3
Show file tree
Hide file tree
Showing 271 changed files with 23,579 additions and 11,186 deletions.
14 changes: 14 additions & 0 deletions ATTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,17 @@ The developers also wish to acknowledge the following leaders and contributors:
* Oakridge National Laboratories: Jason Carter and Aaron Ferber

Thanks to the ITS Joint Program Office for their support of the effort.

The J2735 Traveler Information classes were generated using asn1jvm, which is a new ASN.1 compiler targeting Java. The asn1jvm tool is currently capable of compiling the 2016 version of the J2735 ASN.1 specification to Java classes which are capable of serializing and deserializing XER and JER. The output of the tool includes classes with Jackson annotations for each type in the specification, and a runtime library containing base classes for ASN.1 types and custom Jackson serializers and deserialers. The raw output of the tool and associated runtime library are here: https://github.com/iyourshaw/j2735-2016-java

The generated classes were edited for compatibility with the 2020 version of the specification as follows:

* TimDatFrame.java, fields renamed:
* sspTimRights -> notUsed
* sspLocationRights -> notUsed1
* sspMsgRights1 -> notUsed2
* sspMsgRights2 -> notUsed3
* duratonTime -> durationTime
* Classes were moved to Java packages to be consistent with the module organization scheme in the 2020+ versions of J2735, and with Java package naming conventions (lowercase), and existing ODE package naming. Specifically, instead being in a `DSRC` package, the TIM-related classes were moved to `us.dot.its.jpo.ode.plugin.j2735.travelerinformation`, and `us.dot.its.jpo.ode.plugin.j2735.common` packages.

The top level TravelerInformation class was also edited, by changing its base class to `us.dot.its.jpo.ode.plugin.asn1.Asn1Object` to enable it to plug directily into the existing `OdeData`/`OdeMsgPayload` data structure.
9 changes: 9 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$"/>
</module>
<!-- Excludes all auto-generated J2735 class files -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern"
value=".*[\\/]src[\\/]main[\\/]java[\\/]us[\\/]dot[\\/]its[\\/]jpo[\\/]ode[\\/]plugin[\\/]j2735[\\/].*$"/>
</module>
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern"
value=".*[\\/]src[\\/]main[\\/]java[\\/]us[\\/]dot[\\/]its[\\/]jpo[\\/]ode[\\/]plugin[\\/]asn1[\\/].*$"/>
</module>
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
<module name="SuppressionFilter">
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
Expand Down
Loading

0 comments on commit 0ffbff3

Please sign in to comment.