chore: fixes after upstream changes on catalog transformers (#260)

Author: wolf4ood

core/federated-catalog-core/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
     implementation(libs.edc.core.connector)
     implementation(libs.edc.lib.query)
     implementation(libs.edc.dsp.transform.catalog)
+    implementation(libs.edc.dsp.transform.catalog.lib)
     implementation(libs.edc.controlplane.transform)
     implementation(libs.edc.lib.transform)
     implementation(libs.edc.dsp.api.configuration)
@@ -47,6 +48,7 @@ dependencies {
     // required for integration test
     testFixturesImplementation(libs.edc.core.connector)
     testFixturesImplementation(libs.edc.dsp.transform.catalog)
+    testFixturesImplementation(libs.edc.dsp.transform.catalog.lib)
     testFixturesImplementation(libs.edc.json.ld.lib)
     testFixturesImplementation(libs.edc.controlplane.transform)
 }

core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/transform/JsonObjectToCatalogTransformer.java

@@ -29,7 +29,7 @@
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATASET_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DISTRIBUTION_TYPE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_IRI;
 import static org.eclipse.edc.jsonld.spi.TypeUtil.nodeType;
 
 /**
@@ -67,7 +67,7 @@ private void transformProperties(String key, JsonValue value, Catalog.Builder bu
             }
         } else if (DCAT_DATA_SERVICE_ATTRIBUTE.equalsIgnoreCase(key)) {
             transformArrayOrObject(value, DataService.class, builder::dataService, context);
-        } else if (DSPACE_PROPERTY_PARTICIPANT_ID.equalsIgnoreCase(key)) {
+        } else if (DSPACE_PROPERTY_PARTICIPANT_ID_IRI.equalsIgnoreCase(key)) {
             builder.participantId(transformString(value, context));
         } else if (DCAT_DISTRIBUTION_TYPE.equalsIgnoreCase(key)) {
             transformArrayOrObject(value, Distribution.class, builder::distribution, context);

extensions/api/federated-catalog-api/build.gradle.kts

@@ -41,6 +41,7 @@ dependencies {
     testImplementation(libs.edc.iam.mock)
     testImplementation(libs.edc.json.ld.lib)
     testImplementation(libs.edc.dsp.transform.catalog)
+    testImplementation(libs.edc.dsp.transform.catalog.lib)
     testImplementation(testFixtures(libs.edc.core.jersey))
     testImplementation(libs.edc.lib.transform)
     testImplementation(libs.edc.lib.query)

gradle/libs.versions.toml

@@ -76,6 +76,7 @@ edc-lib-jerseyproviders = { module = "org.eclipse.edc:jersey-providers-lib", ver
 edc-dsp-api-configuration = { module = "org.eclipse.edc:dsp-http-api-configuration", version.ref = "edc" }
 edc-dsp-all = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
 edc-dsp-transform-catalog = { module = "org.eclipse.edc:dsp-catalog-transform", version.ref = "edc" }
+edc-dsp-transform-catalog-lib = { module = "org.eclipse.edc:dsp-catalog-transform-lib", version.ref = "edc" }
 edc-controlplane-transform = { module = "org.eclipse.edc:control-plane-transform", version.ref = "edc" }
 
 # third-party desp

system-tests/end2end-test/e2e-junit-runner/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     testImplementation(libs.awaitility)
     testImplementation(libs.edc.api.management)
     testImplementation(libs.edc.dsp.transform.catalog)
+    testImplementation(libs.edc.dsp.transform.catalog.lib)
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.json.ld.lib)
     testImplementation(libs.jackson.jsr310)