Merge pull request #289 from bci-oss/migrate_aas_generator_to_aas4j

Migrate aas generator to aas4j

Author: atextor

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

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

core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/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.digitaltwin.aas4j.v3.dataformat.SerializationException;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
+import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSerializer;
+import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
+
 import org.eclipse.esmf.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();

core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAASVisitor.java

@@ -15,33 +15,34 @@
 import java.util.List;
 import java.util.Optional;
 
-import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
-import io.adminshell.aas.v3.model.ConceptDescription;
-import io.adminshell.aas.v3.model.Submodel;
-import io.adminshell.aas.v3.model.SubmodelElement;
+import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
+import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
+import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
+import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
+
 import org.eclipse.esmf.metamodel.Property;
 
 public class Context {
 
-   AssetAdministrationShellEnvironment environment;
+   Environment environment;
    Submodel submodel;
    Property property;
    SubmodelElement propertyResult;
 
-   public Context( AssetAdministrationShellEnvironment environment, Submodel ofInterest ) {
+   public Context( Environment environment, Submodel ofInterest ) {
       this.environment = environment;
       this.submodel = ofInterest;
    }
 
    public boolean hasEnvironmentConceptDescription( final String id ) {
       return getEnvironment().getConceptDescriptions().stream()
-            .anyMatch( x -> x.getIdentification().getIdentifier().equals( id ) );
+            .anyMatch( x -> x.getId().equals( id ) );
    }
 
    public ConceptDescription getConceptDescription( final String id ) {
       final Optional<ConceptDescription> optional =
             getEnvironment().getConceptDescriptions().stream()
-                  .filter( x -> x.getIdentification().getIdentifier().equals( id ) )
+                  .filter( x -> x.getId().equals( id ) )
                   .findFirst();
       if ( optional.isEmpty() ) {
          throw new IllegalArgumentException(
@@ -50,10 +51,14 @@ public ConceptDescription getConceptDescription( final String id ) {
       return optional.get();
    }
 
-   public AssetAdministrationShellEnvironment getEnvironment() {
+   public Environment getEnvironment() {
       return environment;
    }
 
+   public void setEnvironment( Environment environment ) {
+      this.environment = environment;
+   }
+
    public Submodel getSubmodel() {
       return submodel;
    }