Merge pull request #4 from admin-shell-io/feature/renaming-json-ld

Renaming the JSON-LD Serializer to RDF Serializer and changing the de…
admin-shell-io · Aug 17, 2021 · 40ec29c · 40ec29c
2 parents fcef0f9 + 8d5f8bb
commit 40ec29c
Show file tree

Hide file tree

Showing 103 changed files with 122 additions and 110 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ The project contains several modules:
 - `dataformat-core` Location of the general classes and interfaces that are used by more than one de-/serializer.
 - `dataformat-aasx` AASX de-/serializer
 - `dataformat-json` JSON de-/serializer
+- `dataformat-rdf` RDF de-/serializer
 - `dataformat-xml` XML de-/serializer
 - `dataformat-uanodeset` OPC UA I4AAS NodeSet de-/serializer
 
@@ -44,7 +45,7 @@ We always look for contributions, bug reports, feature requests etc. Simply open
 
 # Contributors
 
-| Name        | Affiliation           | Github Account | parent | core  | aasx | json | xml | json-ld | ua-nodeset | validator|
+| Name        | Affiliation           | Github Account | Parent | Core  | AASX | JSON | XML | RDF | UA-Nodeset | Validator|
 --- | --- | --- | :---: | :---: | :---: | :---: | :---: | :---: | :---:| :---:
 | Mohammad Alreeni | Fraunhofer IWU | []() |  |  |  |  | x |  |  |
 | Sebastian Bader | Fraunhofer IAIS | [sebbader](https://github.com/sebbader) | x |  |  |  |  | x |  | x |

diff --git a/dataformat-jsonld/pom.xml → dataformat-rdf/pom.xml b/dataformat-jsonld/pom.xml → dataformat-rdf/pom.xml
@@ -9,8 +9,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>dataformat-jsonld</artifactId>
-    <name>Asset Administration Shell JSON-LD-Serializer</name>
+    <artifactId>dataformat-rdf</artifactId>
+    <name>Asset Administration Shell RDF-Serializer</name>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/...dataformat/jsonld/FallbackSerializer.java → ...v3/dataformat/rdf/FallbackSerializer.java b/...dataformat/jsonld/FallbackSerializer.java → ...v3/dataformat/rdf/FallbackSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...v3/dataformat/jsonld/IgnoreTypeMixIn.java → ...as/v3/dataformat/rdf/IgnoreTypeMixIn.java b/...v3/dataformat/jsonld/IgnoreTypeMixIn.java → ...as/v3/dataformat/rdf/IgnoreTypeMixIn.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 

diff --git a/...as/v3/dataformat/jsonld/JsonLDModule.java → ...l/aas/v3/dataformat/rdf/JsonLDModule.java b/...as/v3/dataformat/jsonld/JsonLDModule.java → ...l/aas/v3/dataformat/rdf/JsonLDModule.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-import io.adminshell.aas.v3.dataformat.jsonld.custom.BigDecimalSerializer;
-import io.adminshell.aas.v3.dataformat.jsonld.custom.XMLGregorianCalendarDeserializer;
-import io.adminshell.aas.v3.dataformat.jsonld.custom.XMLGregorianCalendarSerializer;
+import io.adminshell.aas.v3.dataformat.rdf.custom.BigDecimalSerializer;
+import io.adminshell.aas.v3.dataformat.rdf.custom.XMLGregorianCalendarDeserializer;
+import io.adminshell.aas.v3.dataformat.rdf.custom.XMLGregorianCalendarSerializer;
 import io.adminshell.aas.v3.model.LangString;
 
 import java.math.BigDecimal;

diff --git a/...3/dataformat/jsonld/JsonLDSerializer.java → ...s/v3/dataformat/rdf/JsonLDSerializer.java b/...3/dataformat/jsonld/JsonLDSerializer.java → ...s/v3/dataformat/rdf/JsonLDSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;

diff --git a/...rmat/jsonld/JsonLDSerializerModifier.java → ...aformat/rdf/JsonLDSerializerModifier.java b/...rmat/jsonld/JsonLDSerializerModifier.java → ...aformat/rdf/JsonLDSerializerModifier.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import io.adminshell.aas.v3.dataformat.jsonld.JsonLDSerializer;
 
 import java.util.Map;
 

diff --git a/...taformat/jsonld/JsonLdEnumSerializer.java → .../dataformat/rdf/JsonLdEnumSerializer.java b/...taformat/jsonld/JsonLdEnumSerializer.java → .../dataformat/rdf/JsonLdEnumSerializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

diff --git a/...taformat/jsonld/LangStringSerializer.java → .../dataformat/rdf/LangStringSerializer.java b/...taformat/jsonld/LangStringSerializer.java → .../dataformat/rdf/LangStringSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import java.io.IOException;
 

diff --git a/...hell/aas/v3/dataformat/jsonld/Parser.java → ...inshell/aas/v3/dataformat/rdf/Parser.java b/...hell/aas/v3/dataformat/jsonld/Parser.java → ...inshell/aas/v3/dataformat/rdf/Parser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import io.adminshell.aas.v3.model.LangString;
 import io.adminshell.aas.v3.model.annotations.IRI;

diff --git a/.../aas/v3/dataformat/jsonld/Serializer.java → ...ell/aas/v3/dataformat/rdf/Serializer.java b/.../aas/v3/dataformat/jsonld/Serializer.java → ...ell/aas/v3/dataformat/rdf/Serializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,11 +23,10 @@
 import io.adminshell.aas.v3.dataformat.DeserializationException;
 import io.adminshell.aas.v3.dataformat.Deserializer;
 import io.adminshell.aas.v3.dataformat.SerializationException;
-import io.adminshell.aas.v3.dataformat.jsonld.custom.ReflectiveMixInResolver;
-import io.adminshell.aas.v3.dataformat.jsonld.preprocessing.JsonPreprocessor;
-import io.adminshell.aas.v3.dataformat.jsonld.preprocessing.TypeNamePreprocessor;
+import io.adminshell.aas.v3.dataformat.rdf.custom.ReflectiveMixInResolver;
+import io.adminshell.aas.v3.dataformat.rdf.preprocessing.JsonPreprocessor;
+import io.adminshell.aas.v3.dataformat.rdf.preprocessing.TypeNamePreprocessor;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.Lang;
@@ -44,7 +43,7 @@
 public class Serializer implements io.adminshell.aas.v3.dataformat.Serializer, Deserializer {
 
     private static final ObjectMapper mapper = new ObjectMapper();
-    private final List<JsonPreprocessor> preprocessors; //TODO: It seems like this list is never used...
+    private final List<JsonPreprocessor> preprocessors;
     private final Logger logger = LoggerFactory.getLogger(Serializer.class);
 
     public static String implementingClassesNamePrefix = "Default";
@@ -79,17 +78,31 @@ public Serializer() {
     }
 
     /**
-     * Serializes an object to JSON-LD representation. In order to support JSON-LD, the input instance must be
-     * annotated using IDS Infomodel annotations
+     * Serializes an object to an RDF representation. In order to support RDF, the input instance must be
+     * annotated using AAS Metamodel annotations. Default format is Turtle (TTL).
      *
      * @param instance the instance to be serialized
      * @return RDF serialization of the provided object graph
      * @throws IOException if the serialization fails
      */
     public String serialize(Object instance) throws IOException {
-        return serialize(instance, RDFLanguages.JSONLD, new HashMap<>());
+        return serialize(instance, RDFLanguages.TTL, new HashMap<>());
     }
 
+    /**
+     * Serializes an object to an RDF representation of a given RDF serialization format. In order to support RDF, the
+     * input instance must be annotated using AAS Metamodel annotations.
+     *
+     * @param instance the instance to be serialized
+     * @param format the RDF format to be returned (only RDFLanguages.TTL, RDFLanguages.JSONLD, RDFLanguages.RDFXML)
+     * @return RDF serialization of the provided object graph
+     * @throws IOException if the serialization fails
+     */
+    public synchronized String serialize(Object instance, Lang format) throws IOException {
+        return serialize(instance, format, new HashMap<>() );
+    }
+
+
     //Synchronized is required for thread safety. Without it, context elements might be missing in case of multiple simultaneous calls to this function
     public synchronized String serialize(Object instance, Lang format, Map<Object, String> idMap) throws IOException {
         if (format != RDFLanguages.JSONLD && format != RDFLanguages.TURTLE && format != RDFLanguages.RDFXML) {

diff --git a/...s/v3/dataformat/jsonld/UriSerializer.java → .../aas/v3/dataformat/rdf/UriSerializer.java b/...s/v3/dataformat/jsonld/UriSerializer.java → .../aas/v3/dataformat/rdf/UriSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld;
+package io.adminshell.aas.v3.dataformat.rdf;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/...t/jsonld/custom/BigDecimalSerializer.java → ...rmat/rdf/custom/BigDecimalSerializer.java b/...t/jsonld/custom/BigDecimalSerializer.java → ...rmat/rdf/custom/BigDecimalSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...format/jsonld/custom/JsonLdEnumMixin.java → ...ataformat/rdf/custom/JsonLdEnumMixin.java b/...format/jsonld/custom/JsonLdEnumMixin.java → ...ataformat/rdf/custom/JsonLdEnumMixin.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.adminshell.aas.v3.dataformat.jsonld.JsonLdEnumSerializer;
+import io.adminshell.aas.v3.dataformat.rdf.JsonLdEnumSerializer;
 
 @JsonSerialize(using = JsonLdEnumSerializer.class)
 public class JsonLdEnumMixin {

diff --git a/...format/jsonld/custom/LangStringMixin.java → ...ataformat/rdf/custom/LangStringMixin.java b/...format/jsonld/custom/LangStringMixin.java → ...ataformat/rdf/custom/LangStringMixin.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
-import io.adminshell.aas.v3.model.*;
 import io.adminshell.aas.v3.model.AccessPermissionRule;
 
 import java.util.List;

diff --git a/...sonld/custom/ReflectiveMixInResolver.java → ...t/rdf/custom/ReflectiveMixInResolver.java b/...sonld/custom/ReflectiveMixInResolver.java → ...t/rdf/custom/ReflectiveMixInResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
 
@@ -26,7 +26,7 @@ public Class<?> findMixInClassFor(Class<?> cls) {
             return JsonLdEnumMixin.class;
         }
         try {
-            return Class.forName("io.adminshell.aas.v3.dataformat.jsonld.mixins." + cls.getSimpleName() + "Mixin");
+            return Class.forName("io.adminshell.aas.v3.dataformat.rdf.mixins." + cls.getSimpleName() + "Mixin");
         }
         catch (ClassNotFoundException ignored)
         {

diff --git a/...tom/XMLGregorianCalendarDeserializer.java → ...tom/XMLGregorianCalendarDeserializer.java b/...tom/XMLGregorianCalendarDeserializer.java → ...tom/XMLGregorianCalendarDeserializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;

diff --git a/...ustom/XMLGregorianCalendarSerializer.java → ...ustom/XMLGregorianCalendarSerializer.java b/...ustom/XMLGregorianCalendarSerializer.java → ...ustom/XMLGregorianCalendarSerializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.custom;
+package io.adminshell.aas.v3.dataformat.rdf.custom;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...mat/jsonld/mixins/AccessControlMixin.java → ...format/rdf/mixins/AccessControlMixin.java b/...mat/jsonld/mixins/AccessControlMixin.java → ...format/rdf/mixins/AccessControlMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...ixins/AccessControlPolicyPointsMixin.java → ...ixins/AccessControlPolicyPointsMixin.java b/...ixins/AccessControlPolicyPointsMixin.java → ...ixins/AccessControlPolicyPointsMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...nld/mixins/AccessPermissionRuleMixin.java → ...rdf/mixins/AccessPermissionRuleMixin.java b/...nld/mixins/AccessPermissionRuleMixin.java → ...rdf/mixins/AccessPermissionRuleMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...ixins/AdministrativeInformationMixin.java → ...ixins/AdministrativeInformationMixin.java b/...ixins/AdministrativeInformationMixin.java → ...ixins/AdministrativeInformationMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 

diff --git a/...ns/AnnotatedRelationshipElementMixin.java → ...ns/AnnotatedRelationshipElementMixin.java b/...ns/AnnotatedRelationshipElementMixin.java → ...ns/AnnotatedRelationshipElementMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...tAdministrationShellEnvironmentMixin.java → ...tAdministrationShellEnvironmentMixin.java b/...tAdministrationShellEnvironmentMixin.java → ...tAdministrationShellEnvironmentMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...mixins/AssetAdministrationShellMixin.java → ...mixins/AssetAdministrationShellMixin.java b/...mixins/AssetAdministrationShellMixin.java → ...mixins/AssetAdministrationShellMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/.../jsonld/mixins/AssetInformationMixin.java → ...mat/rdf/mixins/AssetInformationMixin.java b/.../jsonld/mixins/AssetInformationMixin.java → ...mat/rdf/mixins/AssetInformationMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/.../dataformat/jsonld/mixins/AssetMixin.java → .../v3/dataformat/rdf/mixins/AssetMixin.java b/.../dataformat/jsonld/mixins/AssetMixin.java → .../v3/dataformat/rdf/mixins/AssetMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 

diff --git a/...format/jsonld/mixins/BasicEventMixin.java → ...ataformat/rdf/mixins/BasicEventMixin.java b/...format/jsonld/mixins/BasicEventMixin.java → ...ataformat/rdf/mixins/BasicEventMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...t/jsonld/mixins/BlobCertificateMixin.java → ...rmat/rdf/mixins/BlobCertificateMixin.java b/...t/jsonld/mixins/BlobCertificateMixin.java → ...rmat/rdf/mixins/BlobCertificateMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...3/dataformat/jsonld/mixins/BlobMixin.java → ...s/v3/dataformat/rdf/mixins/BlobMixin.java b/...3/dataformat/jsonld/mixins/BlobMixin.java → ...s/v3/dataformat/rdf/mixins/BlobMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 

diff --git a/...format/jsonld/mixins/CapabilityMixin.java → ...ataformat/rdf/mixins/CapabilityMixin.java b/...format/jsonld/mixins/CapabilityMixin.java → ...ataformat/rdf/mixins/CapabilityMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 

diff --git a/...ormat/jsonld/mixins/CertificateMixin.java → ...taformat/rdf/mixins/CertificateMixin.java b/...ormat/jsonld/mixins/CertificateMixin.java → ...taformat/rdf/mixins/CertificateMixin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.adminshell.aas.v3.dataformat.jsonld.mixins;
+package io.adminshell.aas.v3.dataformat.rdf.mixins;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;