Fix submodel merging and add asset information

Author: andreas-schilling

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

@@ -12,8 +12,6 @@
  */
 package io.openmanufacturing.sds.aspectmodel.aas;
 
-import static io.openmanufacturing.sds.aspectmodel.aas.AspectModelAASVisitor.ADMIN_SHELL_NAME;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -25,10 +23,8 @@
 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.AssetAdministrationShell;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
-import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAssetAdministrationShell;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultEnvironment;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultSubmodel;
 
@@ -104,14 +100,11 @@ protected ByteArrayOutputStream generateXmlOutput( final Map<Aspect, JsonNode> a
    private Environment mergeEnvironments( final Map<Aspect, Environment> aspectEnvironments ) {
       final Submodel submodel = new DefaultSubmodel.Builder().build();
       final Environment environment = 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();
 
-      final AssetAdministrationShell administrationShell =
-            new DefaultAssetAdministrationShell.Builder().idShort( ADMIN_SHELL_NAME ).build();
-      environment.setAssetAdministrationShells( Collections.singletonList( administrationShell ) );
-
       return environment;
    }
 

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

@@ -48,6 +48,7 @@
 import org.eclipse.digitaltwin.aas4j.v3.model.ValueList;
 import org.eclipse.digitaltwin.aas4j.v3.model.ValueReferencePair;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAssetAdministrationShell;
+import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAssetInformation;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultBlob;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultConceptDescription;
 import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultDataSpecificationIEC61360;
@@ -182,7 +183,13 @@ public Environment visitAspect( final Aspect aspect, Context context ) {
       createConceptDescription( aspect, context );
 
       final AssetAdministrationShell administrationShell =
-            new DefaultAssetAdministrationShell.Builder().idShort( ADMIN_SHELL_NAME ).build();
+            new DefaultAssetAdministrationShell.Builder()
+                  .id( DEFAULT_MAPPER.determineIdentifierFor( aspect ) )
+                  .idShort( ADMIN_SHELL_NAME )
+                  .assetInformation( new DefaultAssetInformation.Builder()
+                        .assetKind( context.getAssetKind() )
+                        .build() )
+                  .build();
       context
             .getEnvironment()
             .setAssetAdministrationShells( Collections.singletonList( administrationShell ) );

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

@@ -21,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
+import org.eclipse.digitaltwin.aas4j.v3.model.AssetKind;
 import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
 import org.eclipse.digitaltwin.aas4j.v3.model.ModelingKind;
@@ -145,6 +146,14 @@ public ModelingKind getModelingKind() {
       return ModelingKind.INSTANCE;
    }
 
+   public AssetKind getAssetKind() {
+      if ( aspectData == null ) {
+         return AssetKind.TYPE;
+      }
+
+      return AssetKind.INSTANCE;
+   }
+
    public String getPropertyShortId() {
       if ( ModelingKind.TEMPLATE.equals( getModelingKind() ) ) {
          return property.getName();