Bugfix in MappingProvider and refactoring

Author: mjacoby

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

@@ -17,6 +17,7 @@
 
 import io.adminshell.aas.v3.dataformat.DeserializationException;
 import io.adminshell.aas.v3.dataformat.Deserializer;
+import io.adminshell.aas.v3.dataformat.aml.deserialization.AasTypeFactory;
 import io.adminshell.aas.v3.dataformat.aml.deserialization.Aml2AasMapper;
 import io.adminshell.aas.v3.dataformat.aml.model.caex.CAEXFile;
 import io.adminshell.aas.v3.dataformat.mapping.MappingException;
@@ -34,14 +35,17 @@
 public class AmlDeserializer implements Deserializer {
 
     private static final Logger log = LoggerFactory.getLogger(AmlDeserializer.class);
+    private AasTypeFactory typeFactory = new AasTypeFactory();
 
     @Override
     public AssetAdministrationShellEnvironment read(String value) throws DeserializationException {
         try {
             Unmarshaller unmarshaller = JAXBContextFactory.createContext(new Class[]{CAEXFile.class}, null).createUnmarshaller();
             StringReader reader = new StringReader(value);
             CAEXFile aml = (CAEXFile) unmarshaller.unmarshal(reader);
-            Aml2AasMapper mapper = new Aml2AasMapper(new AmlDeserializationConfig.Builder().build());
+            Aml2AasMapper mapper = new Aml2AasMapper(new AmlDeserializationConfig.Builder()
+                    .typeFactory(typeFactory)
+                    .build());
             return mapper.map(aml);
         } catch (JAXBException ex) {
             throw new DeserializationException("error deserializing AssetAdministrationShellEnvironment", ex);
@@ -52,6 +56,6 @@ public AssetAdministrationShellEnvironment read(String value) throws Deserializa
 
     @Override
     public <T> void useImplementation(Class<T> aasInterface, Class<? extends T> implementation) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        typeFactory.useImplementation(aasInterface, implementation);
     }
 }

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

@@ -79,7 +79,7 @@ public AssetAdministrationShellEnvironment map(CAEXFile aml) throws MappingExcep
 //        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));
-        AssetAdministrationShellEnvironment result = (AssetAdministrationShellEnvironment) context.getMappingProvider().getMapper(AssetAdministrationShellEnvironment.class).map(parser, context);
+        AssetAdministrationShellEnvironment result = context.map(AssetAdministrationShellEnvironment.class, parser);
         parser.resolveIdsToReferences(result);
         return (AssetAdministrationShellEnvironment) result;
     }

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

@@ -24,6 +24,7 @@
 import io.adminshell.aas.v3.dataformat.mapping.MappingException;
 import io.adminshell.aas.v3.model.Identifiable;
 import io.adminshell.aas.v3.model.Identifier;
+import io.adminshell.aas.v3.model.Key;
 import io.adminshell.aas.v3.model.Reference;
 import java.beans.PropertyDescriptor;
 
@@ -49,7 +50,9 @@ protected void mapProperties(Object parent, AmlParser parser, MappingContext con
         Identifier identification = context.map(Identifier.class, parser);
         parser.setCurrent(temp);
         ((Identifiable) parent).setIdentification(identification);
-        Reference reference = AasUtils.toReference((Identifiable) parent);
+        Reference reference = AasUtils.toReference((Identifiable) parent,
+                context.getTypeFactory().getImplementationType(Reference.class),
+                context.getTypeFactory().getImplementationType(Key.class));
         parser.collectIdMapping(parser.getCurrent().getID(), reference);
         super.mapProperties(parent, parser, context.with(reference));
     }

dataformat-core/src/main/java/io/adminshell/aas/v3/dataformat/core/util/MostSpecificClassComparator.java

@@ -0,0 +1,35 @@
+/*
+ * 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.core.util;
+
+import java.util.Comparator;
+
+/**
+ * Comparator comparing two classes regarding which type is more specific.
+ */
+public class MostSpecificClassComparator implements Comparator<Class<?>> {
+
+    @Override
+    public int compare(Class<?> x, Class<?> y) {
+        if (y.isAssignableFrom(x)) {
+            if (x.isAssignableFrom(y)) {
+                return 0;
+            }
+            return -1;
+        }
+        return 1;
+    }
+}

dataformat-core/src/main/java/io/adminshell/aas/v3/dataformat/mapping/MappingProvider.java

@@ -16,6 +16,7 @@
 package io.adminshell.aas.v3.dataformat.mapping;
 
 import com.google.common.reflect.TypeToken;
+import io.adminshell.aas.v3.dataformat.core.util.MostSpecificClassComparator;
 import io.adminshell.aas.v3.dataformat.core.util.MostSpecificTypeTokenComparator;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -25,8 +26,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -115,7 +114,7 @@ public T getMapper(Type type) {
         if (customMapper.isEmpty() && !TypeToken.of(Collection.class).isSupertypeOf(type)) {
             customMapper = mappings.entrySet().stream()
                     .filter(x -> x.getKey().getRawType().isAssignableFrom(TypeToken.of(type).getRawType()))
-                    .sorted((x, y) -> Objects.compare(x.getKey(), y.getKey(), new MostSpecificTypeTokenComparator()))
+                    .sorted((x, y) -> Objects.compare(x.getKey().getRawType(), y.getKey().getRawType(), new MostSpecificClassComparator()))
                     .map(x -> x.getValue())
                     .findFirst();
         }