adapter.xml: Update XSD to v3.0 #161
Merged
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.
jkhsjdhjs
suggested changes
Nov 14, 2023
There was a problem hiding this comment.
Aside the comment to the Extension serialization, this also currently doesn't adjust the XML deserialization for Extension.refers_to. This went unnoticed because Extensions aren't compared by the AASDataChecker, hence also my message on Zulip. Maybe the AASDataChecker should compare Extensions so we can properly test our SDK?
Currently, the XML deserialization missed the `<aas:refersTo>` wrapper around the single references inside `Extension.refers_to`. This commit fixes that.
s-heppner
force-pushed
the
update/XSD
branch
from
97439a8 to
6071934
Compare
The deserialization is fixed in 6071934 |
s-heppner
force-pushed
the
update/XSD
branch
from
346522e to
58f4597
Compare
zrgt
reviewed
Nov 15, 2023
jkhsjdhjs
reviewed
Nov 15, 2023
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 set of `Reference`s, as well as adapting a more clear check whether or not the attribute is empty in `adapter.xml.xml_serialization`.
s-heppner
force-pushed
the
update/XSD
branch
from
58f4597 to
daa770f
Compare
|
LGTM 👍 |
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.
This implements the missing changes to the XSD schema from the specification v3.0.
However, as noted in #72, we did not include the regex patterns for the
File.Since this is quite a lot, I suggest looking at the single commits for the review.