remove hasPolicy from the dspace:Catalog (#212)

International-Data-Spaces-Association · Feb 7, 2024 · d7cbcf5 · d7cbcf5
1 parent b883a68
commit d7cbcf5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 25 deletions.
diff --git a/catalog/catalog.protocol.md b/catalog/catalog.protocol.md
@@ -2,29 +2,29 @@
 
 This document outlines the [Catalog Protocol](../model/terminology.md#catalog-protocol). The used terms are described [here](../model/terminology.md).
 
-* [Catalog Protocol](#catalog-protocol)
-  * [1 Introduction](#1-introduction)
-    * [1.1 DCAT Vocabulary Mapping](#11-dcat-vocabulary-mapping)
-      * [1.1.1 Dataset](#111-dataset)
-        * [odrl:hasPolicy](#odrl--haspolicy)
-      * [1.1.2 Distributions](#112-distributions)
-      * [1.1.3 Data Service](#113-data-service)
-        * [dspace:dataServiceType](#dspace--dataservicetype)
-        * [dcat:servesDataset](#dcat--servesdataset)
-    * [1.2 DCAT and ODRL Profiles](#12-dcat-and-odrl-profiles)
-  * [2 Message Types](#2-message-types)
-    * [2.1 Catalog Request Message](#21-catalog-request-message)
-    * [2.2 Dataset Request Message](#22-dataset-request-message)
-  * [3 Response Types](#3-response-types)
-    * [3.1 ACK - Catalog](#31-ack---catalog)
-    * [3.2 ACK - Dataset](#32-ack---dataset)
-    * [3.3 ERROR - Catalog Error](#33-error---catalog-error)
-  * [4 Technical Considerations](#4-technical-considerations)
-    * [4.1 Queries and Filter Expressions](#41-queries-and-filter-expressions)
-    * [4.2 Replication Protocol](#42-replication-protocol)
-    * [4.3 Security](#43-security)
-      * [4.3.1 The Proof Metadata Endpoint](#431-the-proof-metadata-endpoint)
-    * [4.4 Catalog Brokers](#44-catalog-brokers)
+- [Catalog Protocol](#catalog-protocol)
+  - [1 Introduction](#1-introduction)
+    - [1.1 DCAT Vocabulary Mapping](#11-dcat-vocabulary-mapping)
+      - [1.1.1 Dataset](#111-dataset)
+        - [odrl:hasPolicy](#odrlhaspolicy)
+      - [1.1.2 Distributions](#112-distributions)
+      - [1.1.3 Data Service](#113-data-service)
+        - [dspace:dataServiceType](#dspacedataservicetype)
+        - [dcat:servesDataset](#dcatservesdataset)
+    - [1.2 DCAT and ODRL Profiles](#12-dcat-and-odrl-profiles)
+  - [2 Message Types](#2-message-types)
+    - [2.1 Catalog Request Message](#21-catalog-request-message)
+    - [2.2 Dataset Request Message](#22-dataset-request-message)
+  - [3 Response Types](#3-response-types)
+    - [3.1 ACK - Catalog](#31-ack---catalog)
+    - [3.2 ACK - Dataset](#32-ack---dataset)
+    - [3.3 ERROR - Catalog Error](#33-error---catalog-error)
+  - [4 Technical Considerations](#4-technical-considerations)
+    - [4.1 Queries and Filter Expressions](#41-queries-and-filter-expressions)
+    - [4.2 Replication Protocol](#42-replication-protocol)
+    - [4.3 Security](#43-security)
+      - [4.3.1 The Proof Metadata Endpoint](#431-the-proof-metadata-endpoint)
+    - [4.4 Catalog Brokers](#44-catalog-brokers)
 
 ## 1 Introduction
 
@@ -82,7 +82,7 @@ Note that the property `dcat:servesDataset` should be omitted from the `DataServ
 The [Catalog](../model/terminology.md#catalog) is a [DCAT Catalog](https://www.w3.org/TR/vocab-dcat-3/#Class:Catalog) with the following restrictions:
 
 1. Each [ODRL `Offer`](https://www.w3.org/TR/odrl-vocab/#term-Offer) must be unique to a [Dataset](../model/terminology.md#dataset) since the target of the [Offer](../model/terminology.md#offer) is derived from its enclosing context. 
-2. Each [ODRL Offer](https://www.w3.org/TR/odrl-vocab/#term-Offer) linked from a [Catalog](../model/terminology.md#catalog) must NOT include an explicit `target` attribute.
+2. A [Catalog](../model/terminology.md#catalog) must not have an `odrl:hasPolicy` attribute, since it is not intended to negotiate on the access to [Catalog](../model/terminology.md#catalog) objects. An implementation might however regulate the visibility and/or the content of its [Catalog](../model/terminology.md#catalog) dependent of the requester. 
 
 ## 2 Message Types
 

diff --git a/catalog/message/schema/catalog-schema.json b/catalog/message/schema/catalog-schema.json
@@ -45,7 +45,10 @@
                     }
                 }
             ],
-            "required": [ "@context", "@type" ]
+            "required": [ "@context", "@type" ],
+            "not": {
+                "required": [ "odrl:hasPolicy" ]
+            }
         }
     }
 }
diff --git a/catalog/message/shape/dcat-shapes.ttl b/catalog/message/shape/dcat-shapes.ttl
@@ -162,6 +162,14 @@ dspace_shapes:CatalogShape
 		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (CatalogShape): A foaf:homepage property must point to a xsd:string field."@en ;
 	] ;
 
+    sh:property [
+		a sh:PropertyShape ;
+		sh:path odrl:hasPolicy ;
+        sh:maxCount 0 ;
+		sh:severity sh:Violation ;
+		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/dcat-shapes.ttl> (CatalogShape): A dspace:Catalog must not have any odrl:hasPolicy property."@en ;
+	] ;
+
 .