Fix P0 AAS XML/AASX compliance and spec alignment #458

stiebitzhofer · 2026-01-14T14:56:30Z

Summary

Fix XML element ordering for AssetAdministrationShell and include AAS.xsd in AASX packages
Correct XML Operation serialization/deserialization wrappers to align with XSD
Enforce AASd-108 SubmodelElementList single-type constraint
Update IEC61360 data specification template IDs in test fixtures
Fix embeddedDataSpecifications XML deserialization, including nested content

Testing

mvn -Djacoco.skip=true -DargLine="-javaagent:/Users/hannes/.m2/repository/org/mockito/mockito-core/5.20.0/mockito-core-5.20.0.jar" test

Commits

764c693 Enforce AASd-108 SubmodelElementList typing (Enforce AASd-108 #230)
650e494 Update IEC61360 data specification template IDs (Consider Bugfix release IDTA-01003-a: Data Spec IDs of IEC61360 template changed #305)
f6ae093 Fix AAS XML order and include AAS.xsd in AASX (Non-compliant XML element order with AAS.xsd in AssetAdministrationShell serialization #456)
843397f Fix XML Operation serialization/deserialization wrappers ([Bug] Errors in XML serialization of operation properties #448)
2403df3 Handle embeddedDataSpecifications in XML submodel elements (EmbeddedDataSpecifications inside XML SubmodelElements are not deserialised #208)
ecd3800 Fix nested embeddedDataSpecifications XML deserialization (Unable to deserialize the nested embeddedDataSpecifications #389)

…4j#448)

…as4j#208)

…s4j#389)

FriedJannik

Thank you for implementing this, I was about to do this as well :)
In regards to #208 #448 and #389 that Looks Good to me!

mdanish98

Hi @stiebitzhofer ,
Many thanks for the PR!

I have some remarks.

General
During the upgradation of aas4j to 2.0 we have ignored some XML validation tests due to issues #389 and #390. However, when I unignored these tests, all unignored tests are failing. So, I think this PR needs to be adjusted in order to determine the root cause and fix it. Could you please check this as well?

...rmat-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXSerializer.java

mdanish98 · 2026-01-16T08:27:05Z

dataformat-core/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/AASFull.java

  public static final Environment ENVIRONMENT = createEnvironment();
  public static final String AAS_3_1_DATA_SPECIFICATION_IEC_61360 =
-      "https://admin-shell.io/aas/3/1/DataSpecificationIec61360";
+      "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIec61360/3";


As per the latest documentation of IDTA-01003-a - Data Specification IEC61360, the schema for IEC61360 is included as embedded data specification in the release of IDTA-01001-3-1 or its bugfix releases.

I had to look up the link again (I should add that to the commit): https://industrialdigitaltwin.io/aas-specifications/IDTA-01003-a/v3.1.1/specification.html Your thoughts?

mdanish98 · 2026-01-16T08:28:41Z

dataformat-core/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/AASSimple.java

  private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE = "integer";
  public static final String AAS_3_1_DATA_SPECIFICATION_IEC_61360 =
-      "https://admin-shell.io/aas/3/1/DataSpecificationIec61360";
+      "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIec61360/3";


Same comment as above

mdanish98 · 2026-01-16T08:28:54Z

dataformat-core/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/Examples.java

                                          .type(KeyTypes.GLOBAL_REFERENCE)
                                          .value(
-                                              "https://admin-shell.io/aas/3/1/DataSpecificationIec61360")
+                                              "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIec61360/3")


Same comment as above

mdanish98 · 2026-01-16T08:30:25Z

dataformat-json/src/test/resources/Environment-CustomDataSpec.json

        "keys" : [ {
          "type" : "GlobalReference",
-          "value" : "https://admin-shell.io/aas/3/1/DataSpecificationIec61360"
+          "value" : "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIec61360/3"


Same comment as above

mdanish98 · 2026-01-16T08:36:45Z

dataformat-json/src/test/resources/MotorAAS.json

Same comment as above regarding 'DataSpecificationIec61360'

...aas4j/v3/dataformat/xml/internal/deserialization/EmbeddedDataSpecificationsDeserializer.java

mdanish98 · 2026-01-16T08:54:08Z

dataformat-xml/src/test/resources/test_demo_full_example.xml

              <aas:key>
                <aas:type>GlobalReference</aas:type>
-                <aas:value>https://admin-shell.io/aas/3/1/DataSpecificationIec61360</aas:value>
+                <aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIec61360/3</aas:value>


Same comment as above regarding 'DataSpecificationIec61360'

mdanish98 · 2026-01-16T08:54:13Z

dataformat-xml/src/test/resources/xmlExample.xml

Same comment as above regarding 'DataSpecificationIec61360'

mdanish98 · 2026-01-16T08:54:20Z

dataformat-xml/src/test/resources/xmlExampleWithModifiedPrefix.xml

Same comment as above regarding 'DataSpecificationIec61360'

…clipse-aas4j#456, eclipse-aas4j#390) - Fix SubmodelElementMixin property order to match XSD requirements - Change "hasExtensions" to "extensions" and "qualifier" to "qualifiers" - Remove duplicate properties from SubmodelElement ordering - Add OperationVariable empty list handling to prevent invalid XML - Remove test skip logic as all 2,593 XML validation tests now pass Signed-off-by: Hannes Stiebitzhofer <hannes@stiebitzhofer.com>

Add SLF4J debug logging to help troubleshoot deserialization issues when attempting to deserialize DataSpecificationContent subtypes. The logging only activates when debug level is enabled and provides visibility into which classes were attempted and why they failed. Include unit tests that exercise the deserialization code paths with both valid IEC61360 data specifications and empty content. Signed-off-by: Hannes Stiebitzhofer <hannes@stiebitzhofer.com>

Remove automatic inclusion of AAS.xsd in AASX packages as this is not part of the official AASX specification (IDTA-01005-3-0). While including the schema enables offline validation, it is not explicitly required or recommended by the specification. Changes: - Remove addXmlSchemaPart() method from AASXSerializer - Remove XML_SCHEMA_PATH and XML_SCHEMA_RESOURCE constants - Remove XSD inclusion call in XML serialization path - Update AASXSerializerTest to remove XSD assertion Addresses review feedback from mdanish98 on PR eclipse-aas4j#458. Signed-off-by: Hannes Stiebitzhofer <hannes@stiebitzhofer.com>

stiebitzhofer added 6 commits January 14, 2026 13:21

Enforce AASd-108 SubmodelElementList typing (eclipse-aas4j#230)

764c693

Update IEC61360 data specification template IDs (eclipse-aas4j#305)

650e494

Fix AAS XML order and include AAS.xsd in AASX (eclipse-aas4j#456)

f6ae093

Fix XML Operation serialization/deserialization wrappers (eclipse-aas…

843397f

…4j#448)

Handle embeddedDataSpecifications in XML submodel elements (eclipse-a…

2403df3

…as4j#208)

Fix nested embeddedDataSpecifications XML deserialization (eclipse-aa…

ecd3800

…s4j#389)

FriedJannik approved these changes Jan 15, 2026

View reviewed changes

mdanish98 suggested changes Jan 16, 2026

View reviewed changes

stiebitzhofer force-pushed the p0-fixes branch from 1ca3c93 to 33f8c7f Compare January 20, 2026 22:13

stiebitzhofer force-pushed the p0-fixes branch from 33f8c7f to c2c61f3 Compare January 20, 2026 22:14

stiebitzhofer added 2 commits January 20, 2026 23:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix P0 AAS XML/AASX compliance and spec alignment #458

Fix P0 AAS XML/AASX compliance and spec alignment #458

Uh oh!

stiebitzhofer commented Jan 14, 2026

Uh oh!

FriedJannik left a comment •

edited

Loading

Uh oh!

mdanish98 left a comment •

edited

Loading

Uh oh!

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

stiebitzhofer Jan 22, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

mdanish98 Jan 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Fix P0 AAS XML/AASX compliance and spec alignment #458

Are you sure you want to change the base?

Fix P0 AAS XML/AASX compliance and spec alignment #458

Uh oh!

Conversation

stiebitzhofer commented Jan 14, 2026

Summary

Testing

Commits

Uh oh!

FriedJannik left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mdanish98 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

FriedJannik left a comment •

edited

Loading

mdanish98 left a comment •

edited

Loading