Merge pull request #32 from admin-shell-io/fix/test-core-full-example

FrankSchnicke · web-flow · commit dbb7d00eee0e · 2021-09-27T12:13:50.000+02:00
Fix/test core full example
diff --git a/dataformat-aml/pom.xml b/dataformat-aml/pom.xml
@@ -17,6 +17,18 @@
             <artifactId>dataformat-core</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+          <groupId>io.admin-shell.aas</groupId>
+          <artifactId>dataformat-core</artifactId>
+          <version>${revision}</version>
+          <classifier>tests</classifier>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
diff --git a/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/deserialize/AmlDeserializerTest.java b/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/deserialize/AmlDeserializerTest.java
@@ -18,6 +18,7 @@
 import io.adminshell.aas.v3.dataformat.DeserializationException;
 import io.adminshell.aas.v3.dataformat.aml.AmlDeserializer;
 import io.adminshell.aas.v3.dataformat.aml.fixtures.FullExample;
+import io.adminshell.aas.v3.dataformat.core.AASFull;
 import io.adminshell.aas.v3.model.*;
 
 import java.io.FileNotFoundException;
@@ -41,7 +42,7 @@ public class AmlDeserializerTest {
     @Before
     public void init() throws FileNotFoundException, DeserializationException {
         actual = deserializer.read(FullExample.FILE);
-        expected = FullExample.ENVIRONMENT;
+        expected = AASFull.ENVIRONMENT;
     }
 
     @Test
diff --git a/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/fixtures/FullExample.java b/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/fixtures/FullExample.java
diff --git a/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/serialize/AmlSerializerTest.java b/dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/serialize/AmlSerializerTest.java
@@ -20,6 +20,7 @@
 import io.adminshell.aas.v3.dataformat.aml.AmlSerializationConfig;
 import io.adminshell.aas.v3.dataformat.aml.AmlSerializer;
 import io.adminshell.aas.v3.dataformat.aml.serialization.id.IntegerIdGenerator;
+import io.adminshell.aas.v3.dataformat.core.AASFull;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +38,7 @@ public class AmlSerializerTest {
 
     @Test
     public void testSAPFullExample() throws SerializationException, SAXException, IOException {
-        validateAmlSerializer(FullExample.FILE, FullExample.ENVIRONMENT);
+        validateAmlSerializer(FullExample.FILE, AASFull.ENVIRONMENT);
     }
 
     private void validateAmlSerializer(File expectedFile, AssetAdministrationShellEnvironment environment)
diff --git a/dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASFull.java b/dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASFull.java
diff --git a/dataformat-json/src/test/resources/submodel.json b/dataformat-json/src/test/resources/submodel.json
@@ -19,6 +19,7 @@
     "id": "http://acplt.org/Submodels/Assets/TestAsset/Identification",
     "idType": "Iri"
   },
+  "kind": "Instance",
   "administration":
   {
     "version": "0.9",
diff --git a/dataformat-json/src/test/resources/submodelList.json b/dataformat-json/src/test/resources/submodelList.json
@@ -20,6 +20,7 @@
       "id": "http://acplt.org/Submodels/Assets/TestAsset/Identification",
       "idType": "Iri"
     },
+    "kind": "Instance",
     "administration":
     {
       "version": "0.9",
@@ -177,6 +178,7 @@
       "id": "http://acplt.org/Submodels/Assets/TestAsset/BillOfMaterial",
       "idType": "Iri"
     },
+    "kind": "Instance",
     "administration":
     {
       "version": "0.9"
diff --git a/dataformat-json/src/test/resources/test_demo_full_example.json b/dataformat-json/src/test/resources/test_demo_full_example.json
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/XmlDeserializer.java b/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();
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/CustomJsonNodeDeserializer.java b/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;
 }
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/KeyDeserializer.java b/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);
     }
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/KeysDeserializer.java b/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());
+    }
+}
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/LangStringNodeDeserializer.java b/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);
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/deserialization/NoEntryWrapperListDeserializer.java b/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);
     }
 }
diff --git a/dataformat-xml/src/main/java/io/adminshell/aas/v3/dataformat/xml/mixins/ReferenceMixin.java b/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();
 }
diff --git a/dataformat-xml/src/test/resources/test_demo_full_example.xml b/dataformat-xml/src/test/resources/test_demo_full_example.xml

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"id": "http://acplt.org/Submodels/Assets/TestAsset/Identification",`
`20`	`20`	`"idType": "Iri"`
`21`	`21`	`},`
	`22`	`+ "kind": "Instance",`
`22`	`23`	`"administration":`
`23`	`24`	`{`
`24`	`25`	`"version": "0.9",`