Merge pull request #632 from bci-oss/603-samm2aas-entities-in-sets

Fix AAS serialization from native executable samm-cli

Author: atextor

core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AspectModelAasGeneratorTest.java

@@ -142,7 +142,7 @@ void generateAasxWithAspectDataForCollectionProperty() throws DeserializationExc
 
    @Test
    void generateAasxWithAspectDataForCollectionPropertyWithCustomMapper() throws DeserializationException {
-      AspectModelAasGenerator customGenerator = new AspectModelAasGenerator( List.of( new IntegerCollectionMapper() ) );
+      final AspectModelAasGenerator customGenerator = new AspectModelAasGenerator( List.of( new IntegerCollectionMapper() ) );
       final Environment env = getAssetAdministrationShellFromAspectWithData( TestAspect.ASPECT_WITH_COLLECTION_OF_SIMPLE_TYPE,
             customGenerator );
       assertThat( env.getSubmodels() )
@@ -357,17 +357,17 @@ void testGenerateAasxFromAspectModelWithEnumeration() throws DeserializationExce
    // anonymous enumeration in test has no urn for enum values but is required for Concept
    // Description referencing
    public void testGeneration( final TestAspect testAspect ) throws DeserializationException {
-      final String aspectAsString = aspectToString( testAspect );
-      final byte[] xmlFile = aspectAsString.getBytes();
+      final String aasXmlString = aspectToAasXml( testAspect );
+      final byte[] aasXmlInput = aasXmlString.getBytes();
 
-      final String aasXml = new String( xmlFile );
+      final String aasXml = new String( aasXmlInput );
       assertThat( aasXml ).doesNotContain( "DefaultScalarValue[" );
       assertThat( aasXml ).doesNotContain( "DefaultEntity[" );
       assertThat( aasXml ).doesNotContain( "Optional[" );
 
-      final Environment env = loadAasx( new ByteArrayInputStream( xmlFile ) );
+      final Environment env = loadAasx( new ByteArrayInputStream( aasXmlInput ) );
       assertThat( env.getSubmodels() ).isNotEmpty();
-      validate( new ByteArrayInputStream( xmlFile ) );
+      validate( new ByteArrayInputStream( aasXmlInput ) );
    }
 
    @Test
@@ -455,7 +455,7 @@ private Environment getAssetAdministrationShellFromAspectWithData( final TestAsp
       return loadAasx( generator.generateAsByteArray( AasFileFormat.XML, aspect, aspectData ) );
    }
 
-   private String aspectToString( final TestAspect testAspect ) {
+   private String aspectToAasXml( final TestAspect testAspect ) {
       final Aspect aspect = TestResources.load( testAspect ).aspect();
       return new String( generator.generateAsByteArray( AasFileFormat.XML, aspect ), StandardCharsets.UTF_8 );
    }

tools/samm-cli/src/main/java/org/eclipse/esmf/nativefeatures/AasReflection.java

@@ -33,6 +33,8 @@ public void beforeAnalysis( final BeforeAnalysisAccess access ) {
 
       registerClassesInPackage( ReflectionHelper.MODEL_PACKAGE_NAME );
       registerClassesInPackage( ReflectionHelper.DEFAULT_IMPLEMENTATION_PACKAGE_NAME );
+      registerClassesInPackage( ReflectionHelper.JSON_MIXINS_PACKAGE_NAME );
+      registerClassesInPackage( ReflectionHelper.XML_MIXINS_PACKAGE_NAME );
    }
 
    @Override