Fix JSON BSD codec round-trip for nested struct fields#1742
Merged
Conversation
AbstractBsdCodec.encodeField cast every nested-struct value to UaStructuredType before handing it to the nested codec, which failed for JsonObjectCodec since its nested-struct values are raw JsonObjects. Wrap non-UaStructuredType values in BsdStructWrapper before invoking the nested encode, and add a matching decode-side branch in JsonObjectCodec.opcUaToMemberTypeScalar that unwraps BsdStructWrapper<JsonElement> returned from nested decodes. Re-enable JsonBsdCodecTest and GenericBsdCodecTest, which were @disabled and would otherwise have caught this regression. The round-trip helper in AbstractBsdCodecTest now wraps/unwraps BsdStructWrapper to match the current encode/decode contract. fixes #1741
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes JSON-backed BSD codec round-trip failures when encoding/decoding nested structured fields by aligning the nested-field encode/decode paths with the BsdStructWrapper contract introduced by the earlier refactor. It also re-enables previously disabled tests that would have detected the regression.
Changes:
- Wrap non-
UaStructuredTypenested-struct field values inBsdStructWrapperbefore invoking nested codec encoding (AbstractBsdCodec.encodeField). - Unwrap
BsdStructWrapper<JsonElement>results from nested decodes when building parent JSON objects (JsonObjectCodec.opcUaToMemberTypeScalar). - Re-enable and update JSON/generic BSD codec tests to match the wrapper-based encode/decode contract.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/AbstractBsdCodec.java |
Fixes nested structured-field encoding by wrapping non-UaStructuredType values before delegating to nested codecs. |
opc-ua-sdk/dtd-core/src/main/java/org/eclipse/milo/opcua/sdk/core/dtd/json/JsonObjectCodec.java |
Unwraps nested decode results returned as BsdStructWrapper<JsonElement> so nested structs embed correctly in parent JSON. |
opc-ua-sdk/dtd-core/src/test/java/org/eclipse/milo/opcua/sdk/core/dtd/AbstractBsdCodecTest.java |
Updates round-trip helpers to wrap inputs and unwrap decoded outputs to reflect current codec contracts. |
opc-ua-sdk/dtd-core/src/test/java/org/eclipse/milo/opcua/sdk/core/dtd/json/JsonBsdCodecTest.java |
Re-enables JSON BSD codec tests, including nested-struct coverage. |
opc-ua-sdk/dtd-core/src/test/java/org/eclipse/milo/opcua/sdk/core/dtd/GenericBsdCodecTest.java |
Re-enables generic BSD codec tests. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
AbstractBsdCodec.encodeField cast every nested-struct value to UaStructuredType before handing it to the nested codec, which failed for JsonObjectCodec since its nested-struct values are raw JsonObjects. Wrap non-UaStructuredType values in BsdStructWrapper before invoking the nested encode, and add a matching decode-side branch in JsonObjectCodec.opcUaToMemberTypeScalar that unwraps BsdStructWrapper returned from nested decodes.
Re-enable JsonBsdCodecTest and GenericBsdCodecTest, which were
@Disabledand would otherwise have caught this regression. The round-trip helper in AbstractBsdCodecTest now wraps/unwraps BsdStructWrapper to match the current encode/decode contract.fixes #1741