Resolving compilation bug with EmbeddedDataSpecifications

Author: sebbader

dataformat-xml/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>dataformat-core</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>io.adminshell.aas</groupId>
+            <artifactId>dataformat-json</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

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

@@ -28,7 +28,7 @@
 import io.adminshell.aas.v3.model.Capability;
 import io.adminshell.aas.v3.model.Category;
 import io.adminshell.aas.v3.model.ConceptDescription;
-import io.adminshell.aas.v3.model.DataSpecification;
+import io.adminshell.aas.v3.model.EmbeddedDataSpecification;
 import io.adminshell.aas.v3.model.DataSpecificationIEC61360;
 import io.adminshell.aas.v3.model.DataTypeIEC61360;
 import io.adminshell.aas.v3.model.Entity;
@@ -166,7 +166,7 @@ protected void buildMapper() {
 
 	protected SimpleModule buildCustomDeserializerModule() {
 		SimpleModule module = new SimpleModule();
-		module.addDeserializer(DataSpecification.class, new DataSpecificationDeserializer());
+		module.addDeserializer(EmbeddedDataSpecification.class, new DataSpecificationDeserializer());
 		module.addDeserializer(byte[].class, new ByteArrayDeserializer());
 		return module;
 	}

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

@@ -67,7 +67,7 @@
 import io.adminshell.aas.v3.model.Capability;
 import io.adminshell.aas.v3.model.Category;
 import io.adminshell.aas.v3.model.ConceptDescription;
-import io.adminshell.aas.v3.model.DataSpecification;
+import io.adminshell.aas.v3.model.EmbeddedDataSpecification;
 import io.adminshell.aas.v3.model.DataSpecificationIEC61360;
 import io.adminshell.aas.v3.model.DataTypeIEC61360;
 import io.adminshell.aas.v3.model.Entity;
@@ -133,7 +133,7 @@ protected XmlMapper initMapper() {
 				.addMixIn(Capability.class, CapabilityMixin.class)
 				.addMixIn(ConceptDescription.class, ConceptDescriptionMixin.class)
 				.addMixIn(DataSpecificationIEC61360.class, DataSpecificationIEC61360Mixin.class)
-				.addMixIn(DataSpecification.class, DataSpecificationMixin.class)
+				.addMixIn(EmbeddedDataSpecification.class, DataSpecificationMixin.class)
 				.addMixIn(Entity.class, EntityMixin.class)
 				.addMixIn(Extension.class, ExtensionMixin.class)
 				.addMixIn(File.class, FileMixin.class)

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

@@ -14,15 +14,15 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.adminshell.aas.v3.dataformat.xml.DataSpecificationManager;
-import io.adminshell.aas.v3.model.DataSpecification;
+import io.adminshell.aas.v3.model.EmbeddedDataSpecification;
 import io.adminshell.aas.v3.model.DataSpecificationContent;
 import io.adminshell.aas.v3.model.Reference;
-import io.adminshell.aas.v3.model.impl.DefaultDataSpecification;
+import io.adminshell.aas.v3.model.impl.DefaultEmbeddedDataSpecification;
 
-public class DataSpecificationDeserializer extends JsonDeserializer<DataSpecification> {
+public class DataSpecificationDeserializer extends JsonDeserializer<EmbeddedDataSpecification> {
 
 	@Override
-	public DataSpecification deserialize(JsonParser parser, DeserializationContext context)
+	public EmbeddedDataSpecification deserialize(JsonParser parser, DeserializationContext context)
 			throws IOException, JsonProcessingException {
 		Object temp = parser.getCodec().readTree(parser);
 		ObjectNode node = (ObjectNode) temp;
@@ -45,6 +45,6 @@ public DataSpecification deserialize(JsonParser parser, DeserializationContext c
 		JsonParser parserContent = parser.getCodec().getFactory().getCodec().treeAsTokens(nodeContent);
 		parserContent.nextToken();
 		DataSpecificationContent content = parserContent.readValueAs(targetClass);
-		return new DefaultDataSpecification.Builder().dataSpecificationContent(content).build();
+		return new DefaultEmbeddedDataSpecification.Builder().dataSpecificationContent(content).build();
 	}
 }

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

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import io.adminshell.aas.v3.model.DataSpecification;
+import io.adminshell.aas.v3.model.EmbeddedDataSpecification;
 import io.adminshell.aas.v3.model.Reference;
 
 @JsonPropertyOrder({ "extensions", "idShort", "displayNames", "category", "descriptions", "administration",
@@ -17,6 +17,6 @@ public interface ConceptDescriptionMixin {
     public List<Reference> getIsCaseOfs();
 
 	@JsonIgnore
-    public List<DataSpecification> getEmbeddedDataSpecifications();
+    public List<EmbeddedDataSpecification> getEmbeddedDataSpecifications();
 
 }

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

@@ -1,4 +1,4 @@
-package io.adminshell.aas.v3.dataformat.json.serialization;
+package io.adminshell.aas.v3.dataformat.xml.serialization;
 
 import java.io.IOException;