Merge branch 'main' into development

Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>

Author: FrankSchnicke

.github/workflows/maven-run-tests.yml

@@ -5,7 +5,7 @@ name: Java CI with Maven
 
 on:
   pull_request:
-    branches: [ development, feature/**, bugfix/** ]
+    branches: [ main, development, feature/**, bugfix/** ]
 
 jobs:
   build:

dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/deserialize/AmlDeserializerTest.java

@@ -36,13 +36,13 @@ public class AmlDeserializerTest {
 
     private final AmlDeserializer deserializer = new AmlDeserializer();
 
-    AssetAdministrationShellEnvironment actual;
-    AssetAdministrationShellEnvironment expected;
+    private AssetAdministrationShellEnvironment actual;
+    private AssetAdministrationShellEnvironment expected;
 
     @Before
     public void init() throws FileNotFoundException, DeserializationException {
         actual = deserializer.read(FullExample.FILE);
-        expected = AASFull.ENVIRONMENT;
+        expected = AASFull.createEnvironment();
     }
 
     @Test

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

@@ -85,7 +85,7 @@
     ]
   },
   {
-    "idShort": "",
+    "idShort": "Test_AssetAdministrationShell_Mandatory",
     "modelType": {
       "name": "AssetAdministrationShell"
     },