From a1957129160dde68850b52b592e6e7404eeb7199 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Wed, 17 Jan 2024 13:34:21 +0100 Subject: [PATCH] fix: align DCAT namespace IRI to the correct one (#3781) --- .../ids-endpoints-services-architecture.md | 8 ++++---- .../edc/connector/api/management/catalog/CatalogApi.java | 4 ++-- .../main/java/org/eclipse/edc/jsonld/spi/Namespaces.java | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/developer/ids-dataspace-protocol/ids-endpoints-services-architecture.md b/docs/developer/ids-dataspace-protocol/ids-endpoints-services-architecture.md index ace14cfb5cd..2b6a968b71f 100644 --- a/docs/developer/ids-dataspace-protocol/ids-endpoints-services-architecture.md +++ b/docs/developer/ids-dataspace-protocol/ids-endpoints-services-architecture.md @@ -162,10 +162,10 @@ Similarly, a `ToCatalogTransformer` can convert from a JSON=LD structure to the ``` public class ToCatalogTransformer extends AbstractJsonLdTransformer { - private static final String DCAT_CATALOG = "http://www.w3.org/ns/dcat/Catalog"; - private static final String DCAT_DATASET = "http://www.w3.org/ns/dcat/dataset"; - private static final String DCAT_DISTRIBUTION = "http://www.w3.org/ns/dcat/distribution"; - private static final String DCAT_DATA_SERVICE = "http://www.w3.org/ns/dcat/DataService"; + private static final String DCAT_CATALOG = "http://www.w3.org/ns/dcat#Catalog"; + private static final String DCAT_DATASET = "http://www.w3.org/ns/dcat#dataset"; + private static final String DCAT_DISTRIBUTION = "http://www.w3.org/ns/dcat#distribution"; + private static final String DCAT_DATA_SERVICE = "http://www.w3.org/ns/dcat#DataService"; public ToCatalogTransformer() { super(JsonObject.class, Catalog.class); diff --git a/extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/connector/api/management/catalog/CatalogApi.java b/extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/connector/api/management/catalog/CatalogApi.java index f43b4998958..7f34a186a69 100644 --- a/extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/connector/api/management/catalog/CatalogApi.java +++ b/extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/connector/api/management/catalog/CatalogApi.java @@ -172,7 +172,7 @@ record CatalogSchema( "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dct": "https://purl.org/dc/terms/", "edc": "https://w3id.org/edc/v0.0.1/ns/", - "dcat": "https://www.w3.org/ns/dcat/", + "dcat": "http://www.w3.org/ns/dcat#", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" } @@ -233,7 +233,7 @@ record DatasetSchema( "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dct": "https://purl.org/dc/terms/", "edc": "https://w3id.org/edc/v0.0.1/ns/", - "dcat": "https://www.w3.org/ns/dcat/", + "dcat": "http://www.w3.org/ns/dcat#", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" } diff --git a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java index 79d538569b0..796fc987cdc 100644 --- a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java +++ b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java @@ -19,8 +19,9 @@ */ public interface Namespaces { + // ref. https://www.w3.org/TR/vocab-dcat-3/#normative-namespaces String DCAT_PREFIX = "dcat"; - String DCAT_SCHEMA = "https://www.w3.org/ns/dcat/"; + String DCAT_SCHEMA = "http://www.w3.org/ns/dcat#"; String DCT_PREFIX = "dct"; String DCT_SCHEMA = "https://purl.org/dc/terms/";