From cf3f70dc043694c422afb19ce2b63b36709653d7 Mon Sep 17 00:00:00 2001 From: Sebastian Bader Date: Tue, 17 Aug 2021 09:28:47 +0200 Subject: [PATCH 1/5] Renaming the JSON-LD Serializer to RDF Serializer and changing the default return format to Turtle/TTL. --- README.md | 3 ++- {dataformat-jsonld => dataformat-rdf}/pom.xml | 4 ++-- .../dataformat/jsonld/FallbackSerializer.java | 0 .../v3/dataformat/jsonld/IgnoreTypeMixIn.java | 0 .../v3/dataformat/jsonld/JsonLDModule.java | 0 .../dataformat/jsonld/JsonLDSerializer.java | 0 .../jsonld/JsonLDSerializerModifier.java | 0 .../jsonld/JsonLdEnumSerializer.java | 0 .../jsonld/LangStringSerializer.java | 0 .../aas/v3/dataformat/jsonld/Parser.java | 0 .../aas/v3/dataformat/jsonld/Serializer.java | 22 +++++++++++++++---- .../v3/dataformat/jsonld/UriSerializer.java | 0 .../jsonld/custom/BigDecimalSerializer.java | 0 .../jsonld/custom/JsonLdEnumMixin.java | 0 .../jsonld/custom/LangStringMixin.java | 0 .../custom/ReflectiveMixInResolver.java | 0 .../XMLGregorianCalendarDeserializer.java | 0 .../XMLGregorianCalendarSerializer.java | 0 .../jsonld/mixins/AccessControlMixin.java | 0 .../AccessControlPolicyPointsMixin.java | 0 .../mixins/AccessPermissionRuleMixin.java | 0 .../AdministrativeInformationMixin.java | 0 .../AnnotatedRelationshipElementMixin.java | 0 ...etAdministrationShellEnvironmentMixin.java | 0 .../mixins/AssetAdministrationShellMixin.java | 0 .../jsonld/mixins/AssetInformationMixin.java | 0 .../dataformat/jsonld/mixins/AssetMixin.java | 0 .../jsonld/mixins/BasicEventMixin.java | 0 .../jsonld/mixins/BlobCertificateMixin.java | 0 .../dataformat/jsonld/mixins/BlobMixin.java | 0 .../jsonld/mixins/CapabilityMixin.java | 0 .../jsonld/mixins/CertificateMixin.java | 0 .../mixins/ConceptDescriptionMixin.java | 0 .../jsonld/mixins/ConstraintMixin.java | 0 .../jsonld/mixins/DataElementMixin.java | 0 .../mixins/DataSpecificationContentMixin.java | 0 .../DataSpecificationIEC61360Mixin.java | 0 .../jsonld/mixins/DataSpecificationMixin.java | 0 .../DataSpecificationPhysicalUnitMixin.java | 0 .../EmbeddedDataSpecificationMixin.java | 0 .../dataformat/jsonld/mixins/EntityMixin.java | 0 .../jsonld/mixins/EventElementMixin.java | 0 .../jsonld/mixins/EventMessageMixin.java | 0 .../dataformat/jsonld/mixins/EventMixin.java | 0 .../jsonld/mixins/ExtensionMixin.java | 0 .../dataformat/jsonld/mixins/FileMixin.java | 0 .../jsonld/mixins/FormulaMixin.java | 0 .../mixins/HasDataSpecificationMixin.java | 0 .../jsonld/mixins/HasExtensionsMixin.java | 0 .../jsonld/mixins/HasKindMixin.java | 0 .../jsonld/mixins/HasSemanticsMixin.java | 0 .../jsonld/mixins/IdentifiableMixin.java | 0 .../mixins/IdentifierKeyValuePairMixin.java | 0 .../jsonld/mixins/IdentifierMixin.java | 0 .../v3/dataformat/jsonld/mixins/KeyMixin.java | 0 .../mixins/MultiLanguagePropertyMixin.java | 0 .../jsonld/mixins/ObjectAttributesMixin.java | 0 .../jsonld/mixins/OperationMixin.java | 0 .../jsonld/mixins/OperationVariableMixin.java | 0 .../jsonld/mixins/PermissionMixin.java | 0 .../mixins/PermissionsPerObjectMixin.java | 0 .../PolicyAdministrationPointMixin.java | 0 .../mixins/PolicyDecisionPointMixin.java | 0 .../mixins/PolicyEnforcementPointsMixin.java | 0 .../mixins/PolicyInformationPointsMixin.java | 0 .../jsonld/mixins/PropertyMixin.java | 0 .../jsonld/mixins/QualifiableMixin.java | 0 .../jsonld/mixins/QualifierMixin.java | 0 .../dataformat/jsonld/mixins/RangeMixin.java | 0 .../jsonld/mixins/ReferableMixin.java | 0 .../jsonld/mixins/ReferenceElementMixin.java | 0 .../jsonld/mixins/ReferenceMixin.java | 0 .../mixins/RelationshipElementMixin.java | 0 .../jsonld/mixins/SecurityMixin.java | 0 .../jsonld/mixins/SubjectAttributesMixin.java | 0 .../SubmodelElementCollectionMixin.java | 0 .../jsonld/mixins/SubmodelElementMixin.java | 0 .../jsonld/mixins/SubmodelMixin.java | 0 .../jsonld/mixins/ValueListMixin.java | 0 .../mixins/ValueReferencePairMixin.java | 0 .../dataformat/jsonld/mixins/ViewMixin.java | 0 .../preprocessing/BasePreprocessor.java | 0 .../preprocessing/JsonPreprocessor.java | 0 .../preprocessing/TypeNamePreprocessor.java | 0 .../model/dataformat/jsonld/ParserTest.java | 0 .../dataformat/jsonld/SerializerTest.java | 0 .../dataformat/jsonld/SerializerUtil.java | 0 .../resources/AAS_Reference_shortExample.nt | 0 .../resources/AAS_Reference_shortExample.ttl | 0 .../AssetAdministrationShell_Example.ttl | 0 .../src/test/resources/Asset_Example.nt | 0 .../src/test/resources/Asset_Example.ttl | 0 .../src/test/resources/Complete_Example.ttl | 0 .../KapitalVerwaltungsschaleExample.ttl | 0 .../src/test/resources/Overall-Example.nt | 0 .../src/test/resources/ReferenceExample.ttl | 0 .../Submodel_SubmodelElement_Example.ttl | 0 .../Submodel_SubmodelElement_shortExample.nt | 0 .../Submodel_SubmodelElement_shortExample.ttl | 0 .../resources/example-from-serializer.jsonld | 0 pom.xml | 4 ++-- validator/pom.xml | 2 +- 102 files changed, 25 insertions(+), 10 deletions(-) rename {dataformat-jsonld => dataformat-rdf}/pom.xml (92%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java (92%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/AAS_Reference_shortExample.nt (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/AAS_Reference_shortExample.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/AssetAdministrationShell_Example.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Asset_Example.nt (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Asset_Example.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Complete_Example.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/KapitalVerwaltungsschaleExample.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Overall-Example.nt (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/ReferenceExample.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Submodel_SubmodelElement_Example.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Submodel_SubmodelElement_shortExample.nt (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/Submodel_SubmodelElement_shortExample.ttl (100%) rename {dataformat-jsonld => dataformat-rdf}/src/test/resources/example-from-serializer.jsonld (100%) diff --git a/README.md b/README.md index 26f1dad3..9d6ad5f1 100644 --- 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 b/dataformat-rdf/pom.xml similarity index 92% rename from dataformat-jsonld/pom.xml rename to dataformat-rdf/pom.xml index d5dae3b0..6738e0c3 100644 --- a/dataformat-jsonld/pom.xml +++ b/dataformat-rdf/pom.xml @@ -9,8 +9,8 @@ 4.0.0 - dataformat-jsonld - Asset Administration Shell JSON-LD-Serializer + dataformat-rdf + Asset Administration Shell RDF-Serializer 11 diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java similarity index 92% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java index c59d2fb4..8cd98d06 100644 --- a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java @@ -44,7 +44,7 @@ public class Serializer implements io.adminshell.aas.v3.dataformat.Serializer, Deserializer { private static final ObjectMapper mapper = new ObjectMapper(); - private final List preprocessors; //TODO: It seems like this list is never used... + private final List preprocessors; private final Logger logger = LoggerFactory.getLogger(Serializer.class); public static String implementingClassesNamePrefix = "Default"; @@ -79,17 +79,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 idMap) throws IOException { if (format != RDFLanguages.JSONLD && format != RDFLanguages.TURTLE && format != RDFLanguages.RDFXML) { diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java diff --git a/dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java similarity index 100% rename from dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java diff --git a/dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java similarity index 100% rename from dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java diff --git a/dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java similarity index 100% rename from dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java diff --git a/dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java similarity index 100% rename from dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java diff --git a/dataformat-jsonld/src/test/resources/AAS_Reference_shortExample.nt b/dataformat-rdf/src/test/resources/AAS_Reference_shortExample.nt similarity index 100% rename from dataformat-jsonld/src/test/resources/AAS_Reference_shortExample.nt rename to dataformat-rdf/src/test/resources/AAS_Reference_shortExample.nt diff --git a/dataformat-jsonld/src/test/resources/AAS_Reference_shortExample.ttl b/dataformat-rdf/src/test/resources/AAS_Reference_shortExample.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/AAS_Reference_shortExample.ttl rename to dataformat-rdf/src/test/resources/AAS_Reference_shortExample.ttl diff --git a/dataformat-jsonld/src/test/resources/AssetAdministrationShell_Example.ttl b/dataformat-rdf/src/test/resources/AssetAdministrationShell_Example.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/AssetAdministrationShell_Example.ttl rename to dataformat-rdf/src/test/resources/AssetAdministrationShell_Example.ttl diff --git a/dataformat-jsonld/src/test/resources/Asset_Example.nt b/dataformat-rdf/src/test/resources/Asset_Example.nt similarity index 100% rename from dataformat-jsonld/src/test/resources/Asset_Example.nt rename to dataformat-rdf/src/test/resources/Asset_Example.nt diff --git a/dataformat-jsonld/src/test/resources/Asset_Example.ttl b/dataformat-rdf/src/test/resources/Asset_Example.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/Asset_Example.ttl rename to dataformat-rdf/src/test/resources/Asset_Example.ttl diff --git a/dataformat-jsonld/src/test/resources/Complete_Example.ttl b/dataformat-rdf/src/test/resources/Complete_Example.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/Complete_Example.ttl rename to dataformat-rdf/src/test/resources/Complete_Example.ttl diff --git a/dataformat-jsonld/src/test/resources/KapitalVerwaltungsschaleExample.ttl b/dataformat-rdf/src/test/resources/KapitalVerwaltungsschaleExample.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/KapitalVerwaltungsschaleExample.ttl rename to dataformat-rdf/src/test/resources/KapitalVerwaltungsschaleExample.ttl diff --git a/dataformat-jsonld/src/test/resources/Overall-Example.nt b/dataformat-rdf/src/test/resources/Overall-Example.nt similarity index 100% rename from dataformat-jsonld/src/test/resources/Overall-Example.nt rename to dataformat-rdf/src/test/resources/Overall-Example.nt diff --git a/dataformat-jsonld/src/test/resources/ReferenceExample.ttl b/dataformat-rdf/src/test/resources/ReferenceExample.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/ReferenceExample.ttl rename to dataformat-rdf/src/test/resources/ReferenceExample.ttl diff --git a/dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_Example.ttl b/dataformat-rdf/src/test/resources/Submodel_SubmodelElement_Example.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_Example.ttl rename to dataformat-rdf/src/test/resources/Submodel_SubmodelElement_Example.ttl diff --git a/dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_shortExample.nt b/dataformat-rdf/src/test/resources/Submodel_SubmodelElement_shortExample.nt similarity index 100% rename from dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_shortExample.nt rename to dataformat-rdf/src/test/resources/Submodel_SubmodelElement_shortExample.nt diff --git a/dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_shortExample.ttl b/dataformat-rdf/src/test/resources/Submodel_SubmodelElement_shortExample.ttl similarity index 100% rename from dataformat-jsonld/src/test/resources/Submodel_SubmodelElement_shortExample.ttl rename to dataformat-rdf/src/test/resources/Submodel_SubmodelElement_shortExample.ttl diff --git a/dataformat-jsonld/src/test/resources/example-from-serializer.jsonld b/dataformat-rdf/src/test/resources/example-from-serializer.jsonld similarity index 100% rename from dataformat-jsonld/src/test/resources/example-from-serializer.jsonld rename to dataformat-rdf/src/test/resources/example-from-serializer.jsonld diff --git a/pom.xml b/pom.xml index 59eb36ca..aefc8fef 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ dataformat-core dataformat-json dataformat-xml - dataformat-jsonld + dataformat-rdf dataformat-uanodeset validator - 1.0.2 + 1.0.3 ${revision} 11 11 diff --git a/validator/pom.xml b/validator/pom.xml index ba2bdd89..8b1f597c 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -20,7 +20,7 @@ io.admin-shell.aas - dataformat-jsonld + dataformat-rdf ${revision} From 4efe4a46652906562469de2b89f6384f22598c0e Mon Sep 17 00:00:00 2001 From: Sebastian Bader Date: Tue, 17 Aug 2021 09:33:36 +0200 Subject: [PATCH 2/5] Renaming the package io.adminshell.aas.v3.dataformat.json-ld to io.adminshell.aas.v3.dataformat.rdf --- .../dataformat/{jsonld => rdf}/FallbackSerializer.java | 2 +- .../v3/dataformat/{jsonld => rdf}/IgnoreTypeMixIn.java | 2 +- .../aas/v3/dataformat/{jsonld => rdf}/JsonLDModule.java | 8 ++++---- .../v3/dataformat/{jsonld => rdf}/JsonLDSerializer.java | 2 +- .../{jsonld => rdf}/JsonLDSerializerModifier.java | 3 +-- .../dataformat/{jsonld => rdf}/JsonLdEnumSerializer.java | 2 +- .../dataformat/{jsonld => rdf}/LangStringSerializer.java | 2 +- .../aas/v3/dataformat/{jsonld => rdf}/Parser.java | 2 +- .../aas/v3/dataformat/{jsonld => rdf}/Serializer.java | 9 ++++----- .../aas/v3/dataformat/{jsonld => rdf}/UriSerializer.java | 2 +- .../{jsonld => rdf}/custom/BigDecimalSerializer.java | 2 +- .../{jsonld => rdf}/custom/JsonLdEnumMixin.java | 4 ++-- .../{jsonld => rdf}/custom/LangStringMixin.java | 3 +-- .../{jsonld => rdf}/custom/ReflectiveMixInResolver.java | 2 +- .../custom/XMLGregorianCalendarDeserializer.java | 2 +- .../custom/XMLGregorianCalendarSerializer.java | 2 +- .../{jsonld => rdf}/mixins/AccessControlMixin.java | 2 +- .../mixins/AccessControlPolicyPointsMixin.java | 2 +- .../mixins/AccessPermissionRuleMixin.java | 2 +- .../mixins/AdministrativeInformationMixin.java | 2 +- .../mixins/AnnotatedRelationshipElementMixin.java | 2 +- .../mixins/AssetAdministrationShellEnvironmentMixin.java | 2 +- .../mixins/AssetAdministrationShellMixin.java | 2 +- .../{jsonld => rdf}/mixins/AssetInformationMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/AssetMixin.java | 2 +- .../{jsonld => rdf}/mixins/BasicEventMixin.java | 2 +- .../{jsonld => rdf}/mixins/BlobCertificateMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/BlobMixin.java | 2 +- .../{jsonld => rdf}/mixins/CapabilityMixin.java | 2 +- .../{jsonld => rdf}/mixins/CertificateMixin.java | 2 +- .../{jsonld => rdf}/mixins/ConceptDescriptionMixin.java | 2 +- .../{jsonld => rdf}/mixins/ConstraintMixin.java | 2 +- .../{jsonld => rdf}/mixins/DataElementMixin.java | 2 +- .../mixins/DataSpecificationContentMixin.java | 2 +- .../mixins/DataSpecificationIEC61360Mixin.java | 2 +- .../{jsonld => rdf}/mixins/DataSpecificationMixin.java | 2 +- .../mixins/DataSpecificationPhysicalUnitMixin.java | 2 +- .../mixins/EmbeddedDataSpecificationMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/EntityMixin.java | 2 +- .../{jsonld => rdf}/mixins/EventElementMixin.java | 2 +- .../{jsonld => rdf}/mixins/EventMessageMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/EventMixin.java | 2 +- .../{jsonld => rdf}/mixins/ExtensionMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/FileMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/FormulaMixin.java | 2 +- .../mixins/HasDataSpecificationMixin.java | 2 +- .../{jsonld => rdf}/mixins/HasExtensionsMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/HasKindMixin.java | 2 +- .../{jsonld => rdf}/mixins/HasSemanticsMixin.java | 2 +- .../{jsonld => rdf}/mixins/IdentifiableMixin.java | 2 +- .../mixins/IdentifierKeyValuePairMixin.java | 2 +- .../{jsonld => rdf}/mixins/IdentifierMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/KeyMixin.java | 2 +- .../mixins/MultiLanguagePropertyMixin.java | 2 +- .../{jsonld => rdf}/mixins/ObjectAttributesMixin.java | 2 +- .../{jsonld => rdf}/mixins/OperationMixin.java | 2 +- .../{jsonld => rdf}/mixins/OperationVariableMixin.java | 2 +- .../{jsonld => rdf}/mixins/PermissionMixin.java | 2 +- .../mixins/PermissionsPerObjectMixin.java | 2 +- .../mixins/PolicyAdministrationPointMixin.java | 2 +- .../{jsonld => rdf}/mixins/PolicyDecisionPointMixin.java | 2 +- .../mixins/PolicyEnforcementPointsMixin.java | 2 +- .../mixins/PolicyInformationPointsMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/PropertyMixin.java | 2 +- .../{jsonld => rdf}/mixins/QualifiableMixin.java | 2 +- .../{jsonld => rdf}/mixins/QualifierMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/RangeMixin.java | 2 +- .../{jsonld => rdf}/mixins/ReferableMixin.java | 2 +- .../{jsonld => rdf}/mixins/ReferenceElementMixin.java | 2 +- .../{jsonld => rdf}/mixins/ReferenceMixin.java | 2 +- .../{jsonld => rdf}/mixins/RelationshipElementMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/SecurityMixin.java | 2 +- .../{jsonld => rdf}/mixins/SubjectAttributesMixin.java | 2 +- .../mixins/SubmodelElementCollectionMixin.java | 2 +- .../{jsonld => rdf}/mixins/SubmodelElementMixin.java | 2 +- .../dataformat/{jsonld => rdf}/mixins/SubmodelMixin.java | 2 +- .../{jsonld => rdf}/mixins/ValueListMixin.java | 2 +- .../{jsonld => rdf}/mixins/ValueReferencePairMixin.java | 2 +- .../v3/dataformat/{jsonld => rdf}/mixins/ViewMixin.java | 2 +- .../{jsonld => rdf}/preprocessing/BasePreprocessor.java | 2 +- .../{jsonld => rdf}/preprocessing/JsonPreprocessor.java | 2 +- .../preprocessing/TypeNamePreprocessor.java | 2 +- .../aas/v3/model/dataformat/jsonld/ParserTest.java | 2 +- .../aas/v3/model/dataformat/jsonld/SerializerTest.java | 2 +- .../aas/v3/model/validator/ShaclValidator.java | 2 +- 85 files changed, 92 insertions(+), 95 deletions(-) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/FallbackSerializer.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/IgnoreTypeMixIn.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/JsonLDModule.java (84%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/JsonLDSerializer.java (99%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/JsonLDSerializerModifier.java (93%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/JsonLdEnumSerializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/LangStringSerializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/Parser.java (99%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/Serializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/UriSerializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/BigDecimalSerializer.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/JsonLdEnumMixin.java (86%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/LangStringMixin.java (93%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/ReflectiveMixInResolver.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/XMLGregorianCalendarDeserializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/custom/XMLGregorianCalendarSerializer.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AccessControlMixin.java (98%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AccessControlPolicyPointsMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AccessPermissionRuleMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AdministrativeInformationMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AnnotatedRelationshipElementMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AssetAdministrationShellEnvironmentMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AssetAdministrationShellMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AssetInformationMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/AssetMixin.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/BasicEventMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/BlobCertificateMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/BlobMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/CapabilityMixin.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/CertificateMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ConceptDescriptionMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ConstraintMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/DataElementMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/DataSpecificationContentMixin.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/DataSpecificationIEC61360Mixin.java (99%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/DataSpecificationMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/DataSpecificationPhysicalUnitMixin.java (99%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/EmbeddedDataSpecificationMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/EntityMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/EventElementMixin.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/EventMessageMixin.java (94%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/EventMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ExtensionMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/FileMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/FormulaMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/HasDataSpecificationMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/HasExtensionsMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/HasKindMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/HasSemanticsMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/IdentifiableMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/IdentifierKeyValuePairMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/IdentifierMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/KeyMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/MultiLanguagePropertyMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ObjectAttributesMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/OperationMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/OperationVariableMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PermissionMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PermissionsPerObjectMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PolicyAdministrationPointMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PolicyDecisionPointMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PolicyEnforcementPointsMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PolicyInformationPointsMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/PropertyMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/QualifiableMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/QualifierMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/RangeMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ReferableMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ReferenceElementMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ReferenceMixin.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/RelationshipElementMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/SecurityMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/SubjectAttributesMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/SubmodelElementCollectionMixin.java (97%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/SubmodelElementMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/SubmodelMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ValueListMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ValueReferencePairMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/mixins/ViewMixin.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/preprocessing/BasePreprocessor.java (96%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/preprocessing/JsonPreprocessor.java (95%) rename dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/{jsonld => rdf}/preprocessing/TypeNamePreprocessor.java (99%) diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/FallbackSerializer.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/FallbackSerializer.java index 164f344e..fa9a8960 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/FallbackSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/IgnoreTypeMixIn.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/IgnoreTypeMixIn.java index e74d0606..2b5be453 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDModule.java similarity index 84% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDModule.java index 9567b0cb..58410189 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java +++ b/dataformat-rdf/src/main/java/io/adminshell/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializer.java similarity index 99% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializer.java index 07a1a9c9..744a290b 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializerModifier.java similarity index 93% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializerModifier.java index f3554adf..3159c7eb 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializerModifier.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializerModifier.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.databind.BeanDescription; @@ -21,7 +21,6 @@ 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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLdEnumSerializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLdEnumSerializer.java index a8ac48c3..0cd82e96 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/LangStringSerializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/LangStringSerializer.java index 5f8fbcc3..983002e7 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/LangStringSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/Parser.java similarity index 99% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/Parser.java index cb73ab5a..ddee2a33 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java +++ b/dataformat-rdf/src/main/java/io/adminshell/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/Serializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/Serializer.java index 8cd98d06..1166d349 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Serializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/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; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/UriSerializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/UriSerializer.java index 69a7966d..28299115 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/UriSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/BigDecimalSerializer.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/BigDecimalSerializer.java index 684e52cf..ee9aac7a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/BigDecimalSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/JsonLdEnumMixin.java similarity index 86% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/JsonLdEnumMixin.java index c69ceeec..b19dfb93 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/JsonLdEnumMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/LangStringMixin.java similarity index 93% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/LangStringMixin.java index 53942f23..b2fdc09d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/LangStringMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/LangStringMixin.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; @@ -21,7 +21,6 @@ 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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java index 6152a586..d6f4611a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/ReflectiveMixInResolver.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/XMLGregorianCalendarDeserializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/XMLGregorianCalendarDeserializer.java index ac72401b..aaed0f3e 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarDeserializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/XMLGregorianCalendarSerializer.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/XMLGregorianCalendarSerializer.java index ea838e47..f86b6bf2 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/custom/XMLGregorianCalendarSerializer.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessControlMixin.java similarity index 98% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessControlMixin.java index 33ec6ee8..f47c3579 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessControlPolicyPointsMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessControlPolicyPointsMixin.java index 49a0f555..221ba03d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessControlPolicyPointsMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessPermissionRuleMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AccessPermissionRuleMixin.java index 54ea8815..a728329c 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AccessPermissionRuleMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AdministrativeInformationMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AdministrativeInformationMixin.java index e9b2cb9e..70742db5 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AdministrativeInformationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AnnotatedRelationshipElementMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AnnotatedRelationshipElementMixin.java index 0cbdc420..4ab6fb5a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AnnotatedRelationshipElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetAdministrationShellEnvironmentMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetAdministrationShellEnvironmentMixin.java index f20b3b12..19324da0 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellEnvironmentMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetAdministrationShellEnvironmentMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetAdministrationShellMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetAdministrationShellMixin.java index fd24c5aa..706821ba 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetAdministrationShellMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetInformationMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetInformationMixin.java index 41c1ab18..9429b714 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetInformationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetMixin.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/AssetMixin.java index 5ec0eb7c..38f36055 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/AssetMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BasicEventMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BasicEventMixin.java index 6023a157..4a6fa810 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BasicEventMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BlobCertificateMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BlobCertificateMixin.java index 85a8481a..32cbfedf 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobCertificateMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BlobMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/BlobMixin.java index cf4a6a9e..03222e53 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/BlobMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/CapabilityMixin.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/CapabilityMixin.java index ee8ad4ad..a743d17c 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CapabilityMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/CertificateMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/CertificateMixin.java index 72bf81b7..924c7505 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/CertificateMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/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; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConceptDescriptionMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConceptDescriptionMixin.java index 12e4e03e..db5d350b 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConceptDescriptionMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConceptDescriptionMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConstraintMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConstraintMixin.java index 8ee2d890..00c63b06 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ConstraintMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ConstraintMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataElementMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataElementMixin.java index 24474515..34a6c59a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataElementMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationContentMixin.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationContentMixin.java index 099aa0da..84d98210 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationContentMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationContentMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationIEC61360Mixin.java similarity index 99% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationIEC61360Mixin.java index f669ec55..1adfbebd 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationIEC61360Mixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationIEC61360Mixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationMixin.java index 67837674..0df97807 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationPhysicalUnitMixin.java similarity index 99% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationPhysicalUnitMixin.java index abe0b186..14aab18a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/DataSpecificationPhysicalUnitMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/DataSpecificationPhysicalUnitMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EmbeddedDataSpecificationMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EmbeddedDataSpecificationMixin.java index 87604cf9..f797a6bd 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EmbeddedDataSpecificationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EmbeddedDataSpecificationMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EntityMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EntityMixin.java index d5569358..43e86198 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EntityMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EntityMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventElementMixin.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventElementMixin.java index 51562ead..d59a017d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventElementMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMessageMixin.java similarity index 94% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMessageMixin.java index 18dce0c2..d6134c10 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMessageMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMessageMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMixin.java index 1c7d8f58..4a3b3d1d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/EventMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/EventMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ExtensionMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ExtensionMixin.java index cd65704e..80f9a161 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ExtensionMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ExtensionMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FileMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FileMixin.java index 8c0f5a66..fb17d3bc 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FileMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FileMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FormulaMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FormulaMixin.java index e0885247..5b2ce239 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/FormulaMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/FormulaMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasDataSpecificationMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasDataSpecificationMixin.java index 790239fc..025bc667 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasDataSpecificationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasDataSpecificationMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasExtensionsMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasExtensionsMixin.java index f04bc1b9..ecd339ea 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasExtensionsMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasExtensionsMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasKindMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasKindMixin.java index 72a780cc..526a11f2 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasKindMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasKindMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasSemanticsMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasSemanticsMixin.java index d18fb2e4..89990475 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/HasSemanticsMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/HasSemanticsMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifiableMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifiableMixin.java index 441a1f80..64d13774 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifiableMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifiableMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierKeyValuePairMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierKeyValuePairMixin.java index 4e10698d..f5eb00cc 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierKeyValuePairMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierKeyValuePairMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierMixin.java index 2ba4df0e..851a21ad 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/IdentifierMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/IdentifierMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/KeyMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/KeyMixin.java index 2357b1c4..8aaecc9b 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/KeyMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/KeyMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/MultiLanguagePropertyMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/MultiLanguagePropertyMixin.java index 980ae77c..7ddbffba 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/MultiLanguagePropertyMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/MultiLanguagePropertyMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ObjectAttributesMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ObjectAttributesMixin.java index 0ba7f626..a08d7178 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ObjectAttributesMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ObjectAttributesMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationMixin.java index 21d3c9ad..cc10174d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationVariableMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationVariableMixin.java index 882f80bf..0329517f 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/OperationVariableMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/OperationVariableMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionMixin.java index c85d24bb..47281418 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionsPerObjectMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionsPerObjectMixin.java index 976fdca4..08286ceb 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PermissionsPerObjectMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PermissionsPerObjectMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyAdministrationPointMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyAdministrationPointMixin.java index 8630060f..d0e7f883 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyAdministrationPointMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyAdministrationPointMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyDecisionPointMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyDecisionPointMixin.java index de38e3c4..77ae5f37 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyDecisionPointMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyDecisionPointMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyEnforcementPointsMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyEnforcementPointsMixin.java index f407d6a9..987c0884 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyEnforcementPointsMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyEnforcementPointsMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyInformationPointsMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyInformationPointsMixin.java index 80e8057f..9ac4a21c 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PolicyInformationPointsMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PolicyInformationPointsMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PropertyMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PropertyMixin.java index 25a25fcc..ec1f4edb 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/PropertyMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/PropertyMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifiableMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifiableMixin.java index a91d4353..4de552e0 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifiableMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifiableMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifierMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifierMixin.java index 6d07c54e..296ce1b3 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/QualifierMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/QualifierMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RangeMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RangeMixin.java index 79977ad8..9b23d919 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RangeMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RangeMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferableMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferableMixin.java index 70f64d5d..bb948153 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferableMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferableMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceElementMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceElementMixin.java index 14c259e5..996136f2 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceElementMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceMixin.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceMixin.java index cc734c6e..c6bad0b7 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ReferenceMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ReferenceMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RelationshipElementMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RelationshipElementMixin.java index 9e250312..9face098 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/RelationshipElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/RelationshipElementMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SecurityMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SecurityMixin.java index 548c4cc2..a3dc1705 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SecurityMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SecurityMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubjectAttributesMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubjectAttributesMixin.java index 1375c0b2..3079af3a 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubjectAttributesMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubjectAttributesMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementCollectionMixin.java similarity index 97% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementCollectionMixin.java index 3da5f25c..eb8a6592 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementCollectionMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementCollectionMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementMixin.java index 408d0ac2..9d8ce237 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelElementMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelElementMixin.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.JsonSubTypes; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelMixin.java index b424b718..4dc5f29b 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/SubmodelMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/SubmodelMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueListMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueListMixin.java index 356213ce..bd44d62d 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueListMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueListMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueReferencePairMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueReferencePairMixin.java index e7cc2b15..4b5e7aeb 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ValueReferencePairMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ValueReferencePairMixin.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/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ViewMixin.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ViewMixin.java index 0cb6b88e..5c094d2c 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/mixins/ViewMixin.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/mixins/ViewMixin.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-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/BasePreprocessor.java similarity index 96% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/BasePreprocessor.java index 3c98233c..85b23202 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/BasePreprocessor.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/BasePreprocessor.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.preprocessing; +package io.adminshell.aas.v3.dataformat.rdf.preprocessing; import org.apache.jena.rdf.model.Model; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/JsonPreprocessor.java similarity index 95% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/JsonPreprocessor.java index e33b6783..8b7e46f9 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/JsonPreprocessor.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/JsonPreprocessor.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.preprocessing; +package io.adminshell.aas.v3.dataformat.rdf.preprocessing; import java.io.IOException; diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/TypeNamePreprocessor.java similarity index 99% rename from dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java rename to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/TypeNamePreprocessor.java index d9ce7c77..1fc7fe10 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/preprocessing/TypeNamePreprocessor.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/preprocessing/TypeNamePreprocessor.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.preprocessing; +package io.adminshell.aas.v3.dataformat.rdf.preprocessing; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java index b04335b9..13632a3f 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java @@ -16,7 +16,7 @@ package io.adminshell.aas.v3.model.dataformat.jsonld; import io.adminshell.aas.v3.dataformat.DeserializationException; -import io.adminshell.aas.v3.dataformat.jsonld.Serializer; +import io.adminshell.aas.v3.dataformat.rdf.Serializer; import io.adminshell.aas.v3.model.*; import org.apache.jena.riot.RDFLanguages; import org.junit.Assert; diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java index 75cfbddf..aee32a88 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java @@ -15,7 +15,7 @@ */ package io.adminshell.aas.v3.model.dataformat.jsonld; -import io.adminshell.aas.v3.dataformat.jsonld.Serializer; +import io.adminshell.aas.v3.dataformat.rdf.Serializer; import io.adminshell.aas.v3.model.*; import io.adminshell.aas.v3.model.impl.*; import org.junit.Assert; diff --git a/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java b/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java index bc356abd..0f9cb204 100644 --- a/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java +++ b/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java @@ -15,7 +15,7 @@ */ package io.adminshell.aas.v3.model.validator; -import io.adminshell.aas.v3.dataformat.jsonld.Serializer; +import io.adminshell.aas.v3.dataformat.rdf.Serializer; import org.apache.jena.graph.compose.Union; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; From 68c718a43201ca5afab781a60c05e7df522ad213 Mon Sep 17 00:00:00 2001 From: Sebastian Bader Date: Tue, 17 Aug 2021 09:35:07 +0200 Subject: [PATCH 3/5] Renaming the package io.adminshell.aas.v3.dataformat.json-ld to io.adminshell.aas.v3.dataformat.rdf --- .../aas/v3/model/dataformat/{jsonld => rdf}/ParserTest.java | 2 +- .../aas/v3/model/dataformat/{jsonld => rdf}/SerializerTest.java | 2 +- .../aas/v3/model/dataformat/{jsonld => rdf}/SerializerUtil.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/{jsonld => rdf}/ParserTest.java (98%) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/{jsonld => rdf}/SerializerTest.java (98%) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/{jsonld => rdf}/SerializerUtil.java (96%) diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java similarity index 98% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java index 13632a3f..b37bbafb 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.jsonld; +package io.adminshell.aas.v3.model.dataformat.rdf; import io.adminshell.aas.v3.dataformat.DeserializationException; import io.adminshell.aas.v3.dataformat.rdf.Serializer; diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java similarity index 98% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java index aee32a88..ac10c420 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.jsonld; +package io.adminshell.aas.v3.model.dataformat.rdf; import io.adminshell.aas.v3.dataformat.rdf.Serializer; import io.adminshell.aas.v3.model.*; diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java similarity index 96% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java index 984185c0..4092ce2c 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/SerializerUtil.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.jsonld; +package io.adminshell.aas.v3.model.dataformat.rdf; import java.io.IOException; From 9d130ce165ba208e48add53065e194be41ca3404 Mon Sep 17 00:00:00 2001 From: Sebastian Bader Date: Tue, 17 Aug 2021 11:10:45 +0200 Subject: [PATCH 4/5] Renaming the package io.adminshell.aas.v3.dataformat.json-ld to io.adminshell.aas.v3.dataformat.rdf also in the tests --- .../aas/v3/{model => }/dataformat/rdf/ParserTest.java | 3 +-- .../aas/v3/{model => }/dataformat/rdf/SerializerTest.java | 5 +++-- .../aas/v3/{model => }/dataformat/rdf/SerializerUtil.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/{model => }/dataformat/rdf/ParserTest.java (97%) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/{model => }/dataformat/rdf/SerializerTest.java (95%) rename dataformat-rdf/src/test/java/io/adminshell/aas/v3/{model => }/dataformat/rdf/SerializerUtil.java (96%) diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/ParserTest.java similarity index 97% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/ParserTest.java index b37bbafb..4330dd4b 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/ParserTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/ParserTest.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.rdf; +package io.adminshell.aas.v3.dataformat.rdf; import io.adminshell.aas.v3.dataformat.DeserializationException; -import io.adminshell.aas.v3.dataformat.rdf.Serializer; import io.adminshell.aas.v3.model.*; import org.apache.jena.riot.RDFLanguages; import org.junit.Assert; diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerTest.java similarity index 95% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerTest.java index ac10c420..c46013e1 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerTest.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerTest.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.rdf; +package io.adminshell.aas.v3.dataformat.rdf; import io.adminshell.aas.v3.dataformat.rdf.Serializer; import io.adminshell.aas.v3.model.*; import io.adminshell.aas.v3.model.impl.*; +import org.apache.jena.riot.RDFLanguages; import org.junit.Assert; import org.junit.Test; @@ -65,7 +66,7 @@ public void serializeEnvironment() throws IOException { .assetAdministrationShells(aasList) .submodels(submodel) .build(); - String output = new Serializer().serialize(aasEnv); + String output = new Serializer().serialize(aasEnv, RDFLanguages.JSONLD); //System.out.println(output); Assert.assertTrue(output.contains("@context")); Assert.assertTrue(output.contains("rdf:")); diff --git a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerUtil.java similarity index 96% rename from dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java rename to dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerUtil.java index 4092ce2c..a4dc6e60 100644 --- a/dataformat-rdf/src/test/java/io/adminshell/aas/v3/model/dataformat/rdf/SerializerUtil.java +++ b/dataformat-rdf/src/test/java/io/adminshell/aas/v3/dataformat/rdf/SerializerUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.adminshell.aas.v3.model.dataformat.rdf; +package io.adminshell.aas.v3.dataformat.rdf; import java.io.IOException; From 8d5f8bbbffb22d36267d736d2b3a1e453bc32a7a Mon Sep 17 00:00:00 2001 From: Sebastian Bader Date: Tue, 17 Aug 2021 11:24:11 +0200 Subject: [PATCH 5/5] Resolving package path for mixins in the dataformat-rdf serializer --- .../aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java index d6f4611a..275a3e6b 100644 --- a/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java +++ b/dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/custom/ReflectiveMixInResolver.java @@ -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) {