Refactor XML-Serializer Mixins

- clean up annotations

Author: Daespen

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

@@ -18,13 +18,9 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import io.adminshell.aas.v3.model.AccessPermissionRule;
 
-@JsonTypeName("AccessControl")
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "modelType")
 public interface AccessControlMixin {
     @JsonProperty("accessPermissionRule")
     public List<AccessPermissionRule> getAccessPermissionRules();

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

@@ -23,7 +23,6 @@
 import io.adminshell.aas.v3.model.PermissionsPerObject;
 
 public interface AccessPermissionRuleMixin {
-
     @JacksonXmlProperty(namespace = AasXmlNamespaceContext.ABAC_URI, localName = "permissionsPerObject")
     public List<PermissionsPerObject> getPermissionsPerObjects();
 

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

@@ -15,17 +15,13 @@
  */
 package io.adminshell.aas.v3.dataformat.xml.mixin;
 
-
-
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 import io.adminshell.aas.v3.model.DataSpecificationContent;
 
-// No order needed -> only one element
 public interface DataSpecificationMixin {
 
-	@JacksonXmlProperty(localName = "aas:dataSpecificationIEC61360")
-	//@JacksonXmlElementWrapper(localName = "aas:dataSpecificationContent")
-	public DataSpecificationContent getDataSpecificationContent();
-	
+    @JacksonXmlProperty(localName = "aas:dataSpecificationIEC61360")
+    public DataSpecificationContent getDataSpecificationContent();
+
 }

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

@@ -25,5 +25,5 @@
 public interface ValueListMixin {
 
     @JacksonXmlProperty(namespace = AasXmlNamespaceContext.IEC61360_URI, localName = "valueReferencePair")
-    List<ValueReferencePair> getValueReferencePairTypes();
+    public List<ValueReferencePair> getValueReferencePairTypes();
 }

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

@@ -23,13 +23,13 @@
 import io.adminshell.aas.v3.dataformat.xml.serialization.NamespaceIndependentReferenceSerializer;
 import io.adminshell.aas.v3.model.Reference;
 
-@JsonPropertyOrder({"valueId", "value"})
+@JsonPropertyOrder({ "valueId", "value" })
 public interface ValueReferencePairMixin {
 
     @JacksonXmlProperty(namespace = AasXmlNamespaceContext.IEC61360_URI, localName = "valueId")
     @JsonSerialize(using = NamespaceIndependentReferenceSerializer.class)
-    Reference getValueId();
+    public Reference getValueId();
 
     @JacksonXmlProperty(namespace = AasXmlNamespaceContext.IEC61360_URI, localName = "value")
-    String getValue();
+    public String getValue();
 }