Add dataSpecifications to selfDescription

FraunhoferIOSB · Jan 10, 2024 · ae0ca8b · ae0ca8b
1 parent 11c24e8
commit ae0ca8b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/AASElement.java b/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/AASElement.java
@@ -15,8 +15,12 @@
  */
 package de.fraunhofer.iosb.app.model.aas;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import io.adminshell.aas.v3.model.EmbeddedDataSpecification;
+
 /*
  * Collect common attributes of every AAS element.
  */
@@ -27,6 +31,8 @@ public class AASElement extends IdsAssetElement {
     @JsonProperty("semanticId")
     protected CustomSemanticId customSemanticId;
 
+    protected List<EmbeddedDataSpecification> embeddedDataSpecifications;
+
     public String getIdShort() {
         return idShort;
     }
@@ -42,4 +48,12 @@ public CustomSemanticId getCustomSemanticId() {
     public void setSemanticId(CustomSemanticId semanticId) {
         this.customSemanticId = semanticId;
     }
+
+    public List<EmbeddedDataSpecification> getEmbeddedDataSpecifications() {
+        return embeddedDataSpecifications;
+    }
+
+    public void setEmbeddedDataSpecifications(List<EmbeddedDataSpecification> embeddedDataSpecifications) {
+        this.embeddedDataSpecifications = embeddedDataSpecifications;
+    }
 }
diff --git a/...xtension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/CustomConceptDescription.java b/...xtension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/CustomConceptDescription.java
@@ -17,8 +17,10 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonAutoDetect
 public class CustomConceptDescription extends AASElement {