From 9dfbe60337711ae97ac6fd6a288f596192bab3f3 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Thu, 28 Nov 2024 15:46:31 +0100
Subject: [PATCH 1/7] Address use of deprecated APIs

---
 .../AspectModelJsonPayloadGeneratorTest.java  |  9 ++++--
 .../esmf/nativefeatures/LogbackFeature.java   |  1 +
 .../esmf/substitution/DummyLogger.java        |  1 +
 .../examples/GenerateDiagrams.java            | 28 ++++++++-----------
 .../pages/java-aspect-tooling.adoc            |  9 +++---
 .../GenerateAspectImplementationStub.java     |  1 +
 .../esmf/MainClassProcessLauncher.java        |  1 +
 7 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGeneratorTest.java b/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGeneratorTest.java
index 9178cf895..4c6d35a32 100644
--- a/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGeneratorTest.java
+++ b/core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGeneratorTest.java
@@ -548,11 +548,16 @@ void testGeneratedNumbersAreWithinRange( final RDFDatatype numericModelType, fin
 
       final Aspect dynamicAspect = createAspectWithDynamicNumericProperty( numericType, boundKind.orElse( null ),
             randomRange );
+
       final AspectModelJsonPayloadGenerator randomGenerator = new AspectModelJsonPayloadGenerator( dynamicAspect );
       final AspectModelJsonPayloadGenerator minGenerator = new AspectModelJsonPayloadGenerator( dynamicAspect,
-            new MinValueRandomStrategy() );
+            JsonPayloadGenerationConfigBuilder.builder()
+                  .randomStrategy( new MinValueRandomStrategy() )
+                  .build() );
       final AspectModelJsonPayloadGenerator maxGenerator = new AspectModelJsonPayloadGenerator( dynamicAspect,
-            new MaxValueRandomStrategy() );
+            JsonPayloadGenerationConfigBuilder.builder()
+                  .randomStrategy( new MaxValueRandomStrategy() )
+                  .build() );
       try {
          final String generatedJson = randomGenerator.generateJson();
          final String minValue = minGenerator.generateJson();
diff --git a/core/esmf-native-support/src/main/java/org/eclipse/esmf/nativefeatures/LogbackFeature.java b/core/esmf-native-support/src/main/java/org/eclipse/esmf/nativefeatures/LogbackFeature.java
index b10936713..d887cfaa9 100644
--- a/core/esmf-native-support/src/main/java/org/eclipse/esmf/nativefeatures/LogbackFeature.java
+++ b/core/esmf-native-support/src/main/java/org/eclipse/esmf/nativefeatures/LogbackFeature.java
@@ -48,6 +48,7 @@ public void beforeAnalysis( final Feature.BeforeAnalysisAccess access ) {
       Native.forClass( ch.qos.logback.core.util.Loader.class )
             .initializeAtBuildTime()
             .registerEverythingForReflection();
+      //noinspection deprecation
       Native.forClass( ch.qos.logback.core.util.StatusPrinter.class )
             .initializeAtBuildTime()
             .registerEverythingForReflection();
diff --git a/core/esmf-native-support/src/main/java/org/eclipse/esmf/substitution/DummyLogger.java b/core/esmf-native-support/src/main/java/org/eclipse/esmf/substitution/DummyLogger.java
index 40e993d0a..30c09fbb1 100644
--- a/core/esmf-native-support/src/main/java/org/eclipse/esmf/substitution/DummyLogger.java
+++ b/core/esmf-native-support/src/main/java/org/eclipse/esmf/substitution/DummyLogger.java
@@ -23,6 +23,7 @@
 import org.apache.logging.log4j.util.MessageSupplier;
 import org.apache.logging.log4j.util.Supplier;
 
+@SuppressWarnings( "deprecation" ) // Used by original Logger interface
 public class DummyLogger implements Logger {
    @Override
    public void catching( final Level level, final Throwable throwable ) {
diff --git a/documentation/developer-guide/modules/tooling-guide/examples/GenerateDiagrams.java b/documentation/developer-guide/modules/tooling-guide/examples/GenerateDiagrams.java
index 5edc18b3f..14d12f01e 100644
--- a/documentation/developer-guide/modules/tooling-guide/examples/GenerateDiagrams.java
+++ b/documentation/developer-guide/modules/tooling-guide/examples/GenerateDiagrams.java
@@ -13,24 +13,23 @@
 
 package examples;
 
-// tag::imports[]
-import java.io.OutputStream;
+import java.io.File;
+import java.io.IOException;
 import java.util.Locale;
-import java.util.Set;
 
+// tag::imports[]
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
-import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator.Format;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfig;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfigBuilder;
 import org.eclipse.esmf.aspectmodel.loader.AspectModelLoader;
 import org.eclipse.esmf.metamodel.AspectModel;
 // end::imports[]
 
-import java.io.File;
-import java.io.IOException;
 import org.junit.jupiter.api.Test;
 
 public class GenerateDiagrams extends AbstractGenerator {
    @Test
-   public void generateDiagram() throws IOException {
+   public void generateDiagram() {
       // tag::generate[]
       // AspectModel as returned by the AspectModelLoader
       final AspectModel aspectModel = // ...
@@ -39,15 +38,12 @@ public void generateDiagram() throws IOException {
                   new File( "aspect-models/org.eclipse.esmf.examples.movement/1.0.0/Movement.ttl" ) );
       // tag::generate[]
 
-      final AspectModelDiagramGenerator generator = new AspectModelDiagramGenerator( aspectModel.aspect() ); // <1>
-
-      // Variant 1: Generate a diagram in SVG format using @en descriptions and preferredNames from the model
-      final OutputStream output = outputStreamForName( "diagram.svg" );
-      generator.generateDiagram( Format.SVG, Locale.ENGLISH, output ); // <2>
-      output.close();
-
-      // Variant 2: Generate diagrams in multiple formats, for all languages that are present in the model.
-      generator.generateDiagrams( Set.of( Format.PNG, Format.SVG ), this::outputStreamForName ); // <3>
+      final DiagramGenerationConfig config = DiagramGenerationConfigBuilder.builder()
+            .format( DiagramGenerationConfig.Format.SVG )
+            .language( Locale.ENGLISH )
+            .build();
+      new AspectModelDiagramGenerator( aspectModel.aspect(), config ) // <1>
+            .generate( this::outputStreamForName ); // <2>
       // end::generate[]
    }
 }
diff --git a/documentation/developer-guide/modules/tooling-guide/pages/java-aspect-tooling.adoc b/documentation/developer-guide/modules/tooling-guide/pages/java-aspect-tooling.adoc
index 29e523410..6a06625ad 100644
--- a/documentation/developer-guide/modules/tooling-guide/pages/java-aspect-tooling.adoc
+++ b/documentation/developer-guide/modules/tooling-guide/pages/java-aspect-tooling.adoc
@@ -359,11 +359,10 @@ include::example$GenerateDiagrams.java[tags=imports]
 include::example$GenerateDiagrams.java[tags=generate]
 ----
 
-<1> The diagram generator is initialized with the loaded model.
-<2> The simple call for one output format and one language (i.e., descriptions and preferredNames of one locale) takes
-one output stream to write the image to.
-<3> It is also possible to generate multiple diagrams, one for each combination of output format and language. For that,
-the set of target formats is given as well as a mapping function.
+<1> The diagram generator is initialized with the loaded model and the
+generation configuration.
+<2> The generation takes the output stream for the output file name as input and
+writes the generated diagram to the output stream.
 
 [[generating-html-documentation]]
 === Generating HTML Documentation
diff --git a/tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateAspectImplementationStub.java b/tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateAspectImplementationStub.java
index 6e555d81e..fc8bc7eb1 100644
--- a/tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateAspectImplementationStub.java
+++ b/tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateAspectImplementationStub.java
@@ -82,6 +82,7 @@ public class GenerateAspectImplementationStub extends CodeGenerationMojo {
    private MavenProject mavenProject;
 
    @Component
+   @SuppressWarnings( "deprecation" ) // @Component annotation is required for successful injection of dependency with no alternative
    private BuildPluginManager pluginManager;
 
    @Parameter( required = true )
diff --git a/tools/samm-cli/src/test/java/org/eclipse/esmf/MainClassProcessLauncher.java b/tools/samm-cli/src/test/java/org/eclipse/esmf/MainClassProcessLauncher.java
index 01cb458b0..ab6478dcf 100644
--- a/tools/samm-cli/src/test/java/org/eclipse/esmf/MainClassProcessLauncher.java
+++ b/tools/samm-cli/src/test/java/org/eclipse/esmf/MainClassProcessLauncher.java
@@ -37,6 +37,7 @@
  * replacement mechanism for capturing System.exit() <a href="https://bugs.openjdk.org/browse/JDK-8199704">has been defined yet</a>.
  * Therefore, there is currently no other way than using the deprecated class.
  */
+@SuppressWarnings( "removal" )
 public class MainClassProcessLauncher extends ProcessLauncher {
    private static final Logger LOG = LoggerFactory.getLogger( MainClassProcessLauncher.class );
    private final Class<?> mainClass;

From b2f8ac1c2573e22b8890f95872c65dd86330a9e0 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Fri, 29 Nov 2024 14:21:49 +0100
Subject: [PATCH 2/7] Use generator infrastructure in AasToAspectModelGenerator

---
 .../aas/AasToAspectModelGenerator.java        | 45 ++++++++++++-----
 .../aas/AspectGenerationConfig.java           | 23 +++++++++
 core/esmf-aspect-model-generator/pom.xml      |  4 ++
 .../aspectmodel/generator/AspectArtifact.java | 48 +++++++++++++++++++
 .../esmf/aspectmodel/generator/Generator.java |  5 ++
 .../esmf/aas/AasListSubmodelsCommand.java     | 11 ++++-
 6 files changed, 124 insertions(+), 12 deletions(-)
 create mode 100644 core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectGenerationConfig.java
 create mode 100644 core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/AspectArtifact.java

diff --git a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
index 826135b00..85bae73ac 100644
--- a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
+++ b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
@@ -30,6 +30,8 @@
 import java.util.stream.Stream;
 
 import org.eclipse.esmf.aspectmodel.VersionNumber;
+import org.eclipse.esmf.aspectmodel.generator.AspectArtifact;
+import org.eclipse.esmf.aspectmodel.generator.Generator;
 import org.eclipse.esmf.aspectmodel.loader.MetaModelBaseAttributes;
 import org.eclipse.esmf.aspectmodel.loader.ValueInstantiator;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
@@ -98,17 +100,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AasToAspectModelGenerator {
+public class AasToAspectModelGenerator extends Generator<Environment, AspectModelUrn, Aspect, AspectGenerationConfig, AspectArtifact> {
+   public static final AspectGenerationConfig DEFAULT_CONFIG = AspectGenerationConfigBuilder.builder().build();
    private static final Logger LOG = LoggerFactory.getLogger( AasToAspectModelGenerator.class );
    private final Environment aasEnvironment;
-   private final Map<org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement, Property> properties = new HashMap<>();
+   private final Map<SubmodelElement, Property> properties = new HashMap<>();
    private final ValueInstantiator valueInstantiator = new ValueInstantiator();
    private AspectModelUrn aspectUrn;
 
    private record ElementName( String name, boolean isSynthetic ) {}
 
    private AasToAspectModelGenerator( final Environment aasEnvironment ) {
-      this.aasEnvironment = aasEnvironment;
+      super( aasEnvironment, DEFAULT_CONFIG );
+      this.aasEnvironment = focus;
    }
 
    public static AasToAspectModelGenerator fromAasXml( final InputStream inputStream ) {
@@ -155,14 +159,33 @@ public static AasToAspectModelGenerator fromFile( final java.io.File file ) {
       }
    }
 
-   public List<Aspect> generateAspects() {
+   @Override
+   public Stream<AspectArtifact> generate() {
       return aasEnvironment.getSubmodels()
             .stream()
             .filter( submodel -> submodel.getKind().equals( ModellingKind.TEMPLATE ) )
             .map( this::submodelToAspect )
-            .toList();
+            .map( aspect -> new AspectArtifact( aspect.urn(), aspect ) );
+   }
+
+   /**
+    * Generates the list of Aspects for the input AAS environment
+    *
+    * @return the list of Aspects
+    * @deprecated Use {@link #generate()} instead
+    */
+   @Deprecated( forRemoval = true )
+   public List<Aspect> generateAspects() {
+      return generate().map( AspectArtifact::getContent ).toList();
    }
 
+   /**
+    * Lists the names of submodel templates contained in the input AAS environment
+    *
+    * @return the idShorts of the submodel templates
+    * @deprecated Will be removed without replacement; this is out-of-the-box functionality of AAS4J.
+    */
+   @Deprecated( forRemoval = true )
    public List<String> getSubmodelNames() {
       return aasEnvironment.getSubmodels()
             .stream()
@@ -175,12 +198,12 @@ private String iriToReversedHostNameNotation( final IRI iri ) {
       final URI uri;
       try {
          uri = URI.create( iri.toString().contains( "://" ) ? iri.toString() : "https://" + iri );
-      } catch ( IllegalArgumentException e ) {
-         throw new IllegalArgumentException( "Incorrect IRI: " + iri, e );
+      } catch ( final IllegalArgumentException exception ) {
+         throw new AspectModelGenerationException( "Incorrect IRI: " + iri, exception );
       }
 
       if ( uri.getHost() == null ) {
-         throw new IllegalArgumentException( "URI doesn't contain host: " + uri );
+         throw new AspectModelGenerationException( "URI doesn't contain host: " + uri );
       }
 
       final String[] hostParts = uri.getHost().split( "\\." );
@@ -193,7 +216,7 @@ private String iriToReversedHostNameNotation( final IRI iri ) {
             .filter( StringUtils::isNotBlank )
             .collect( Collectors.joining( "." ) );
 
-      return reversedHost + (path.isEmpty() ? "" : "." + path);
+      return reversedHost + ( path.isEmpty() ? "" : "." + path );
    }
 
    private Optional<IRI> iri( final String lexicalRepresentation ) {
@@ -327,8 +350,8 @@ private List<Operation> createOperations( final Submodel submodel ) {
 
    private List<Event> createEvents( final Submodel submodel ) {
       return submodel.getSubmodelElements().stream()
-            .filter( org.eclipse.digitaltwin.aas4j.v3.model.EventElement.class::isInstance )
-            .map( org.eclipse.digitaltwin.aas4j.v3.model.EventElement.class::cast )
+            .filter( EventElement.class::isInstance )
+            .map( EventElement.class::cast )
             .map( this::createEvent )
             .toList();
    }
diff --git a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectGenerationConfig.java b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectGenerationConfig.java
new file mode 100644
index 000000000..d120c1d41
--- /dev/null
+++ b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AspectGenerationConfig.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
+ *
+ * See the AUTHORS file(s) distributed with this work for additional
+ * information regarding authorship.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+package org.eclipse.esmf.aspectmodel.aas;
+
+import org.eclipse.esmf.aspectmodel.generator.GenerationConfig;
+
+import io.soabase.recordbuilder.core.RecordBuilder;
+
+@RecordBuilder
+public record AspectGenerationConfig(
+) implements GenerationConfig {
+}
diff --git a/core/esmf-aspect-model-generator/pom.xml b/core/esmf-aspect-model-generator/pom.xml
index fa3f07c5f..9bb3e1da1 100644
--- a/core/esmf-aspect-model-generator/pom.xml
+++ b/core/esmf-aspect-model-generator/pom.xml
@@ -31,6 +31,10 @@
          <groupId>org.eclipse.esmf</groupId>
          <artifactId>esmf-aspect-meta-model-java</artifactId>
       </dependency>
+      <dependency>
+         <groupId>org.eclipse.esmf</groupId>
+         <artifactId>esmf-aspect-model-serializer</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.apache.velocity</groupId>
          <artifactId>velocity-engine-core</artifactId>
diff --git a/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/AspectArtifact.java b/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/AspectArtifact.java
new file mode 100644
index 000000000..642ada00d
--- /dev/null
+++ b/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/AspectArtifact.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
+ *
+ * See the AUTHORS file(s) distributed with this work for additional
+ * information regarding authorship.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+package org.eclipse.esmf.aspectmodel.generator;
+
+import java.nio.charset.StandardCharsets;
+
+import org.eclipse.esmf.aspectmodel.serializer.AspectSerializer;
+import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
+import org.eclipse.esmf.metamodel.Aspect;
+
+/**
+ * Result of a generation process that generates an Aspect
+ */
+public class AspectArtifact implements Artifact<AspectModelUrn, Aspect> {
+   private final AspectModelUrn urn;
+   private final Aspect aspect;
+
+   public AspectArtifact( final AspectModelUrn urn, final Aspect aspect ) {
+      this.urn = urn;
+      this.aspect = aspect;
+   }
+
+   @Override
+   public AspectModelUrn getId() {
+      return urn;
+   }
+
+   @Override
+   public Aspect getContent() {
+      return aspect;
+   }
+
+   @Override
+   public byte[] serialize() {
+      return AspectSerializer.INSTANCE.aspectToString( aspect ).getBytes( StandardCharsets.UTF_8 );
+   }
+}
diff --git a/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/Generator.java b/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/Generator.java
index db65fbf28..2f9855432 100644
--- a/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/Generator.java
+++ b/core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/Generator.java
@@ -37,6 +37,11 @@
  */
 public abstract class Generator<F, I, T, C extends GenerationConfig, A extends Artifact<I, T>> {
    private static final Logger LOG = LoggerFactory.getLogger( Generator.class );
+
+   /**
+    * The "focus" element, i.e., the main "input" for the generation process
+    */
+   @Getter
    protected final F focus;
 
    @Getter
diff --git a/tools/samm-cli/src/main/java/org/eclipse/esmf/aas/AasListSubmodelsCommand.java b/tools/samm-cli/src/main/java/org/eclipse/esmf/aas/AasListSubmodelsCommand.java
index 66a8c5af5..a3b3936d9 100644
--- a/tools/samm-cli/src/main/java/org/eclipse/esmf/aas/AasListSubmodelsCommand.java
+++ b/tools/samm-cli/src/main/java/org/eclipse/esmf/aas/AasListSubmodelsCommand.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.eclipse.esmf.AbstractCommand;
 import org.eclipse.esmf.LoggingMixin;
@@ -11,6 +12,8 @@
 import org.eclipse.esmf.exception.CommandException;
 
 import org.apache.commons.io.FilenameUtils;
+import org.eclipse.digitaltwin.aas4j.v3.model.ModellingKind;
+import org.eclipse.digitaltwin.aas4j.v3.model.Referable;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AasListSubmodelsCommand.COMMAND_NAME, description = "Get list of submodel templates of AAS input",
@@ -37,7 +40,13 @@ public void run() {
          throw new CommandException( "Input file name must be one of " + AasFileFormat.allValues() );
       }
 
-      final List<String> submodelNames = AasToAspectModelGenerator.fromFile( new File( path ) ).getSubmodelNames();
+      final List<String> submodelNames = AasToAspectModelGenerator.fromFile( new File( path ) )
+            .getFocus()
+            .getSubmodels()
+            .stream()
+            .filter( submodel -> submodel.getKind().equals( ModellingKind.TEMPLATE ) )
+            .map( Referable::getIdShort )
+            .toList();
 
       for ( final String submodelName : submodelNames ) {
          final int index = submodelNames.indexOf( submodelName );

From f60f8c635d09c7dbfd13769c19e89aefc7ee9dc8 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Mon, 29 Jul 2024 10:30:40 +0200
Subject: [PATCH 3/7] Add systematic tests for IDTA-published AASX to SAMM
 translation

---
 .../loader/AttributeValueRetriever.java       |  2 +-
 core/esmf-aspect-model-aas-generator/pom.xml  |  5 ++
 .../aas/AasToAspectModelGenerator.java        | 31 +++++--
 .../aas/AasToAspectModelGeneratorTest.java    | 84 +++++++++++++++----
 4 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AttributeValueRetriever.java b/core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AttributeValueRetriever.java
index 2c6bc764d..9391f61c1 100644
--- a/core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AttributeValueRetriever.java
+++ b/core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AttributeValueRetriever.java
@@ -71,7 +71,7 @@ private boolean isRdfList( final Resource resource ) {
 
    /**
     * Returns the values of n-ary attributes on a model element (or its super elements), or if a given attribute is an rdf:List, the list
-    * elements. The list will be ordered by precedence, e.g., if a Property is present on both the current element and it's superelement,
+    * elements. The list will be ordered by precedence, e.g., if a Property is present on both the current element and its superelement,
     * the assertion on the current element will be on a lower list index. Duplicate attribute assertions are removed and only the assertion
     * with the highest precedence will be returned (bottom-most in the inheritance tree), this includes multiple assertions for the same
     * attribute with rdf:langString values with the same language tag. For example:
diff --git a/core/esmf-aspect-model-aas-generator/pom.xml b/core/esmf-aspect-model-aas-generator/pom.xml
index 9d8a6acb3..7d3cd97c4 100644
--- a/core/esmf-aspect-model-aas-generator/pom.xml
+++ b/core/esmf-aspect-model-aas-generator/pom.xml
@@ -67,6 +67,11 @@
          <artifactId>assertj-core</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.eclipse.esmf</groupId>
+         <artifactId>esmf-aspect-model-validator</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>
diff --git a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
index 85bae73ac..ee3a7b36d 100644
--- a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
+++ b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
@@ -335,8 +335,8 @@ private Aspect submodelToAspect( final Submodel submodel ) {
    private List<Property> createProperties( final Submodel submodel ) {
       return submodel.getSubmodelElements().stream()
             .filter( submodelElement ->
-                  !submodelElement.getClass().isAssignableFrom( org.eclipse.digitaltwin.aas4j.v3.model.Operation.class )
-                        && !submodelElement.getClass().isAssignableFrom( EventElement.class ) )
+                  !org.eclipse.digitaltwin.aas4j.v3.model.Operation.class.isAssignableFrom( submodelElement.getClass() )
+                        && !EventElement.class.isAssignableFrom( submodelElement.getClass() ) )
             .map( this::createProperty ).toList();
    }
 
@@ -500,15 +500,30 @@ private static Set<LangString> langStringSet( final List<? extends AbstractLangS
    }
 
    private Optional<String> validIrdiOrUri( final String input ) {
-      return Irdi.from( input ).map( irdi -> "urn:irdi:" + irdi )
-            .or( () -> {
-               if ( input.startsWith( "http:" ) || input.startsWith( "https:" ) ) {
-                  return Optional.of( input );
-               } else if ( input.startsWith( "www." ) ) {
-                  return Optional.of( "https://" + input );
+      final Optional<String> irdi = Irdi.from( input ).map( i -> "urn:irdi:" + i );
+      final Optional<URI> uri = Optional.of( input )
+            .map( String::trim )
+            .flatMap( inputUri -> {
+               if ( inputUri.startsWith( "http:" ) || inputUri.startsWith( "https:" ) ) {
+                  return Optional.of( inputUri );
+               } else if ( inputUri.startsWith( "www." ) ) {
+                  return Optional.of( "https://" + inputUri );
                }
                return Optional.empty();
+            } )
+            .flatMap( inputUri -> {
+               try {
+                  return Optional.of( URI.create( inputUri ) );
+               } catch ( final IllegalArgumentException exception ) {
+                  return Optional.empty();
+               }
             } );
+
+      final Optional<String> result = irdi.or( () -> uri.map( URI::toString ) );
+      if ( result.isEmpty() ) {
+         LOG.warn( "Neither valid IRDI or valid URI: " + input );
+      }
+      return result;
    }
 
    private Characteristic createCharacteristicFromRelationShipElement( final RelationshipElement relationshipElement,
diff --git a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
index 3204bfd34..25d795efe 100644
--- a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
+++ b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
@@ -18,13 +18,27 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.function.Consumer;
-
+import java.util.stream.Stream;
+
+import org.eclipse.esmf.aspectmodel.generator.AspectArtifact;
+import org.eclipse.esmf.aspectmodel.loader.AspectModelLoader;
+import org.eclipse.esmf.aspectmodel.serializer.AspectSerializer;
+import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
+import org.eclipse.esmf.aspectmodel.validation.services.AspectModelValidator;
+import org.eclipse.esmf.aspectmodel.validation.services.ViolationFormatter;
 import org.eclipse.esmf.metamodel.Aspect;
+import org.eclipse.esmf.metamodel.AspectModel;
 import org.eclipse.esmf.test.TestAspect;
 import org.eclipse.esmf.test.TestResources;
 
@@ -32,17 +46,55 @@
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.json.JsonDeserializer;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlDeserializer;
 import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class AasToAspectModelGeneratorTest {
-   @Test
-   void testTranslateDigitalNameplate() {
-      final InputStream aasx = AasToAspectModelGeneratorTest.class.getClassLoader()
-            .getResourceAsStream( "idta/Sample_ZVEI_Digital_Nameplate_V10.aasx" );
-      final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( aasx );
-      assertThatCode( aspectModelGenerator::generateAspects ).doesNotThrowAnyException();
+   @ParameterizedTest
+   @MethodSource( "idtaSubmodelFiles" )
+   void testIdtaAasxFilesCanBeTranslated( final File aasxFile ) {
+      try ( final InputStream input = new FileInputStream( aasxFile ) ) {
+         final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( input );
+         final List<Aspect> aspects = aspectModelGenerator.generate().map( AspectArtifact::getContent ).toList();
+         final String result = AspectSerializer.INSTANCE.aspectToString( aspects.iterator().next() );
+         final AspectModel aspectModel = new AspectModelLoader().load( new ByteArrayInputStream( result.getBytes() ) );
+         final List<Violation> violations = new AspectModelValidator().validateModel( aspectModel );
+         if ( !violations.isEmpty() ) {
+            final String report = new ViolationFormatter().apply( violations );
+            System.out.println( report );
+            System.out.println( "====" );
+            System.out.println( result );
+            fail();
+         }
+      } catch ( final IOException exception ) {
+         fail( exception );
+      } catch ( final AspectModelGenerationException aspectModelGenerationException ) {
+         if ( aspectModelGenerationException.getCause() instanceof final DeserializationException cause ) {
+            System.err.println( "Could not load AASX file: " + aasxFile.getName() + ". Consider reporting to IDTA or AAS4J project." );
+         } else {
+            fail( aspectModelGenerationException );
+         }
+      }
+   }
+
+   protected static Stream<Arguments> idtaSubmodelFiles() throws URISyntaxException, IOException {
+      final URL resource = AasToAspectModelGeneratorTest.class.getResource( "/submodel-templates" );
+      try ( final Stream<Path> stream = Files.walk( Paths.get( resource.toURI() ) ) ) {
+         final List<Arguments> list = stream.filter( Files::isRegularFile )
+               .filter( file -> file.getFileName().toString().endsWith( ".aasx" ) )
+               .map( Path::toFile )
+               .map( file -> Arguments.of( Named.of( file.getName(), file ) ) )
+               .toList();
+         if ( list.isEmpty() ) {
+            fail( "IDTA AASX files not found. Please make sure they are available; in the project root run: git submodule update --init "
+                  + "--recursive" );
+         }
+         return list.stream();
+      }
    }
 
    @Test
@@ -50,9 +102,9 @@ void testSeeReferences() {
       final InputStream inputStream = AasToAspectModelGeneratorTest.class.getClassLoader().getResourceAsStream(
             "idta/IDTA 02022-1-0_Template_Wireless Communication.aasx" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( inputStream );
-      final List<Aspect> aspects = aspectModelGenerator.generateAspects();
+      final List<Aspect> aspects = aspectModelGenerator.generate().map( AspectArtifact::getContent ).toList();
 
-      assertThatCode( aspectModelGenerator::generateAspects ).doesNotThrowAnyException();
+      assertThatCode( aspectModelGenerator::generate ).doesNotThrowAnyException();
 
       aspects.stream()
             .flatMap( aspect -> aspect.getProperties().stream() )
@@ -68,7 +120,7 @@ void testRoundtripConversion( final TestAspect testAspect ) throws Deserializati
       final Aspect aspect = TestResources.load( testAspect ).aspect();
       final Consumer<AasToAspectModelGenerator> assertForValidator = aspectModelGenerator ->
             assertThatCode( () -> {
-               final List<Aspect> aspects = aspectModelGenerator.generateAspects();
+               final List<Aspect> aspects = aspectModelGenerator.generate().map( AspectArtifact::getContent ).toList();
                assertThat( aspects ).singleElement().satisfies( generatedAspect ->
                      assertThat( generatedAspect.urn() ).isEqualTo( aspect.urn() ) );
             } ).doesNotThrowAnyException();
@@ -90,7 +142,7 @@ void testGetAspectModelUrnFromSubmodelIdentifier() {
       // Submodel has an Aspect Model URN as identifier
       final Environment aasEnvironment = loadEnvironment( "SMTWithAspectModelUrnId.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example:1.0.0#Submodel1" ) );
    }
 
@@ -99,7 +151,7 @@ void testGetAspectModelUrnFromConceptDescription() {
       // Submodel has a Concept Description that points to an Aspect Model URN
       final Environment aasEnvironment = loadEnvironment( "SMTWithAspectModelUrnInConceptDescription.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example:1.0.0#Submodel1" ) );
    }
 
@@ -109,7 +161,7 @@ void testConstructAspectModelUrn1() {
       // It has a version and an IRI identifier and an idShort
       final Environment aasEnvironment = loadEnvironment( "SMTAspectModelUrnInConstruction1.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example.www:1.2.3#Submodel1" ) );
    }
 
@@ -119,7 +171,7 @@ void testConstructAspectModelUrn2() {
       // It has a version and an IRDI identifier and an idShort
       final Environment aasEnvironment = loadEnvironment( "SMTAspectModelUrnInConstruction2.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example:1.2.3#Submodel1" ) );
    }
 
@@ -129,7 +181,7 @@ void testConstructAspectModelUrn3() {
       // It has an IRDI identifier and an idShort, but no version
       final Environment aasEnvironment = loadEnvironment( "SMTAspectModelUrnInConstruction3.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example:1.0.0#Submodel1" ) );
    }
 
@@ -139,7 +191,7 @@ void testConstructAspectModelUrn4() {
       // It has an IRDI identifier, but no idShort and no version
       final Environment aasEnvironment = loadEnvironment( "SMTAspectModelUrnInConstruction4.aas.xml" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromEnvironment( aasEnvironment );
-      assertThat( aspectModelGenerator.generateAspects() ).singleElement().satisfies( aspect ->
+      assertThat( aspectModelGenerator.generate() ).map( AspectArtifact::getContent ).singleElement().satisfies( aspect ->
             assertThat( aspect.urn().toString() ).isEqualTo( "urn:samm:com.example:1.0.0#AAAAAA000abf2fd07" ) );
    }
 

From f20bbbba2b891b3f335743ea43dd0e1cdcb81f50 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Fri, 6 Dec 2024 15:04:06 +0100
Subject: [PATCH 4/7] Add IDTA submodel-templates as git submodule

---
 .github/workflows/pull-request-check.yml      |   2 +
 .github/workflows/release-workflow.yml        |  10 ++++-
 .gitmodules                                   |   4 ++
 .../aas/AasToAspectModelGeneratorTest.java    |  38 +++++++++++-------
 ...2-1-0_Template_Wireless Communication.aasx | Bin 9326 -> 0 bytes
 .../Sample_ZVEI_Digital_Nameplate_V10.aasx    | Bin 7845 -> 0 bytes
 .../src/test/resources/submodel-templates     |   1 +
 7 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 .gitmodules
 delete mode 100644 core/esmf-aspect-model-aas-generator/src/test/resources/idta/IDTA 02022-1-0_Template_Wireless Communication.aasx
 delete mode 100644 core/esmf-aspect-model-aas-generator/src/test/resources/idta/Sample_ZVEI_Digital_Nameplate_V10.aasx
 create mode 160000 core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index 59f6d651c..e2f507da7 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Check code style
         if: matrix.os == 'ubuntu-20.04'
diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
index 15e35fc18..955cc1c2d 100644
--- a/.github/workflows/release-workflow.yml
+++ b/.github/workflows/release-workflow.yml
@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       # Required for Maven
       - name: Set up JDK 17
@@ -50,6 +52,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       # Even though the build itself is done using the GraalVM JDK
       # (see below), we use the setup-java action to have GPG configured
@@ -145,6 +149,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Setup JDK
         uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
@@ -218,6 +224,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Setup JDK
         uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
@@ -362,7 +370,7 @@ jobs:
           comment-template: |
             Release {release_link} addresses this.
 
-      # Sign SAML-CLI Windows executable
+      # Sign SAMM-CLI Windows executable
       - name: Get Artifact ID (Windows)
         shell: bash
         run: |
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..184240d8f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates"]
+	path = core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates
+	url = https://github.com/admin-shell-io/submodel-templates.git
+	branch = main
diff --git a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
index 25d795efe..b9d5524fa 100644
--- a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
+++ b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
@@ -60,6 +60,9 @@ void testIdtaAasxFilesCanBeTranslated( final File aasxFile ) {
       try ( final InputStream input = new FileInputStream( aasxFile ) ) {
          final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( input );
          final List<Aspect> aspects = aspectModelGenerator.generate().map( AspectArtifact::getContent ).toList();
+         if ( aspects.isEmpty() ) {
+            fail( "Translation of " + aasxFile.getName() + " yielded no Aspects" );
+         }
          final String result = AspectSerializer.INSTANCE.aspectToString( aspects.iterator().next() );
          final AspectModel aspectModel = new AspectModelLoader().load( new ByteArrayInputStream( result.getBytes() ) );
          final List<Violation> violations = new AspectModelValidator().validateModel( aspectModel );
@@ -81,26 +84,44 @@ void testIdtaAasxFilesCanBeTranslated( final File aasxFile ) {
       }
    }
 
+   private static final List<String> IGNORED_AASX_FILES = List.of(
+         "IDTA02026-1-0_Template_ProvisionOf3DModels.aasx",
+         "IDTA 02004-1-2_Template_Handover Documentation.aasx",
+         "Sample_ZVEI_Digital_Nameplate_V10.aasx",
+         "SMT_Pure_Technical_Data_V11.aasx",
+         "sample-zvei-techdata-V11.aasx",
+         "SMT_qualified_Technical_Data_V11.aasx",
+         "IDTA 02010-1-0_Template_ServiceRequestNotification.aasx",
+         "IDTA 02011-1-0_Template_HierarchicalStructuresEnablingBoM.aasx",
+         "IDTA 02011-1-1_Template_HSEBoM.aasx"
+   );
+
    protected static Stream<Arguments> idtaSubmodelFiles() throws URISyntaxException, IOException {
+      final String submodelTemplatesMissing =
+            "IDTA AASX files not found. Please make sure they are available; in the project root run: git submodule update --init "
+                  + "--recursive";
       final URL resource = AasToAspectModelGeneratorTest.class.getResource( "/submodel-templates" );
       try ( final Stream<Path> stream = Files.walk( Paths.get( resource.toURI() ) ) ) {
          final List<Arguments> list = stream.filter( Files::isRegularFile )
                .filter( file -> file.getFileName().toString().endsWith( ".aasx" ) )
                .map( Path::toFile )
+               .filter( file -> !IGNORED_AASX_FILES.contains( file.getName() ) )
                .map( file -> Arguments.of( Named.of( file.getName(), file ) ) )
                .toList();
          if ( list.isEmpty() ) {
-            fail( "IDTA AASX files not found. Please make sure they are available; in the project root run: git submodule update --init "
-                  + "--recursive" );
+            fail( submodelTemplatesMissing );
          }
          return list.stream();
+      } catch ( final NullPointerException exception ) {
+         fail( submodelTemplatesMissing );
+         return Stream.empty();
       }
    }
 
    @Test
    void testSeeReferences() {
       final InputStream inputStream = AasToAspectModelGeneratorTest.class.getClassLoader().getResourceAsStream(
-            "idta/IDTA 02022-1-0_Template_Wireless Communication.aasx" );
+            "submodel-templates/published/Wireless Communication/1/0/IDTA 02022-1-0_Template_Wireless Communication.aasx" );
       final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( inputStream );
       final List<Aspect> aspects = aspectModelGenerator.generate().map( AspectArtifact::getContent ).toList();
 
@@ -203,15 +224,4 @@ private Environment loadEnvironment( final String name ) {
       }
       return null;
    }
-
-   private InputStream getIdtaModel( final String path ) {
-      try {
-         final URL url = new URL(
-               "https://github.com/admin-shell-io/submodel-templates/raw/refs/heads/main/published/" + path.replaceAll( " ", "%20" ) );
-         return url.openStream();
-      } catch ( final Exception e ) {
-         e.printStackTrace();
-         return null;
-      }
-   }
 }
diff --git a/core/esmf-aspect-model-aas-generator/src/test/resources/idta/IDTA 02022-1-0_Template_Wireless Communication.aasx b/core/esmf-aspect-model-aas-generator/src/test/resources/idta/IDTA 02022-1-0_Template_Wireless Communication.aasx
deleted file mode 100644
index 39a0e562b3e963aed8574e53ebe17b1a7cb9cb83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9326
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
DgjHEI

diff --git a/core/esmf-aspect-model-aas-generator/src/test/resources/idta/Sample_ZVEI_Digital_Nameplate_V10.aasx b/core/esmf-aspect-model-aas-generator/src/test/resources/idta/Sample_ZVEI_Digital_Nameplate_V10.aasx
deleted file mode 100644
index 6da1fa6c6323afed75b7f3e61b51276f45e37751..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7845
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

diff --git a/core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates b/core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates
new file mode 160000
index 000000000..fa0b19ec2
--- /dev/null
+++ b/core/esmf-aspect-model-aas-generator/src/test/resources/submodel-templates
@@ -0,0 +1 @@
+Subproject commit fa0b19ec25980fbbc0f65717434b7483a42b28b9

From a28a194dc9d9e4070cad4741ca85554328f7ee35 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Fri, 6 Dec 2024 15:30:52 +0100
Subject: [PATCH 5/7] Add assertions for correct case of generated model
 elements

---
 .../aas/AasToAspectModelGeneratorTest.java       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
index b9d5524fa..ba28f6e5f 100644
--- a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
+++ b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
@@ -39,6 +39,9 @@
 import org.eclipse.esmf.aspectmodel.validation.services.ViolationFormatter;
 import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.AspectModel;
+import org.eclipse.esmf.metamodel.Operation;
+import org.eclipse.esmf.metamodel.Property;
+import org.eclipse.esmf.metamodel.Unit;
 import org.eclipse.esmf.test.TestAspect;
 import org.eclipse.esmf.test.TestResources;
 
@@ -65,6 +68,19 @@ void testIdtaAasxFilesCanBeTranslated( final File aasxFile ) {
          }
          final String result = AspectSerializer.INSTANCE.aspectToString( aspects.iterator().next() );
          final AspectModel aspectModel = new AspectModelLoader().load( new ByteArrayInputStream( result.getBytes() ) );
+
+         aspectModel.elements().forEach( element -> {
+            if ( element instanceof Property || element instanceof Operation || element instanceof Unit ) {
+               assertThat( element.getName().charAt( 0 ) )
+                     .describedAs( element.getName() + " is a " + element.getClass().getSimpleName() + " and must be lower case" )
+                     .isLowerCase();
+            } else {
+               assertThat( element.getName().charAt( 0 ) )
+                     .describedAs( element.getName() + " is a " + element.getClass().getSimpleName() + " and must be upper case" )
+                     .isUpperCase();
+            }
+         } );
+
          final List<Violation> violations = new AspectModelValidator().validateModel( aspectModel );
          if ( !violations.isEmpty() ) {
             final String report = new ViolationFormatter().apply( violations );

From ec8a641e1314822f3499ef8627e2241186815433 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Fri, 6 Dec 2024 15:33:33 +0100
Subject: [PATCH 6/7] Fix errors in test file

---
 .../aspectmodel/aas/AasToAspectModelGeneratorTest.java | 10 +++++-----
 .../src/test/resources/AspectWithEntity.aas.xml        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
index ba28f6e5f..9e01c8dc0 100644
--- a/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
+++ b/core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java
@@ -146,9 +146,7 @@ void testSeeReferences() {
       aspects.stream()
             .flatMap( aspect -> aspect.getProperties().stream() )
             .flatMap( property -> property.getSee().stream() )
-            .forEach( see -> {
-               assertThat( see ).doesNotContain( "/ " );
-            } );
+            .forEach( see -> assertThat( see ).doesNotContain( "/ " ) );
    }
 
    @ParameterizedTest
@@ -162,9 +160,11 @@ void testRoundtripConversion( final TestAspect testAspect ) throws Deserializati
                      assertThat( generatedAspect.urn() ).isEqualTo( aspect.urn() ) );
             } ).doesNotThrowAnyException();
 
+      final byte[] content = new AspectModelAasGenerator( aspect,
+            AasGenerationConfigBuilder.builder().format( AasFileFormat.XML ).build() ).getContent();
+      assertThat( new String( content ) ).doesNotContain( "Optional[" );
       final Environment aasEnvironmentFromXml = new XmlDeserializer().read(
-            new ByteArrayInputStream( new AspectModelAasGenerator( aspect,
-                  AasGenerationConfigBuilder.builder().format( AasFileFormat.XML ).build() ).getContent() ) );
+            new ByteArrayInputStream( content ) );
       assertForValidator.accept( AasToAspectModelGenerator.fromEnvironment( aasEnvironmentFromXml ) );
 
       final Environment aasEnvironmentFromJson = new JsonDeserializer().read(
diff --git a/core/esmf-aspect-model-aas-generator/src/test/resources/AspectWithEntity.aas.xml b/core/esmf-aspect-model-aas-generator/src/test/resources/AspectWithEntity.aas.xml
index b3cb3faf3..bbd654fcc 100644
--- a/core/esmf-aspect-model-aas-generator/src/test/resources/AspectWithEntity.aas.xml
+++ b/core/esmf-aspect-model-aas-generator/src/test/resources/AspectWithEntity.aas.xml
@@ -19,7 +19,7 @@
                   <aas:keys>
                      <aas:key>
                         <aas:type>GlobalReference</aas:type>
-                        <aas:value>Optional[urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity]</aas:value>
+                        <aas:value>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity</aas:value>
                      </aas:key>
                   </aas:keys>
                </aas:dataSpecification>
@@ -62,7 +62,7 @@
             </aas:langStringTextType>
          </aas:description>
          <aas:administration/>
-         <aas:id>Optional[urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity]/submodel</aas:id>
+         <aas:id>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity/submodel</aas:id>
          <aas:kind>Template</aas:kind>
          <aas:semanticId>
             <aas:type>ModelReference</aas:type>
@@ -144,7 +144,7 @@
                   <aas:keys>
                      <aas:key>
                         <aas:type>GlobalReference</aas:type>
-                        <aas:value>Optional[urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity]</aas:value>
+                        <aas:value>urn:samm:org.eclipse.esmf.test:1.0.0#AspectWithEntity</aas:value>
                      </aas:key>
                   </aas:keys>
                </aas:dataSpecification>
@@ -189,7 +189,7 @@
                   <aas:keys>
                      <aas:key>
                         <aas:type>GlobalReference</aas:type>
-                        <aas:value>Optional[urn:samm:org.eclipse.esmf.test:1.0.0#entityProperty]</aas:value>
+                        <aas:value>urn:samm:org.eclipse.esmf.test:1.0.0#entityProperty</aas:value>
                      </aas:key>
                   </aas:keys>
                </aas:dataSpecification>
@@ -237,7 +237,7 @@
                   <aas:keys>
                      <aas:key>
                         <aas:type>GlobalReference</aas:type>
-                        <aas:value>Optional[urn:samm:org.eclipse.esmf.test:1.0.0#testProperty]</aas:value>
+                        <aas:value>urn:samm:org.eclipse.esmf.test:1.0.0#testProperty</aas:value>
                      </aas:key>
                   </aas:keys>
                </aas:dataSpecification>

From 27e411d253e0620990d58be1550ff8606e5b12e4 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Fri, 6 Dec 2024 15:34:54 +0100
Subject: [PATCH 7/7] Fix casing of SAMM model elements generated from AASX

---
 .../aas/AasToAspectModelGenerator.java        | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
index ee3a7b36d..f8b13ddb1 100644
--- a/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
+++ b/core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java
@@ -257,35 +257,37 @@ private String randomElementName( final Object object ) {
       return DigestUtils.sha1Hex( object.toString() ).substring( 0, 10 );
    }
 
-   private ElementName determineSubmodelName( final Submodel submodel ) {
+   private ElementName determineSubmodelName( final Submodel submodel, final boolean upperCase ) {
       // idShort present? Great.
       if ( submodel.getIdShort() != null ) {
-         return new ElementName( sanitizeAspectModelElementName( submodel.getIdShort() ), false );
+         return new ElementName( sanitizeAspectModelElementName( submodel.getIdShort(), upperCase ), false );
       }
       // We only have an ID. Is it an IRDI? If it is, use its printable parts as element name, with a hash
       // suffix to prevent name clashes.
       final String id = submodel.getId();
       LOG.warn( "Submodel with id {} has no idShort", id );
       final Optional<String> nameFromIrdi = Irdi.from( id ).map( irdi ->
-            sanitizeAspectModelElementName( irdi.toString() ) + DigestUtils.sha1Hex( id ).substring( 0, 8 ) );
+            sanitizeAspectModelElementName( irdi.toString(), upperCase ) + DigestUtils.sha1Hex( id ).substring( 0, 8 ) );
       // Fallback: Hash the id
       return new ElementName( nameFromIrdi.orElseGet( () -> randomElementName( id ) ), true );
    }
 
-   private ElementName determineSubmodelElementName( final SubmodelElement submodelElement, final String namePrefix ) {
+   private ElementName determineSubmodelElementName( final SubmodelElement submodelElement, final String namePrefix,
+         final boolean upperCase ) {
       if ( submodelElement.getIdShort() == null ) {
          return new ElementName( namePrefix + StringUtils.capitalize( randomElementName( submodelElement ) ), true );
       }
       final String idPart = namePrefix.isEmpty() ? submodelElement.getIdShort() : StringUtils.capitalize( submodelElement.getIdShort() );
-      return new ElementName( sanitizeAspectModelElementName( namePrefix + idPart ), false );
+      return new ElementName( sanitizeAspectModelElementName( namePrefix + idPart, upperCase ), false );
    }
 
-   private String sanitizeAspectModelElementName( final String potentialIdentifier ) {
-      return potentialIdentifier.chars()
+   private String sanitizeAspectModelElementName( final String potentialIdentifier, final boolean upperCase ) {
+      final String identifier = potentialIdentifier.chars()
             .dropWhile( character -> !Character.isJavaIdentifierStart( character ) )
             .filter( Character::isJavaIdentifierPart )
             .mapToObj( character -> String.valueOf( (char) character ) )
             .collect( Collectors.joining() );
+      return upperCase ? StringUtils.capitalize( identifier ) : StringUtils.uncapitalize( identifier );
    }
 
    private Optional<AspectModelUrn> aspectModelUrnFromId( final Identifiable element ) {
@@ -310,7 +312,7 @@ private boolean impliesCollectionAspect( final List<Property> properties ) {
    }
 
    private Aspect submodelToAspect( final Submodel submodel ) {
-      final ElementName aspectName = determineSubmodelName( submodel );
+      final ElementName aspectName = determineSubmodelName( submodel, true );
       aspectUrn = aspectModelUrnFromId( submodel )
             .or( () -> aspectModelUrnFromSemanticId( submodel ) )
             .orElseGet( () -> AspectModelUrn.fromUrn( String.format( "%s:%s:%s:%s#%s",
@@ -404,15 +406,16 @@ private DetermineAutomatically() {
 
    private record UseGivenUrn( AspectModelUrn aspectModelUrn ) implements ElementNamingStrategy {}
 
-   private MetaModelBaseAttributes baseAttributes( final SubmodelElement element, final ElementNamingStrategy elementNamingStrategy ) {
+   private MetaModelBaseAttributes baseAttributes( final SubmodelElement element, final ElementNamingStrategy elementNamingStrategy,
+         final boolean upperCase ) {
       final ElementName elementName;
       final AspectModelUrn urn;
       if ( elementNamingStrategy instanceof final DetermineAutomatically automatically ) {
-         elementName = determineSubmodelElementName( element, automatically.namePrefix() );
+         elementName = determineSubmodelElementName( element, automatically.namePrefix(), upperCase );
          urn = aspectModelUrnFromSemanticId( element )
                .orElseGet( () -> aspectUrn.withName( elementName.name() ) );
       } else if ( elementNamingStrategy instanceof final UseGivenUrn givenUrn ) {
-         elementName = determineSubmodelElementName( element, "" );
+         elementName = determineSubmodelElementName( element, "", upperCase );
          urn = givenUrn.aspectModelUrn();
       } else {
          throw new AspectModelGenerationException( "Unknown ElementNamingStrategy" );
@@ -433,7 +436,7 @@ private Property createProperty( final org.eclipse.digitaltwin.aas4j.v3.model.Su
          return existingProperty;
       }
 
-      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElement, new DetermineAutomatically() );
+      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElement, new DetermineAutomatically(), false );
       final Characteristic characteristic = createCharacteristic( submodelElement, metaModelBaseAttributes.urn() );
       final Optional<ScalarValue> exampleValue =
             submodelElement instanceof final org.eclipse.digitaltwin.aas4j.v3.model.Property property
@@ -455,7 +458,7 @@ private Property createProperty( final org.eclipse.digitaltwin.aas4j.v3.model.Su
    }
 
    private Operation createOperation( final org.eclipse.digitaltwin.aas4j.v3.model.Operation operation ) {
-      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( operation, new DetermineAutomatically() );
+      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( operation, new DetermineAutomatically(), false );
       final List<OperationVariable> potentialOutputs = Stream.concat( operation.getOutputVariables().stream(),
             operation.getInoutputVariables().stream() ).toList();
       if ( potentialOutputs.size() > 1 ) {
@@ -485,7 +488,7 @@ private Optional<Property> determineOperationProperty( final OperationVariable v
    }
 
    private Event createEvent( final EventElement event ) {
-      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( event, new DetermineAutomatically() );
+      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( event, new DetermineAutomatically(), true );
       // Since an AAS EventElement/BasicEvent does not have Properties but only info about the broker, we can't create anything
       // meaningful here
       LOG.warn( "Creating event {} with empty list of properties", metaModelBaseAttributes.urn().getName() );
@@ -541,7 +544,8 @@ private Characteristic createCharacteristicFromRelationShipElement( final Relati
       final String characteristicDescription = "First reference: %s, second reference: %s".formatted(
             describeReference.apply( relationshipElement.getFirst() ), describeReference.apply( relationshipElement.getSecond() ) );
 
-      final ElementName elementName = determineSubmodelElementName( relationshipElement, propertyUrn.getName() + "RelationshipElement" );
+      final ElementName elementName = determineSubmodelElementName( relationshipElement, propertyUrn.getName() + "RelationshipElement",
+            true );
       final AspectModelUrn urn = aspectModelUrnFromSemanticId( relationshipElement )
             .orElseGet( () -> aspectUrn.withName( elementName.name() ) );
 
@@ -608,7 +612,7 @@ private Characteristic createCharacteristicFromRange( final Range range, final A
             Optional.of( new DefaultScalar( dataTypeUri ) ) );
 
       final MetaModelBaseAttributes traitMetaModelBaseAttributes = baseAttributes( range, new DetermineAutomatically(
-            propertyUrn.getName() + "Trait" ) );
+            propertyUrn.getName() + "Trait" ), true );
       return new DefaultTrait( traitMetaModelBaseAttributes, baseCharacteristic, List.of( constraint ) );
    }
 
@@ -626,7 +630,7 @@ private Characteristic createCharacteristicFromCapability( final Capability capa
    private Characteristic createCharacteristicFromEntity( final org.eclipse.digitaltwin.aas4j.v3.model.Entity entity,
          final AspectModelUrn propertyUrn ) {
       final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( entity,
-            new DetermineAutomatically( propertyUrn.getName() + "Entity" ) );
+            new DetermineAutomatically( propertyUrn.getName() + "Entity" ), true );
       final List<Property> properties = entity.getStatements().stream()
             .map( this::createProperty )
             .toList();
@@ -636,7 +640,7 @@ private Characteristic createCharacteristicFromEntity( final org.eclipse.digital
 
    private Characteristic createCharacteristicFromSubmodelElementCollection( final SubmodelElementCollection submodelElementCollection ) {
       final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElementCollection,
-            new DetermineAutomatically( "ElementCollection" + randomElementName( submodelElementCollection ) ) );
+            new DetermineAutomatically( "ElementCollection" + randomElementName( submodelElementCollection ) ), true );
       final List<Property> properties = submodelElementCollection.getValue().stream()
             .map( this::createProperty )
             .toList();
@@ -649,7 +653,7 @@ private Characteristic createCharacteristicFromSubmodelElementList( final Submod
       final AasSubmodelElements type = submodelElementList.getTypeValueListElement();
       final Characteristic elementCharacteristic = createCharacteristic( type, submodelElementList, propertyUrn );
       final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElementList,
-            new DetermineAutomatically( propertyUrn.getName() + "List" ) );
+            new DetermineAutomatically( propertyUrn.getName() + "List" ), true );
       return new DefaultList( metaModelBaseAttributes, Optional.empty(), Optional.of( elementCharacteristic ) );
    }
 
@@ -672,7 +676,7 @@ private AasSubmodelElements submodelElementType( final SubmodelElement element )
 
    private Characteristic createDefaultScalarCharacteristic( final SubmodelElement submodelElement, final String dataTypeUri,
          final ElementNamingStrategy elementNamingStrategy ) {
-      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElement, elementNamingStrategy );
+      final MetaModelBaseAttributes metaModelBaseAttributes = baseAttributes( submodelElement, elementNamingStrategy, true );
       return new DefaultCharacteristic( metaModelBaseAttributes, Optional.of( new DefaultScalar( dataTypeUri ) ) );
    }