rebase to main to include bugfix in AML serialization

Author: mjacoby

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/deserialization/Aml2AasMapper.java

@@ -74,8 +74,8 @@ public AssetAdministrationShellEnvironment map(CAEXFile aml) throws MappingExcep
         AbstractClassNamingStrategy classNamingStrategy = new NumberingClassNamingStrategy();
 
         PropertyNamingStrategy propertyNamingStrategy = new PropertyNamingStrategy();
-        propertyNamingStrategy.registerCustomNaming(Referable.class, "descriptions", "description", true);
-        propertyNamingStrategy.registerCustomNaming(MultiLanguageProperty.class, "values", "value", true);
+        propertyNamingStrategy.registerCustomNaming(Referable.class, "descriptions", "description");
+        propertyNamingStrategy.registerCustomNaming(MultiLanguageProperty.class, "values", "value");
 //        propertyNamingStrategy.registerCustomNaming(Qualifier.class, x -> "qualifier:" + x.getType() + "=" + x.getValue(), false);
         MappingContext context = new MappingContext(mappingProvider, classNamingStrategy, propertyNamingStrategy, config.getTypeFactory());
         context.setDocumentInfo(AmlDocumentInfo.fromFile(aml));

dataformat-aml/src/main/java/io/adminshell/aas/v3/dataformat/aml/serialization/mappers/QualifierMapper.java

@@ -40,7 +40,7 @@ protected String getAttributeName(Qualifier value, MappingContext context) {
     protected AttributeType.RefSemantic getRefSemantic(Qualifier value, AmlGenerator generator, MappingContext context) {
         return generator.refSemantic(
                 context.getProperty(),
-                context.getAttributeNamingStrategy().getNameForRefSemantic(
+                context.getPropertyNamingStrategy().getNameForRefSemantic(
                         Qualifier.class,
                         value,
                         context.getProperty().getName()));