Merge pull request #364 from bci-oss/feature/add-generator-for-submodels

Feature/add generator for submodels

Author: atextor

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

@@ -13,11 +13,6 @@
    <artifactId>esmf-aspect-model-aas-generator</artifactId>
    <name>ESMF Aspect Model AAS Generator</name>
 
-   <properties>
-      <maven.compiler.source>11</maven.compiler.source>
-      <maven.compiler.target>11</maven.compiler.target>
-   </properties>
-
    <dependencies>
       <dependency>
          <groupId>org.eclipse.esmf</groupId>

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

@@ -15,18 +15,27 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Collections;
+import java.util.Map;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.Serializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.json.JsonSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSerializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
-
+import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
+import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultEnvironment;
+import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultSubmodel;
 import org.eclipse.esmf.metamodel.Aspect;
 
-/** Generator that generates an AASX file containing an AAS submodel for a given Aspect model */
+import com.fasterxml.jackson.databind.JsonNode;
+
+/**
+ * Generator that generates an AASX file containing an AAS submodel for a given Aspect model
+ */
 public class AspectModelAASGenerator {
 
    /**
@@ -57,6 +66,13 @@ public void generateAasXmlFile(
       }
    }
 
+   public void generateAasXmlFile(
+         final Aspect aspect, final JsonNode aspectData, final Function<String, OutputStream> nameMapper ) throws IOException {
+      try ( final OutputStream output = nameMapper.apply( aspect.getName() ) ) {
+         output.write( generateXmlOutput( Map.of( aspect, aspectData ) ).toByteArray() );
+      }
+   }
+
    /**
     * Generates an AAS JSON file for a given Aspect and writes it to a given OutputStream provided by <code>nameMapper<code/>
     *
@@ -71,20 +87,54 @@ public void generateAasJsonFile(
       }
    }
 
-   protected ByteArrayOutputStream generateAasxOutput( Aspect aspect ) throws IOException {
+   protected ByteArrayOutputStream generateXmlOutput( final Map<Aspect, JsonNode> aspectsWithData ) throws IOException {
+      final AspectModelAASVisitor visitor = new AspectModelAASVisitor().withPropertyMapper( new LangStringPropertyMapper() );
+
+      final Map<Aspect, Environment> aspectEnvironments =
+            aspectsWithData.entrySet().stream()
+                  .map( aspectWithData -> {
+                     final Submodel submodel = new DefaultSubmodel.Builder().build();
+                     final Environment environment = new DefaultEnvironment.Builder().submodels( Collections.singletonList( submodel ) ).build();
+                     final Context context = new Context( environment, submodel );
+                     context.setEnvironment( environment );
+                     context.setAspectData( aspectWithData.getValue() );
+
+                     return Map.entry( aspectWithData.getKey(), visitor.visitAspect( aspectWithData.getKey(), context ) );
+                  } )
+                  .collect( Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue ) );
+      final Environment mergedEnvironment = mergeEnvironments( aspectEnvironments );
+      try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
+         final XmlSerializer serializer = new XmlSerializer();
+         serializer.write( out, mergedEnvironment );
+         return out;
+      } catch ( final SerializationException e ) {
+         throw new IOException( e );
+      }
+   }
+
+   private Environment mergeEnvironments( final Map<Aspect, Environment> aspectEnvironments ) {
+      final Submodel submodel = new DefaultSubmodel.Builder().build();
+      return new DefaultEnvironment.Builder()
+            .assetAdministrationShells( aspectEnvironments.values().stream().flatMap( e -> e.getAssetAdministrationShells().stream() ).toList() )
+            .submodels( aspectEnvironments.values().stream().flatMap( e -> e.getSubmodels().stream() ).toList() )
+            .conceptDescriptions( aspectEnvironments.values().stream().flatMap( e -> e.getConceptDescriptions().stream() ).toList() )
+            .build();
+   }
+
+   protected ByteArrayOutputStream generateAasxOutput( final Aspect aspect ) throws IOException {
       final AspectModelAASVisitor visitor = new AspectModelAASVisitor();
-      Environment environment = visitor.visitAspect( aspect, null );
+      final Environment environment = visitor.visitAspect( aspect, null );
 
-      try ( ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
-         AASXSerializer serializer = new AASXSerializer();
+      try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
+         final AASXSerializer serializer = new AASXSerializer();
          serializer.write( environment, null, out );
          return out;
-      } catch ( SerializationException e ) {
+      } catch ( final SerializationException e ) {
          throw new IOException( e );
       }
    }
 
-   protected ByteArrayOutputStream generateXmlOutput( Aspect aspect ) throws IOException {
+   protected ByteArrayOutputStream generateXmlOutput( final Aspect aspect ) throws IOException {
       return generate( new XmlSerializer(), aspect );
    }
 
@@ -94,12 +144,12 @@ protected ByteArrayOutputStream generateJsonOutput( Aspect aspect ) throws IOExc
 
    protected ByteArrayOutputStream generate( Serializer serializer, Aspect aspect ) throws IOException {
       final AspectModelAASVisitor visitor = new AspectModelAASVisitor();
-      Environment environment = visitor.visitAspect( aspect, null );
+      final Environment environment = visitor.visitAspect( aspect, null );
 
-      try ( ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
+      try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
          serializer.write( out, environment );
          return out;
-      } catch ( SerializationException e ) {
+      } catch ( final SerializationException e ) {
          throw new IOException( e );
       }
    }