adapter: Refactor XML and JSON de-/serialization methods #165
Conversation
This file contains 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
This commit remanes `valueDataType_t` from the XSD to `valueDataType`. Furthermore, it adds a missing `<reference>` tag around the `refersTo` References of `Extension`.
The current order of the elements in `SubmodelElementList` was wrong. This updates the order.
Version 3.0 of the spec removes the attribute `kind` from `SubmodelElement`s. While we already implemented this, it was still missing in the XSD Schema, as well as the examples. This commit fixes that.
Currently, the XML deserialization missed the `<aas:refersTo>` wrapper around the single references inside `Extension.refers_to`. This commit fixes that.
Currently, `Extension.refers_to` is declared as a `Iterable[Reference]`. This implies, that we can not necessarily check, whether or not the attribute is empty or not. This creates a problem with the XML serialization, since the `<aas.refersTo>` element should only appear if there is at least one `Reference` inside. This commit changes the `Extension.refers_to` to be a list of `Reference`s, as well as adapting a more clear check whether or not the attribute is empty in `adapter.xml.xml_serialization`.
extract methods
extract methods
extract methods
extract methods
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.
The methods for handling attributes of abstract classes seemed to me too big.
In this PR these methods are refactored. Mostly a method extraction refactoring was done, to simplify the methods and to keep less abstraction levels in a single method
The function
_expect_typewas renamed to_is_of_typeas it represents clearer what the func does.This PR is not relevant for the V3.0 release and can be merged later