Bugifx AML serializer: now correctly generates Attributes with correct AttributeType for null values. If value is null and there is no type info then no Attribute is generated.

Author: mjacoby

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

@@ -25,9 +25,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class DefaultMapper<T> implements Mapper<T> {
 
@@ -117,7 +115,9 @@ protected String getAttributeName(T value, MappingContext context) {
     }
 
     protected AttributeType.Builder toAttribute(T value, AmlGenerator generator, MappingContext context) throws MappingException {
-        Class<?> aasType = ReflectionHelper.getAasInterface(value.getClass());
+        Class<?> aasType = value != null
+                ? ReflectionHelper.getAasInterface(value.getClass())
+                : null;
         AttributeType.Builder builder = AttributeType.builder();
         if (context.getProperty() != null) {
             builder = builder
@@ -127,7 +127,6 @@ protected AttributeType.Builder toAttribute(T value, AmlGenerator generator, Map
         if (aasType != null) {
             mapProperties(value, generator.with(builder), context);
         } else {
-
             builder = builder.withValue(value);
         }
         return builder;
@@ -138,7 +137,6 @@ protected boolean skipProperty(PropertyDescriptor property) {
     }
 
     protected void mapProperties(T value, AmlGenerator generator, MappingContext context) throws MappingException {
-        List<String> collect = AasUtils.getAasProperties(value.getClass()).stream().map(x -> x.getName()).collect(Collectors.toList());
         for (PropertyDescriptor property : AasUtils.getAasProperties(value.getClass())) {
             if (!skipProperty(property)) {
                 context.with(property)

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

@@ -63,18 +63,26 @@ protected InternalElementType.Builder toInternalElement(T value, AmlGenerator ge
                 .copyOf(original)
                 .withAttribute(untouchedAttributes);
         for (String property : typedProperties) {
+            AttributeType.Builder typedAttributeBuilder;
             Optional<AttributeType> attributeToType = original.getAttribute().stream()
                     .filter(x -> property.equals(x.getName()))
                     .findFirst();
             if (attributeToType.isPresent()) {
-                AttributeType.Builder typedAttributeBuilder = AttributeType.copyOf(attributeToType.get());
-                if (valueTypeProperty.isPresent()) {
-                    try {
-                        typedAttributeBuilder = typedAttributeBuilder.withAttributeDataType(
-                                PROPERTY_VALUE_TYPE_NAMESPACE_PREFIX + valueTypeProperty.get().getReadMethod().invoke(value));
-                    } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-                        throw new MappingException(String.format("error reading property %s", PROPERTY_VALUE_TYPE_NAME));
-                    }
+                typedAttributeBuilder = AttributeType.copyOf(attributeToType.get());
+            } else {
+                typedAttributeBuilder = super.toAttribute(null, generator, context.with(AasUtils.getProperty(value, property)));
+            }
+            Object type = null;
+            if (valueTypeProperty.isPresent()) {
+                try {
+                    type = valueTypeProperty.get().getReadMethod().invoke(value);
+                } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+                    throw new MappingException(String.format("error reading property %s", PROPERTY_VALUE_TYPE_NAME));
+                }
+            }
+            if (attributeToType.isPresent() || type != null) {
+                if (type != null) {
+                    typedAttributeBuilder = typedAttributeBuilder.withAttributeDataType(PROPERTY_VALUE_TYPE_NAMESPACE_PREFIX + type);
                 }
                 builder = builder.addAttribute(typedAttributeBuilder.build());
             }

dataformat-aml/src/test/resources/test_demo_full_example.aml

@@ -1789,7 +1789,7 @@
 			<Attribute Name="description">
 				<RefSemantic CorrespondingAttributePath="AAS:Referable/description"/>
 				<Attribute Name="aml-lang=en-us">
-					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">An example concept description  for the test application</Value>
+					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">An example concept description for the test application</Value>
 				</Attribute>
 				<Attribute Name="aml-lang=de">
 					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">Ein Beispiel-ConceptDescription für eine Test-Anwendung</Value>
@@ -1849,7 +1849,7 @@
 			<Attribute Name="description">
 				<RefSemantic CorrespondingAttributePath="AAS:Referable/description"/>
 				<Attribute Name="aml-lang=en-us">
-					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">An example concept description  for the test application</Value>
+					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">An example concept description for the test application</Value>
 				</Attribute>
 				<Attribute Name="aml-lang=de">
 					<Value xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">Ein Beispiel-ConceptDescription für eine Test-Anwendung</Value>