Replace admin-shell-io dependency with aas4j dependency and adjust API calls accordingly

Signed-off-by: Johannes Kristan <[email protected]>

Author: bs-jokri

core/sds-aspect-model-aas-generator/pom.xml

@@ -28,15 +28,15 @@
             <artifactId>sds-aspect-meta-model-java</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.admin-shell.aas</groupId>
+            <groupId>org.eclipse.aas4j</groupId>
             <artifactId>model</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.admin-shell.aas</groupId>
+            <groupId>org.eclipse.aas4j</groupId>
             <artifactId>dataformat-xml</artifactId>
         </dependency>
        <dependency>
-          <groupId>io.admin-shell.aas</groupId>
+          <groupId>org.eclipse.aas4j</groupId>
           <artifactId>dataformat-aasx</artifactId>
        </dependency>
         <dependency>

core/sds-aspect-model-aas-generator/src/main/java/io/openmanufacturing/sds/aspectmodel/aas/AspectModelAASGenerator.java

@@ -17,10 +17,11 @@
 import java.io.OutputStream;
 import java.util.function.Function;
 
-import io.adminshell.aas.v3.dataformat.SerializationException;
-import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
-import io.adminshell.aas.v3.dataformat.xml.XmlSerializer;
-import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
+import org.eclipse.aas4j.v3.dataformat.SerializationException;
+import org.eclipse.aas4j.v3.dataformat.aasx.AASXSerializer;
+import org.eclipse.aas4j.v3.dataformat.xml.XmlSerializer;
+import org.eclipse.aas4j.v3.model.Environment;
+
 import io.openmanufacturing.sds.metamodel.Aspect;
 
 /** Generator that generates an AASX file containing an AAS submodel for a given Aspect model */
@@ -56,7 +57,7 @@ public void generateAasXmlFile(
 
    protected ByteArrayOutputStream generateAasxOutput( Aspect aspect ) throws IOException {
       final AspectModelAASVisitor visitor = new AspectModelAASVisitor();
-      AssetAdministrationShellEnvironment environment = visitor.visitAspect( aspect, null );
+      Environment environment = visitor.visitAspect( aspect, null );
 
       try ( ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
          AASXSerializer serializer = new AASXSerializer();
@@ -69,7 +70,7 @@ protected ByteArrayOutputStream generateAasxOutput( Aspect aspect ) throws IOExc
 
    protected ByteArrayOutputStream generateXmlOutput( Aspect aspect ) throws IOException {
       final AspectModelAASVisitor visitor = new AspectModelAASVisitor();
-      AssetAdministrationShellEnvironment environment = visitor.visitAspect( aspect, null );
+      Environment environment = visitor.visitAspect( aspect, null );
 
       try ( ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
          XmlSerializer serializer = new XmlSerializer();