Merge pull request #30 from Daespen/fix/test-core-full-example

Fixes failing XML-Tests

Author: FrankSchnicke

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/XmlDeserializer.java

@@ -28,19 +28,16 @@
 import io.adminshell.aas.v3.dataformat.Deserializer;
 import io.adminshell.aas.v3.dataformat.core.ReflectionHelper;
 import io.adminshell.aas.v3.dataformat.core.deserialization.EnumDeserializer;
-import io.adminshell.aas.v3.dataformat.xml.deserialization.KeyDeserializer;
 import io.adminshell.aas.v3.dataformat.xml.deserialization.SubmodelElementDeserializer;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 import io.adminshell.aas.v3.model.SubmodelElement;
-import io.adminshell.aas.v3.model.impl.DefaultKey;
 
 public class XmlDeserializer implements Deserializer {
 
     protected XmlMapper mapper;
     protected SimpleAbstractTypeResolver typeResolver;
     protected static Map<Class<?>, com.fasterxml.jackson.databind.JsonDeserializer> customDeserializers = Map.of(
-            SubmodelElement.class, new SubmodelElementDeserializer(),
-            DefaultKey.class, new KeyDeserializer());
+            SubmodelElement.class, new SubmodelElementDeserializer());
 
     public XmlDeserializer() {
         initTypeResolver();

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/CustomJsonNodeDeserializer.java

@@ -15,8 +15,11 @@
  */
 package io.adminshell.aas.v3.dataformat.xml.deserialization;
 
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 
 public interface CustomJsonNodeDeserializer<T extends Object> {
-    public T readValue(JsonNode node);
+    public T readValue(JsonNode node, JsonParser parser) throws IOException;
 }

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/KeyDeserializer.java

@@ -18,42 +18,27 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import io.adminshell.aas.v3.model.Key;
 import io.adminshell.aas.v3.model.KeyElements;
 import io.adminshell.aas.v3.model.KeyType;
 import io.adminshell.aas.v3.model.impl.DefaultKey;
 
-public class KeyDeserializer extends JsonDeserializer<DefaultKey> {
+public class KeyDeserializer implements CustomJsonNodeDeserializer<Key> {
 
-    @Override
-    public DefaultKey deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-        ObjectNode node = DeserializationHelper.getRootObjectNode(parser);
-        ObjectNode normalizeNode = normalizeNode(node);
-        return createDefaultKeyFromNode(parser, normalizeNode);
-    }
 
-    private DefaultKey createDefaultKeyFromNode(JsonParser parser, ObjectNode normalizeNode) throws IOException {
-        JsonNode idTypeNode = normalizeNode.get("idType");
-        JsonNode typeNode = normalizeNode.get("type");
-        JsonNode valueNode = normalizeNode.get("");
+    @Override
+    public Key readValue(JsonNode node, JsonParser parser) throws IOException {
+        JsonNode idTypeNode = node.get("idType");
+        JsonNode typeNode = node.get("type");
+        JsonNode valueNode = node.get("");
         KeyType idType = createKeyTypeFromNode(parser, idTypeNode);
         KeyElements type = createKeyElementsFromNode(parser, typeNode);
         String value = valueNode.asText();
         return new DefaultKey.Builder().idType(idType).type(type).value(value).build();
     }
 
-    private ObjectNode normalizeNode(ObjectNode node) {
-        if (node.has("key")) {
-            node = (ObjectNode) node.get("key");
-        }
-        return node;
-    }
-
     private KeyElements createKeyElementsFromNode(JsonParser parser, JsonNode typeNode) throws IOException {
         return DeserializationHelper.createInstanceFromNode(parser, typeNode, KeyElements.class);
     }

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/KeysDeserializer.java

@@ -0,0 +1,24 @@
+/*
+ * 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.xml.deserialization;
+
+import io.adminshell.aas.v3.model.Key;
+
+public class KeysDeserializer extends NoEntryWrapperListDeserializer<Key> {
+    public KeysDeserializer() {
+        super("key", new KeyDeserializer());
+    }
+}

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/LangStringNodeDeserializer.java

@@ -15,13 +15,16 @@
  */
 package io.adminshell.aas.v3.dataformat.xml.deserialization;
 
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import io.adminshell.aas.v3.model.LangString;
 
 public class LangStringNodeDeserializer implements CustomJsonNodeDeserializer<LangString> {
     @Override
-    public LangString readValue(JsonNode node) {
+    public LangString readValue(JsonNode node, JsonParser parser) throws IOException {
         String lang = node.get("lang").asText();
         String text = node.get("").asText();
         return new LangString(text, lang);

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/NoEntryWrapperListDeserializer.java

@@ -47,23 +47,23 @@ public List<T> deserialize(JsonParser parser, DeserializationContext ctxt) throw
         ObjectNode node = DeserializationHelper.getRootObjectNode(parser);
         JsonNode langStringNode = node.get(elementName);
         if (langStringNode.isObject()) {
-            return createEntriesFromObjectNode(langStringNode);
+            return createEntriesFromObjectNode(langStringNode, parser);
         } else {
-            return createEntriesFromArrayNode((ArrayNode) langStringNode);
+            return createEntriesFromArrayNode((ArrayNode) langStringNode, parser);
         }
     }
 
-    private List<T> createEntriesFromArrayNode(ArrayNode langStringsNode) {
+    private List<T> createEntriesFromArrayNode(ArrayNode langStringsNode, JsonParser parser) throws IOException {
         List<T> entries = new ArrayList<>();
         for (int i = 0; i < langStringsNode.size(); i++) {
             JsonNode nextNode = langStringsNode.get(i);
-            entries.add(nodeDeserializer.readValue(nextNode));
+            entries.add(nodeDeserializer.readValue(nextNode, parser));
         }
         return entries;
     }
 
-    private List<T> createEntriesFromObjectNode(JsonNode langStringNode) {
-        T entry = nodeDeserializer.readValue(langStringNode);
+    private List<T> createEntriesFromObjectNode(JsonNode langStringNode, JsonParser parser) throws IOException {
+        T entry = nodeDeserializer.readValue(langStringNode, parser);
         return Collections.singletonList(entry);
     }
 }

dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/mixins/ReferenceMixin.java

@@ -17,14 +17,17 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 import io.adminshell.aas.v3.dataformat.xml.AasXmlNamespaceContext;
+import io.adminshell.aas.v3.dataformat.xml.deserialization.KeysDeserializer;
 import io.adminshell.aas.v3.model.Key;
 
 public interface ReferenceMixin {
     @JacksonXmlProperty(namespace = AasXmlNamespaceContext.AAS_URI, localName = "key")
     @JacksonXmlElementWrapper(namespace = AasXmlNamespaceContext.AAS_URI, localName = "keys")
+    @JsonDeserialize(using = KeysDeserializer.class)
     public List<Key> getKeys();
 }