fix compilation and adapt transfer-04

Author: ndr-brt

federated-catalog/fc-01-embedded/fc-connector/config.properties

@@ -16,7 +16,6 @@ edc.dataplane.api.public.baseurl=http://localhost:29291/public
 
 
 web.http.management.auth.key=password
-edc.ids.id=urn:connector:provider
 edc.mock.region=us
 
 

federated-catalog/fc-02-standalone/standalone-fc/config.properties

@@ -2,8 +2,6 @@ edc.participant.id=consumer
 
 web.http.port=39191
 web.http.path=/api
-web.http.version.port=49191
-web.http.version.path=/version
 
 web.http.catalog.path=/api/catalog
 web.http.catalog.port=39195

gradle/libs.versions.toml

@@ -16,9 +16,7 @@ edc-bom-controlplane-base = { module = "org.eclipse.edc:controlplane-base-bom",
 edc-bom-dataplane-base = { module = "org.eclipse.edc:dataplane-base-bom", version.ref = "edc" }
 edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
-edc-control-api-configuration = { module = "org.eclipse.edc:control-api-configuration", version.ref = "edc" }
 edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" }
-edc-control-plane-api = { module = "org.eclipse.edc:control-plane-api", version.ref = "edc" }
 edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
 edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
 edc-data-plane-signaling-api = { module = "org.eclipse.edc:data-plane-signaling-api", version.ref = "edc" }
@@ -29,7 +27,6 @@ edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref
 edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" }
 edc-data-plane-iam = { module = "org.eclipse.edc:data-plane-iam", version.ref = "edc" }
 edc-data-plane-kafka = { module = "org.eclipse.edc:data-plane-kafka", version.ref = "edc" }
-edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
 edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
 edc-data-plane-self-registration = { module = "org.eclipse.edc:data-plane-self-registration", version.ref = "edc" }
 edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }

policy/policy-01-policy-enforcement/policy-enforcement-consumer/build.gradle.kts

