Skip to content

Fix Incorrect NodeLL Type Selection for Lat/Lon Offsets to Prevent Encoding Failures #8

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

Merged
payneBrandon merged 32 commits into from
Apr 18, 2025
Merged

Fix Incorrect NodeLL Type Selection for Lat/Lon Offsets to Prevent Encoding Failures #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b3aa97f
Added passing unit tests for `transformNodeLL` and `nodeOffsetPointLL…
dmccoystephenson Mar 19, 2025
2276397
Added failing unit test for `transformNodeLL` when LL type is not spe…
dmccoystephenson Mar 19, 2025
efab708
Added failing unit test for `nodeOffsetPointLL` for input lat/lon `-1…
dmccoystephenson Mar 19, 2025
b990c1b
Added more unit tests for `nodeOffsetPointLL` method, some of which a…
dmccoystephenson Mar 20, 2025
9f61fdd
Updated LL_5_MINIMUM_MICRO_DEGREES & LL_6_MINIMUM_MICRO_DEGREES to co…
dmccoystephenson Mar 20, 2025
15a198b
Updated some test values & added comments
dmccoystephenson Mar 20, 2025
2a0b82b
Updated naming convention for new tests for clarity
dmccoystephenson Mar 20, 2025
2bbf9ab
Added descriptive failure messages to nodeOffsetPointLL unit tests fo…
dmccoystephenson Mar 20, 2025
36c9a50
Updated test values outside LL constraints
dmccoystephenson Mar 20, 2025
c9f345f
Fixed failing unit tests by adding missing parentheses to `nodeOffset…
dmccoystephenson Mar 20, 2025
d0165eb
Refactored bitmask range validation by extracting methods and improvi…
dmccoystephenson Mar 20, 2025
fe83de8
Renamed `nodeOffsetPointLL` method to `determineNodeOffsetPointLLType`
dmccoystephenson Mar 20, 2025
ad10132
Introduced constants for NODE_LL types and added JavaDocs
dmccoystephenson Mar 20, 2025
1bdca12
Updated JavaDocs
dmccoystephenson Mar 20, 2025
d3fdded
Refactored `determineNodeOffsetPointLLType` to check numerical limits…
dmccoystephenson Mar 20, 2025
4491431
Added J2735 note regarding the value -8388608
dmccoystephenson Mar 20, 2025
476ce88
Formatted TravelerMessageFromHumanToAsnConverter.java
dmccoystephenson Mar 20, 2025
5b9a1d5
Formatted TravelerMessageFromHumanToAsnConverterTest.java
dmccoystephenson Mar 20, 2025
7528128
Addressed a couple warnings in TravelerMessageFromHumanToAsnConverter…
dmccoystephenson Mar 20, 2025
4caf2ca
Reindented TravelerMessageFromHumanToAsnConverter & TravelerMessageFr…
dmccoystephenson Mar 20, 2025
9b58b25
Reformatted TravelerMessageFromHumanToAsnConverter & TravelerMessageF…
dmccoystephenson Mar 20, 2025
e051c08
Removed unnecessary imports, initializations, casts & throws lists in…
dmccoystephenson Mar 20, 2025
a98074b
Renamed unit tests
dmccoystephenson Mar 20, 2025
e8b4b72
Updated illegal argument exception message
dmccoystephenson Mar 20, 2025
ab17e1f
Updated `determineNodeOffsetPointLLType` to throw custom InvalidNodeL…
dmccoystephenson Mar 20, 2025
f3ebbbf
Added JavaDocs for InvalidNodeLatLonOffsetException
dmccoystephenson Mar 20, 2025
7bea854
Updated catch block in TimDepositController for InvalidNodeLatLonOffs…
dmccoystephenson Mar 20, 2025
7866bb9
Renamed `determineNodeOffsetPointLLType` to `getNodeOffsetPointLLType`
dmccoystephenson Mar 24, 2025
6e6fc83
Referenced constants instead of using magic strings for nodeLL types
dmccoystephenson Mar 24, 2025
4148165
Changed some accessors to protected instead of public
dmccoystephenson Mar 24, 2025
24d0a66
Made `nonCompliantFields` list a static instance variable & reformatt…
dmccoystephenson Mar 24, 2025
6154bc2
Specified `annotationProcessorPaths` in the root pom.xml
dmccoystephenson Mar 24, 2025
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
273 changes: 119 additions & 154 deletions ...java/us/dot/its/jpo/ode/plugin/j2735/builders/TravelerMessageFromHumanToAsnConverter.java
View file
Open in desktop

Large diffs are not rendered by default.

394 changes: 305 additions & 89 deletions .../us/dot/its/jpo/ode/plugin/j2735/builders/TravelerMessageFromHumanToAsnConverterTest.java
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimDepositController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,12 @@ public synchronized ResponseEntity<String> depositTim(String jsonString, Request
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
.body(
JsonUtils.jsonKeyValue(ERRSTR, errMsg));
} catch (TravelerMessageFromHumanToAsnConverter.InvalidNodeLatLonOffsetException e) {
String errMsg = "Invalid node lat/lon offset in TIM: " + e.getMessage();
Comment thread
dmccoystephenson marked this conversation as resolved.
log.error(errMsg);
Comment thread
dmccoystephenson marked this conversation as resolved.
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
Comment thread
dmccoystephenson marked this conversation as resolved.
.body(
JsonUtils.jsonKeyValue(ERRSTR, errMsg));
}

try {
Expand Down
2 changes: 1 addition & 1 deletion jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimDepositControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void messageWithNoRSUsOrSDWShouldReturnWarning() {
void failedObjectNodeConversionShouldReturnConvertingError(@Capturing
TravelerMessageFromHumanToAsnConverter capturingTravelerMessageFromHumanToAsnConverter)
throws JsonUtilsException,
TravelerMessageFromHumanToAsnConverter.NoncompliantFieldsException {
TravelerMessageFromHumanToAsnConverter.NoncompliantFieldsException, TravelerMessageFromHumanToAsnConverter.InvalidNodeLatLonOffsetException {

new Expectations() {

Expand Down
2 changes: 1 addition & 1 deletion jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimTransmogrifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ void testConvertToXMLMessageFrame()
@Test
void testConvertToXML_VerifyPositionElementNotInCircleElementAfterConversion()
throws IOException, JsonUtilsException, XmlUtilsException, ParseException,
TravelerMessageFromHumanToAsnConverter.NoncompliantFieldsException {
TravelerMessageFromHumanToAsnConverter.NoncompliantFieldsException, TravelerMessageFromHumanToAsnConverter.InvalidNodeLatLonOffsetException {
// prepare
String timRequestContainingCircleGeometry = new String(Files.readAllBytes(Paths.get(
"src/test/resources/us/dot/its/jpo/ode/traveler/timRequestContainingCircleGeometry.json")));
Expand Down
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@
<compilerArgs>
<arg>-Xlint:deprecation</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</path>
</annotationProcessorPaths>
Comment thread
mcook42 marked this conversation as resolved.
</configuration>
</plugin>
<plugin>
Expand Down