Working on deserialization, add deserialization of Range

Author: JensMueller2709

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

@@ -70,6 +70,7 @@ public AssetAdministrationShellEnvironment map(CAEXFile aml) throws MappingExcep
         mappingProvider.register(new QualifierMapper());
         mappingProvider.register(new OperationCollectionMapper());
         mappingProvider.register(new FileMapper());
+        mappingProvider.register(new RangeMapper());
         AbstractClassNamingStrategy classNamingStrategy = new NumberingClassNamingStrategy();
 
         PropertyNamingStrategy propertyNamingStrategy = new PropertyNamingStrategy();

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

@@ -338,6 +338,14 @@ protected Object propertyFromAttribute(AmlParser parser, AttributeType attribute
         return result;
     }
 
+    protected String getDataTypeFromAttribute(AttributeType attributeType){
+        if(attributeType == null || attributeType.getAttributeDataType() == null){
+            return null;
+        }
+        String attributeDataType = attributeType.getAttributeDataType();
+        return attributeDataType.substring(attributeDataType.lastIndexOf(":") + 1);
+    }
+
     protected boolean skipProperty(PropertyDescriptor property) {
         return ignoredProperties.contains(property.getName());
     }
@@ -436,6 +444,5 @@ protected List<InterfaceClassType> findExternalInterface(CAEXObject parent, Pred
             return ((InternalElementType) parent).getExternalInterface().stream().filter(filter).collect(Collectors.toList());
         }
         return List.of();
-
     }
 }

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.adminshell.aas.v3.dataformat.aml.deserialization.mappers;
+
+import io.adminshell.aas.v3.dataformat.aml.deserialization.AmlParser;
+import io.adminshell.aas.v3.dataformat.aml.deserialization.DefaultMapper;
+import io.adminshell.aas.v3.dataformat.aml.deserialization.MappingContext;
+import io.adminshell.aas.v3.dataformat.aml.model.caex.AttributeType;
+import io.adminshell.aas.v3.dataformat.core.util.AasUtils;
+import io.adminshell.aas.v3.dataformat.mapping.MappingException;
+import io.adminshell.aas.v3.model.Range;
+
+import java.beans.PropertyDescriptor;
+import java.util.List;
+
+/**
+ *
+ */
+public class RangeMapper extends DefaultMapper<Range> {
+
+    public static final String MIN_ATTRIBUTE_NAME = "min";
+    public static final String MAX_ATTRIBUTE_NAME = "max";
+    protected static PropertyDescriptor PROPERTY_VALUE_TYPE = AasUtils.getProperty(Range.class, "valueType");
+
+    public RangeMapper() {
+        super(PROPERTY_VALUE_TYPE.getName());
+    }
+
+    @Override
+    protected void mapProperties(Object parent, AmlParser parser, MappingContext context) throws MappingException {
+        if (parent == null || context == null) {
+            return;
+        }
+
+        AttributeType attributeTypeMin = findAttributes(parser.getCurrent(),
+                x -> x.getName().equalsIgnoreCase(MIN_ATTRIBUTE_NAME)).stream().findFirst().orElse(null);
+
+        AttributeType attributeTypeMax = findAttributes(parser.getCurrent(),
+                x -> x.getName().equalsIgnoreCase(MAX_ATTRIBUTE_NAME)).stream().findFirst().orElse(null);
+
+        if (attributeTypeMax == null || attributeTypeMin == null)
+            throw new MappingException(String.format("no min/max attributes are found in range %s %s", parser.getCurrent().getID(), parser.getCurrent().getName()));
+
+        String dataTypeMin = getDataTypeFromAttribute(attributeTypeMin);
+        String dataTypeMax = getDataTypeFromAttribute(attributeTypeMax);
+
+        //TODO: is that a constraint?
+        if (!dataTypeMax.equalsIgnoreCase(dataTypeMin))
+            throw new MappingException(String.format("min/max attributes in range %s %s has different attribute datatypes", parser.getCurrent().getID(), parser.getCurrent().getName()));
+
+        ((Range) parent).setValueType(dataTypeMax);
+
+        super.mapProperties(parent, parser, context);
+    }
+
+}