From ae0ca8b0a4dc1ffb7d7627e723754db8a726a346 Mon Sep 17 00:00:00 2001 From: Carlos Schmidt <18703981+carlos-schmidt@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:15:20 +0100 Subject: [PATCH] Add dataSpecifications to selfDescription --- .../fraunhofer/iosb/app/model/aas/AASElement.java | 14 ++++++++++++++ .../app/model/aas/CustomConceptDescription.java | 2 ++ 2 files changed, 16 insertions(+) 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 index a6d2034d..5cdc52ae 100644 --- 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 embeddedDataSpecifications; + public String getIdShort() { return idShort; } @@ -42,4 +48,12 @@ public CustomSemanticId getCustomSemanticId() { public void setSemanticId(CustomSemanticId semanticId) { this.customSemanticId = semanticId; } + + public List getEmbeddedDataSpecifications() { + return embeddedDataSpecifications; + } + + public void setEmbeddedDataSpecifications(List embeddedDataSpecifications) { + this.embeddedDataSpecifications = embeddedDataSpecifications; + } } diff --git a/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/CustomConceptDescription.java b/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/CustomConceptDescription.java index 7829d2a1..aeab45ba 100644 --- a/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/model/aas/CustomConceptDescription.java +++ b/edc-extension4aas/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 {