fix: align DCAT namespace IRI to the correct one (#3781)

eclipse-edc · Jan 17, 2024 · a195712 · a195712
1 parent 89c0903
commit a195712
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 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
@@ -162,10 +162,10 @@ Similarly, a `ToCatalogTransformer` can convert from a JSON=LD structure to the
 
 ```
 public class ToCatalogTransformer extends AbstractJsonLdTransformer<JsonObject, Catalog> {
-    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/...atalog-api/src/main/java/org/eclipse/edc/connector/api/management/catalog/CatalogApi.java b/...atalog-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
@@ -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/";