fix: compilation after latest EDC commit

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

@@ -41,6 +41,8 @@ dependencies {
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.ext.http)
     testImplementation(libs.awaitility)
+    testFixturesImplementation(libs.edc.lib.json)
+
 
     testImplementation(testFixtures(project(":spi:federated-catalog-spi")))
     testImplementation(testFixtures(project(":spi:crawler-spi")))

core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/FederatedCatalogCacheExtension.java

@@ -160,16 +160,15 @@ private void registerTransformers(ServiceExtensionContext context) {
         transformerRegistry.register(new JsonObjectToCriterionTransformer());
 
         var jsonFactory = Json.createBuilderFactory(Map.of());
-        var mapper = context.getService(TypeManager.class).getMapper(JSON_LD);
         var participantIdMapper = new NoOpParticipantIdMapper();
-        transformerRegistry.register(new JsonObjectFromCatalogTransformer(jsonFactory, mapper, participantIdMapper));
-        transformerRegistry.register(new JsonObjectFromDatasetTransformer(jsonFactory, mapper));
+        transformerRegistry.register(new JsonObjectFromCatalogTransformer(jsonFactory, typeManager, JSON_LD, participantIdMapper));
+        transformerRegistry.register(new JsonObjectFromDatasetTransformer(jsonFactory, typeManager, JSON_LD));
         transformerRegistry.register(new JsonObjectFromDistributionTransformer(jsonFactory));
         transformerRegistry.register(new JsonObjectFromDataServiceTransformer(jsonFactory));
 
         transformerRegistry.register(new JsonObjectFromPolicyTransformer(jsonFactory, participantIdMapper));
         transformerRegistry.register(new JsonObjectToPolicyTransformer(participantIdMapper));
-        transformerRegistry.register(new JsonValueToGenericTypeTransformer(mapper));
+        transformerRegistry.register(new JsonValueToGenericTypeTransformer(typeManager, JSON_LD));
     }
 
     /**

core/federated-catalog-core/src/testFixtures/java/org/eclipse/edc/catalog/test/TestUtil.java

@@ -27,7 +27,7 @@
 import org.eclipse.edc.connector.controlplane.transform.odrl.to.JsonObjectToPolicyTransformer;
 import org.eclipse.edc.connector.core.agent.NoOpParticipantIdMapper;
 import org.eclipse.edc.crawler.spi.TargetNode;
-import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.eclipse.edc.json.JacksonTypeManager;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.protocol.dsp.catalog.transform.from.JsonObjectFromCatalogTransformer;
 import org.eclipse.edc.protocol.dsp.catalog.transform.from.JsonObjectFromDataServiceTransformer;
@@ -43,6 +43,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
+
 public class TestUtil {
 
     public static final String TEST_PROTOCOL = "test-protocol";
@@ -95,10 +97,10 @@ public static Dataset createDataset(String id) {
     // registers all the necessary transformers to avoid duplicating their behaviour in mocks
     public static void registerTransformers(TypeTransformerRegistry typeTransformerRegistry1) {
         var factory = Json.createBuilderFactory(Map.of());
-        var mapper = JacksonJsonLd.createObjectMapper();
+        var typeManager = new JacksonTypeManager();
         var participantIdMapper = new NoOpParticipantIdMapper();
-        typeTransformerRegistry1.register(new JsonObjectFromCatalogTransformer(factory, mapper, participantIdMapper));
-        typeTransformerRegistry1.register(new JsonObjectFromDatasetTransformer(factory, mapper));
+        typeTransformerRegistry1.register(new JsonObjectFromCatalogTransformer(factory, typeManager, JSON_LD, participantIdMapper));
+        typeTransformerRegistry1.register(new JsonObjectFromDatasetTransformer(factory, typeManager, JSON_LD));
         typeTransformerRegistry1.register(new JsonObjectFromDataServiceTransformer(factory));
         typeTransformerRegistry1.register(new JsonObjectFromPolicyTransformer(factory, participantIdMapper));
         typeTransformerRegistry1.register(new JsonObjectFromDistributionTransformer(factory));

extensions/api/federated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java

@@ -100,8 +100,8 @@ public void initialize(ServiceExtensionContext context) {
         var jsonLdMapper = typeManager.getMapper(JSON_LD);
         var catalogController = new FederatedCatalogApiController(queryService, transformerRegistry);
         webService.registerResource(CATALOG_QUERY, catalogController);
-        webService.registerResource(CATALOG_QUERY, new ObjectMapperProvider(jsonLdMapper));
-        webService.registerResource(CATALOG_QUERY, new JerseyJsonLdInterceptor(jsonLd, jsonLdMapper, CATALOG_QUERY_SCOPE));
+        webService.registerResource(CATALOG_QUERY, new ObjectMapperProvider(typeManager, JSON_LD));
+        webService.registerResource(CATALOG_QUERY, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, CATALOG_QUERY_SCOPE));
 
         // contribute to the liveness probe
         if (healthCheckService != null) {

extensions/api/federated-catalog-api/src/test/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiControllerTest.java

@@ -19,7 +19,7 @@
 import org.eclipse.edc.catalog.spi.QueryService;
 import org.eclipse.edc.connector.controlplane.catalog.spi.Dataset;
 import org.eclipse.edc.connector.core.agent.NoOpParticipantIdMapper;
-import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.eclipse.edc.json.JacksonTypeManager;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.protocol.dsp.catalog.transform.from.JsonObjectFromCatalogTransformer;
 import org.eclipse.edc.protocol.dsp.catalog.transform.from.JsonObjectFromDataServiceTransformer;
@@ -42,6 +42,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.catalog.test.TestUtil.buildCatalog;
 import static org.eclipse.edc.catalog.test.TestUtil.createCatalog;
+import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.ArgumentMatchers.any;
@@ -150,9 +151,9 @@ void queryApi_shouldUseEmptyQuerySpec_whenRequestBodyIsNull() {
     protected Object controller() {
         var typeTransformerRegistry = new TypeTransformerRegistryImpl();
         var factory = Json.createBuilderFactory(Map.of());
-        var mapper = JacksonJsonLd.createObjectMapper();
-        typeTransformerRegistry.register(new JsonObjectFromCatalogTransformer(factory, mapper, new NoOpParticipantIdMapper()));
-        typeTransformerRegistry.register(new JsonObjectFromDatasetTransformer(factory, mapper));
+        var mapper = new JacksonTypeManager();
+        typeTransformerRegistry.register(new JsonObjectFromCatalogTransformer(factory, mapper, JSON_LD, new NoOpParticipantIdMapper()));
+        typeTransformerRegistry.register(new JsonObjectFromDatasetTransformer(factory, mapper, JSON_LD));
         typeTransformerRegistry.register(new JsonObjectFromDistributionTransformer(factory));
         typeTransformerRegistry.register(new JsonObjectFromDataServiceTransformer(factory));
         typeTransformerRegistry.register(new JsonObjectToQuerySpecTransformer());

gradle/libs.versions.toml

@@ -63,6 +63,7 @@ restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssu
 # EDC libs
 edc-lib-boot = { module = "org.eclipse.edc:boot-lib", version.ref = "edc" }
 edc-lib-jerseyproviders = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }
+edc-lib-json = { module = "org.eclipse.edc:json-lib", version.ref = "edc" }
 edc-lib-providers-jersey = { module = "org.eclipse.edc:jersey-providers-lib", version.ref = "edc" }
 edc-lib-query = { module = "org.eclipse.edc:query-lib", version.ref = "edc" }
 edc-lib-sql = { module = "org.eclipse.edc:sql-lib", version.ref = "edc" }

system-tests/bom-tests/src/test/java/org/eclipse/edc/test/bom/BomSmokeTests.java

@@ -27,6 +27,7 @@
 
 import static io.restassured.RestAssured.given;
 import static org.awaitility.Awaitility.await;
+import static org.eclipse.edc.util.io.Ports.getFreePort;
 import static org.hamcrest.Matchers.equalTo;
 
 
@@ -64,6 +65,7 @@ class FederatedCatalogDcp extends SmokeTest {
                                 put("web.http.path", "/api");
                                 put("web.http.catalog.port", "8081");
                                 put("web.http.catalog.path", "/api/catalog");
+                                put("web.http.version.port", String.valueOf(getFreePort()));
                                 put("edc.catalog.cache.execution.period.seconds", "5");
                                 put("edc.iam.issuer.id", "did:web:testparticipant");
                                 put("edc.iam.sts.privatekey.alias", "private-alias");

system-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.edc.end2end;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import jakarta.json.Json;
 import org.eclipse.edc.catalog.directory.InMemoryNodeDirectory;
@@ -28,6 +27,7 @@
 import org.eclipse.edc.connector.core.agent.NoOpParticipantIdMapper;
 import org.eclipse.edc.crawler.spi.TargetNode;
 import org.eclipse.edc.crawler.spi.TargetNodeDirectory;
+import org.eclipse.edc.json.JacksonTypeManager;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
@@ -41,6 +41,7 @@
 import org.eclipse.edc.protocol.dsp.catalog.transform.from.JsonObjectFromDistributionTransformer;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.transform.TypeTransformerRegistryImpl;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer;
@@ -63,6 +64,7 @@
 import static org.eclipse.edc.connector.controlplane.transform.odrl.OdrlTransformersFactory.jsonObjectToOdrlTransformers;
 import static org.eclipse.edc.end2end.TestFunctions.createContractDef;
 import static org.eclipse.edc.end2end.TestFunctions.createPolicy;
+import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
 import static org.mockito.Mockito.mock;
 
@@ -117,8 +119,8 @@ class FederatedCatalogTest {
                     "edc.web.rest.cors.headers", "origin,content-type,accept,authorization,x-api-key"),
             ":launchers:catalog-mocked"));
     private final TypeTransformerRegistry typeTransformerRegistry = new TypeTransformerRegistryImpl();
-    private final ObjectMapper mapper = JacksonJsonLd.createObjectMapper();
-    private final CatalogApiClient apiClient = new CatalogApiClient(CATALOG_CATALOG, CONNECTOR_MANAGEMENT, mapper, new TitaniumJsonLd(mock(Monitor.class)), typeTransformerRegistry);
+    private final TypeManager mapper = new JacksonTypeManager();
+    private final CatalogApiClient apiClient = new CatalogApiClient(CATALOG_CATALOG, CONNECTOR_MANAGEMENT, JacksonJsonLd.createObjectMapper(), new TitaniumJsonLd(mock(Monitor.class)), typeTransformerRegistry);
 
     private static Map<String, String> configOf(String... keyValuePairs) {
         if (keyValuePairs.length % 2 != 0) {
@@ -135,11 +137,11 @@ private static Map<String, String> configOf(String... keyValuePairs) {
     @BeforeEach
     void setUp() {
         //needed for ZonedDateTime
-        mapper.registerModule(new JavaTimeModule());
+        mapper.getMapper(JSON_LD).registerModule(new JavaTimeModule());
         var factory = Json.createBuilderFactory(Map.of());
         var participantIdMapper = new NoOpParticipantIdMapper();
-        typeTransformerRegistry.register(new JsonObjectFromCatalogTransformer(factory, mapper, participantIdMapper));
-        typeTransformerRegistry.register(new JsonObjectFromDatasetTransformer(factory, mapper));
+        typeTransformerRegistry.register(new JsonObjectFromCatalogTransformer(factory, mapper, JSON_LD, participantIdMapper));
+        typeTransformerRegistry.register(new JsonObjectFromDatasetTransformer(factory, mapper, JSON_LD));
         typeTransformerRegistry.register(new JsonObjectFromDataServiceTransformer(factory));
         typeTransformerRegistry.register(new JsonObjectFromPolicyTransformer(factory, participantIdMapper));
         typeTransformerRegistry.register(new JsonObjectFromDistributionTransformer(factory));
@@ -148,7 +150,7 @@ void setUp() {
         typeTransformerRegistry.register(new JsonObjectToDataServiceTransformer());
         jsonObjectToOdrlTransformers(participantIdMapper).forEach(typeTransformerRegistry::register);
         typeTransformerRegistry.register(new JsonObjectToDistributionTransformer());
-        typeTransformerRegistry.register(new JsonValueToGenericTypeTransformer(mapper));
+        typeTransformerRegistry.register(new JsonValueToGenericTypeTransformer(mapper, JSON_LD));
 
         var directory = new InMemoryNodeDirectory();
         directory.insert(new TargetNode("connector", "did:web:" + UUID.randomUUID(), "http://localhost:%s%s".formatted(CONNECTOR_PROTOCOL.port(), CONNECTOR_PROTOCOL.path()), List.of(CatalogConstants.DATASPACE_PROTOCOL)));