@@ -19,16 +19,8 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.edc.runtime.core)
-    implementation(libs.edc.connector.core)
-    implementation(libs.edc.control.plane.core)
-    implementation(libs.edc.edr.store.core)
-    implementation(libs.edc.configuration.filesystem)
-    implementation(libs.edc.management.api)
-    implementation(libs.edc.dsp)
-    implementation(libs.edc.participant.context.single.core)
-    implementation(libs.edc.iam.mock)
-    implementation(libs.edc.http)
+    runtimeOnly(libs.edc.bom.controlplane.base)
+    runtimeOnly(libs.edc.iam.mock)
 }
 
 application {

policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties

@@ -4,11 +4,10 @@ web.http.management.port=29193
 web.http.management.path=/management
 web.http.protocol.port=29194
 web.http.protocol.path=/protocol
-web.http.version.port=29195
-web.http.version.path=/version
+web.http.config.port=29195
+web.http.config.path=/config
 
 web.http.management.auth.key=password
 edc.dsp.callback.address=http://localhost:29194/protocol
 edc.participant.id=consumer
-edc.ids.id=urn:connector:consumer
 edc.mock.region=us

policy/policy-01-policy-enforcement/policy-enforcement-provider/build.gradle.kts

@@ -20,16 +20,8 @@ plugins {
 
 
 dependencies {
-    implementation(libs.edc.runtime.core)
-    implementation(libs.edc.connector.core)
-    implementation(libs.edc.control.plane.core)
-    implementation(libs.edc.edr.store.core)
-    implementation(libs.edc.configuration.filesystem)
-    implementation(libs.edc.management.api)
-    implementation(libs.edc.dsp)
-    implementation(libs.edc.participant.context.single.core)
-    implementation(libs.edc.iam.mock)
-    implementation(libs.edc.http)
+    runtimeOnly(libs.edc.bom.controlplane.base)
+    runtimeOnly(libs.edc.iam.mock)
 
     implementation(project(":policy:policy-01-policy-enforcement:policy-functions"))
 }

policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties

@@ -4,10 +4,9 @@ web.http.management.port=19193
 web.http.management.path=/management
 web.http.protocol.port=19194
 web.http.protocol.path=/protocol
-web.http.version.port=19195
-web.http.version.path=/version
+web.http.control.port=19195
+web.http.control.path=/control
 
 web.http.management.auth.key=password
 edc.dsp.callback.address=http://localhost:19194/protocol
 edc.participant.id=provider
-edc.ids.id=urn:connector:provider

settings.gradle.kts

@@ -33,16 +33,11 @@ include(":basic:basic-02-health-endpoint")
 include(":basic:basic-03-configuration")
 
 include(":transfer:transfer-00-prerequisites:connector")
-
-include(":transfer:transfer-04-event-consumer:consumer-with-listener")
-include(":transfer:transfer-04-event-consumer:listener")
-
+include(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane")
+include(":transfer:transfer-04-event-consumer:consumer-with-subscriber")
 include(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-consumer")
 include(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-provider")
 include(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud")
-
-include(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane")
-
 include(":transfer:transfer-06-kafka-broker:kafka-runtime")
 
 include(":advanced:advanced-01-open-telemetry:open-telemetry-runtime")

system-tests/build.gradle.kts

@@ -43,8 +43,7 @@ dependencies {
 
     testCompileOnly(project(":transfer:transfer-00-prerequisites:connector"))
     testCompileOnly(project(":transfer:transfer-03-consumer-pull:provider-proxy-data-plane"))
-    testCompileOnly(project(":transfer:transfer-04-event-consumer:consumer-with-listener"))
-    testCompileOnly(project(":transfer:transfer-04-event-consumer:listener"))
+    testCompileOnly(project(":transfer:transfer-04-event-consumer:consumer-with-subscriber"))
     testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-consumer"))
     testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-provider"))
     testCompileOnly(project(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud"))

system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java

@@ -39,7 +39,7 @@ public String createAsset(String requestBody) {
                 .body(requestBody)
                 .when()
                 .header("x-api-key", "bau")
-                .post("/v3/assets")
+                .post("/assets")
                 .then()
                 .log().ifValidationFails()
                 .statusCode(200)
@@ -52,7 +52,7 @@ public String createPolicyDefinition(String requestBody) {
                 .contentType(JSON)
                 .body(requestBody)
                 .when()
-                .post("/v3/policydefinitions")
+                .post("/policydefinitions")
                 .then()
                 .statusCode(200)
                 .contentType(JSON)
@@ -64,7 +64,7 @@ public String createContractDefinition(String requestBody) {
                 .contentType(JSON)
                 .body(requestBody)
                 .when()
-                .post("/v3/contractdefinitions")
+                .post("/contractdefinitions")
                 .then()
                 .statusCode(200)
                 .extract().jsonPath().getString(ID);
@@ -75,7 +75,7 @@ public String fetchDatasetFromCatalog(String requestBody) {
                 .contentType(JSON)
                 .body(requestBody)
                 .when()
-                .post("/v3/catalog/dataset/request")
+                .post("/catalog/dataset/request")
                 .then()
                 .statusCode(200)
                 .contentType(JSON)
@@ -87,7 +87,7 @@ public String negotiateContract(String requestBody) {
                 .contentType(JSON)
                 .body(requestBody)
                 .when()
-                .post("/v3/contractnegotiations/")
+                .post("/contractnegotiations/")
                 .then()
                 .statusCode(200)
                 .contentType(JSON)
@@ -98,7 +98,7 @@ public String getContractAgreementId(String contractNegotiationId) {
         return baseManagementRequest()
                 .contentType(JSON)
                 .when()
-                .get("/v3/contractnegotiations/" + contractNegotiationId)
+                .get("/contractnegotiations/" + contractNegotiationId)
                 .then()
                 .statusCode(200)
                 .contentType(JSON)
@@ -110,7 +110,7 @@ public String startTransfer(String requestBody) {
                 .contentType(JSON)
                 .body(requestBody)
                 .when()
-                .post("/v3/transferprocesses")
+                .post("/transferprocesses")
                 .then()
                 .statusCode(200)
                 .contentType(JSON)