feat: adopt conformsTo from dct (#5780)

Author: wolf4ood

core/common/lib/json-ld-lib/src/main/resources/document/dspace-edc-context-v1.jsonld

@@ -2,6 +2,7 @@
   "@context": {
     "@version": 1.1,
     "edc": "https://w3id.org/edc/v0.0.1/ns/",
+    "dct": "http://purl.org/dc/terms/",
     "QuerySpec": {
       "@id": "edc:QuerySpec",
       "@context": {
@@ -26,6 +27,10 @@
     "inForceDate": "edc:inForceDate",
     "id": "edc:id",
     "description": "edc:description",
-    "isCatalog": "edc:isCatalog"
+    "isCatalog": "edc:isCatalog",
+    "conformsTo": {
+      "@id": "dct:conformsTo",
+      "@type": "@id"
+    }
   }
 }

core/common/lib/json-ld-lib/src/main/resources/document/management-context-v2.jsonld

@@ -2,13 +2,18 @@
   "@context": {
     "@version": 1.1,
     "edc": "https://w3id.org/edc/v0.0.1/ns/",
+    "dct": "http://purl.org/dc/terms/",
     "Asset": {
       "@id": "edc:Asset",
       "@context": {
         "properties": {
           "@id": "edc:properties",
           "@context": {
-            "@vocab": "https://w3id.org/edc/v0.0.1/ns/"
+            "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
+            "conformsTo": {
+              "@id": "dct:conformsTo",
+              "@type": "@id"
+            }
           }
         },
         "privateProperties": {

extensions/common/api/management-api-schema-validator/src/main/resources/schema/management/v4/asset-schema.json

@@ -24,11 +24,20 @@
         },
         "properties": {
           "type": "object",
-          "example": { "key": "value" }
+          "example": {
+            "key": "value"
+          },
+          "properties": {
+            "conformsTo": {
+              "type": "string"
+            }
+          }
         },
         "privateProperties": {
           "type": "object",
-          "example": { "privateKey": "privateValue" }
+          "example": {
+            "privateKey": "privateValue"
+          }
         },
         "dataplaneMetadata": {
           "$ref": "https://w3id.org/edc/connector/management/schema/v4/dataplane-metadata-schema.json"

spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java

@@ -41,6 +41,7 @@ public interface PropertyAndTypeNames {
 
     //DCT
     String DCT_FORMAT_ATTRIBUTE = DCT_SCHEMA + "format";
+    String DCT_CONFORMS_TO_ATTRIBUTE = DCT_SCHEMA + "conformsTo";
 
     String ODRL_POLICY_ATTRIBUTE = ODRL_SCHEMA + "hasPolicy";
     String ODRL_POLICY_TYPE_SET = ODRL_SCHEMA + "Set";

system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/v5/AssetApiV5EndToEndTest.java

@@ -51,6 +51,7 @@
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VALUE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_CONFORMS_TO_ATTRIBUTE;
 import static org.eclipse.edc.spi.constants.CoreConstants.EDC_CONNECTOR_MANAGEMENT_CONTEXT_V2;
 import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.edc.spi.query.Criterion.criterion;
@@ -407,7 +408,10 @@ void createAsset_shouldBeStored(ManagementEndToEndV5TestContext context, AssetIn
                     .add(CONTEXT, jsonLdContext())
                     .add(TYPE, "Asset")
                     .add(ID, id)
-                    .add("properties", createPropertiesBuilder().add("isCatalog", "true").build())
+                    .add("properties", createPropertiesBuilder()
+                            .add("isCatalog", "true")
+                            .add("conformsTo", "http://example.com/spec")
+                            .build())
                     .add("privateProperties", createObjectBuilder()
                             .add("anotherProp", "anotherVal")
                             .build())
@@ -435,6 +439,8 @@ void createAsset_shouldBeStored(ManagementEndToEndV5TestContext context, AssetIn
             var asset = assetIndex.findById(id);
             assertThat(asset).isNotNull();
             assertThat(asset.isCatalog()).isTrue();
+            assertThat(asset.getProperty(DCT_CONFORMS_TO_ATTRIBUTE)).isEqualTo(Map.of(ID, "http://example.com/spec"));
+
             assertThat(asset.getPrivateProperty(EDC_NAMESPACE + "anotherProp")).isEqualTo("anotherVal");
             assertThat(asset.getDataAddress().getProperty("complex"))
                     .asInstanceOf(MAP)
@@ -705,6 +711,7 @@ void findById(ManagementEndToEndV5TestContext context, AssetIndex assetIndex) {
 
             var id = UUID.randomUUID().toString();
             var asset = createAsset().id(id)
+                    .property(DCT_CONFORMS_TO_ATTRIBUTE, Map.of(ID, "http://example.com/spec"))
                     .dataAddress(createDataAddress().type("addressType").build())
                     .build();
             assetIndex.create(asset);
@@ -719,8 +726,9 @@ void findById(ManagementEndToEndV5TestContext context, AssetIndex assetIndex) {
             assertThat(body).isNotNull();
             assertThat(body.getString(ID)).isEqualTo(id);
             assertThat(body.getMap("properties"))
-                    .hasSize(2)
-                    .containsEntry("description", "test description");
+                    .hasSize(3)
+                    .containsEntry("description", "test description")
+                    .containsEntry("conformsTo", "http://example.com/spec");
             assertThat(body.getMap("'dataAddress'"))
                     .containsEntry("type", "addressType");
             assertThat(body.getMap("'dataAddress'.'complex'"))

system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/v5/CatalogApiV5EndToEndTest.java

@@ -59,6 +59,7 @@
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_CONFORMS_TO_ATTRIBUTE;
 import static org.eclipse.edc.spi.constants.CoreConstants.EDC_CONNECTOR_MANAGEMENT_CONTEXT_V2;
 import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -222,7 +223,11 @@ void requestCatalog_shouldReturnCatalog_withQuerySpec(ManagementEndToEndV5TestCo
                                                               ContractDefinitionStore contractDefinitionStore) {
 
             assetIndex.create(createAsset("id-1", "test-type").build());
-            assetIndex.create(createAsset("id-2", "test-type").build());
+
+            var asset2 = createAsset("id-2", "test-type")
+                    .property(DCT_CONFORMS_TO_ATTRIBUTE, Map.of(ID, "https://example.org/schema")).build();
+            
+            assetIndex.create(asset2);
             createContractOffer(policyDefinitionStore, contractDefinitionStore, List.of());
 
             var criteria = createArrayBuilder()
@@ -258,7 +263,8 @@ void requestCatalog_shouldReturnCatalog_withQuerySpec(ManagementEndToEndV5TestCo
                     .statusCode(200)
                     .contentType(JSON)
                     .body(TYPE, is("Catalog"))
-                    .body("dataset[0].id", is("id-2"));
+                    .body("dataset[0].id", is("id-2"))
+                    .body("dataset[0].conformsTo", is("https://example.org/schema"));
         }
 
         @Test