try fix DspCatalogService

sovity · Oct 11, 2024 · 58038bc · 58038bc
1 parent 0a9072f
commit 58038bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.../catalog-parser/src/main/java/de/sovity/edc/utils/catalog/mapper/DspDataOfferBuilder.java b/.../catalog-parser/src/main/java/de/sovity/edc/utils/catalog/mapper/DspDataOfferBuilder.java
@@ -49,12 +49,12 @@ private DspDataOffer buildDataOffer(JsonObject dataset) {
                 .map(this::buildContractOffer)
                 .toList();
 
-        var distributions = JsonLdUtils.listOfObjects(dataset, Prop.Dcat.DISTRIBUTION_AS_USED_BY_CORE_EDC);
+        var distributions = JsonLdUtils.listOfObjects(dataset, Prop.Dcat.DISTRIBUTION);
 
         var assetProperties = Json.createObjectBuilder(dataset)
                 .remove(Prop.TYPE)
                 .remove(Prop.Odrl.HAS_POLICY)
-                .remove(Prop.Dcat.DISTRIBUTION_AS_USED_BY_CORE_EDC)
+                .remove(Prop.Dcat.DISTRIBUTION)
                 .build();
 
 

diff --git a/utils/json-and-jsonld-utils/src/main/java/de/sovity/edc/utils/jsonld/vocab/Prop.java b/utils/json-and-jsonld-utils/src/main/java/de/sovity/edc/utils/jsonld/vocab/Prop.java
@@ -81,14 +81,12 @@ public class Dcat {
          */
         public final String CTX = "http://www.w3.org/ns/dcat#";
 
-        /**
-         * Context as used in the Core EDC, or atleast how its output from a DCAT request
-         */
-        public final String CTX_WRONG_BUT_USED_BY_CORE_EDC = "https://www.w3.org/ns/dcat/";
+        public final String DATASET = CTX + "dataset";
 
-        public final String DATASET = CTX_WRONG_BUT_USED_BY_CORE_EDC + "dataset";
+        // TODO If there's issues with this field, it's because in 0.2.1 there was /dcat/ used by the EDC instead of /dcat#,
+        // TODO which allowed us to sneak by using that key for the EDC.
+        // TODO Now they might block this field to put in info fromm the Data Plane
         public final String DISTRIBUTION = CTX + "distribution";
-        public final String DISTRIBUTION_AS_USED_BY_CORE_EDC = CTX_WRONG_BUT_USED_BY_CORE_EDC + "distribution";
         public final String VERSION = CTX + "version";
         public final String KEYWORDS = CTX + "keyword";
         public final String LANDING_PAGE = CTX + "landingPage";