diff --git a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts index d114107c..0f2f9e41 100644 --- a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts +++ b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts @@ -27,7 +27,6 @@ dependencies { runtimeOnly(libs.edc.bom.dataplane.base) implementation(libs.edc.iam.mock) - implementation(libs.edc.data.plane.public.api) implementation(libs.opentelemetry.exporter.otlp) runtimeOnly(libs.edc.monitor.jdk.logger) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2da9201c..296fdb85 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ format.version = "1.1" [versions] awaitility = "4.2.2" -edc = "0.14.1" +edc = "0.15.1" okhttp-mockwebserver = "5.3.2" restAssured = "6.0.0" rsApi = "4.0.0" @@ -23,7 +23,6 @@ edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", versio 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" } edc-data-plane-signaling-client = { module = "org.eclipse.edc:data-plane-signaling-client", version.ref = "edc" } -edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" } edc-data-plane-aws-s3 = { module = "org.eclipse.edc.aws:data-plane-aws-s3", version.ref = "edc" } edc-data-plane-azure-storage = { module = "org.eclipse.edc.azure:data-plane-azure-storage", version.ref = "edc" } edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" } diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java index 1f68db5c..d364abe2 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java @@ -14,8 +14,8 @@ package org.eclipse.edc.samples.transfer; -import org.eclipse.edc.connector.controlplane.test.system.utils.LazySupplier; import org.eclipse.edc.connector.controlplane.test.system.utils.Participant; +import org.eclipse.edc.junit.utils.LazySupplier; import java.net.URI; diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java index 40613fba..5521cb35 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java @@ -37,11 +37,11 @@ import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import org.eclipse.edc.connector.controlplane.test.system.utils.LazySupplier; import org.eclipse.edc.junit.annotations.EndToEndTest; import org.eclipse.edc.junit.extensions.EmbeddedRuntime; import org.eclipse.edc.junit.extensions.RuntimeExtension; import org.eclipse.edc.junit.extensions.RuntimePerClassExtension; +import org.eclipse.edc.junit.utils.LazySupplier; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.util.io.Ports; import org.jetbrains.annotations.NotNull; diff --git a/transfer/transfer-03-consumer-pull/README.md b/transfer/transfer-03-consumer-pull/README.md index 0c321a16..56874051 100644 --- a/transfer/transfer-03-consumer-pull/README.md +++ b/transfer/transfer-03-consumer-pull/README.md @@ -22,13 +22,10 @@ that will be used for the "consumer" instance. ## Implement a simple Http Proxy data plane -In the [provider-proxy-data-plane](provider-proxy-data-plane) there's a connector based on the [basic one](../transfer-00-prerequisites/connector) -but with the `data-plane-api-v2` module excluded, because that one has been deprecated: +In the [provider-proxy-data-plane](provider-proxy-data-plane) there's a connector based on the [basic one](../transfer-00-prerequisites/connector): ```kotlin - runtimeOnly(project(":transfer:transfer-00-prerequisites:connector")) { - exclude("org.eclipse.edc", "data-plane-public-api-v2") - } + runtimeOnly(project(":transfer:transfer-00-prerequisites:connector")) ``` The proxy implementation provided in this runtime is really bare-bone and it supports only `GET`. Needless to say, it is diff --git a/transfer/transfer-03-consumer-pull/provider-proxy-data-plane/src/main/java/org/eclipse/edc/sample/extension/proxy/CustomProxyDataPlaneExtension.java b/transfer/transfer-03-consumer-pull/provider-proxy-data-plane/src/main/java/org/eclipse/edc/sample/extension/proxy/CustomProxyDataPlaneExtension.java index 81cb8ca8..cb20d046 100644 --- a/transfer/transfer-03-consumer-pull/provider-proxy-data-plane/src/main/java/org/eclipse/edc/sample/extension/proxy/CustomProxyDataPlaneExtension.java +++ b/transfer/transfer-03-consumer-pull/provider-proxy-data-plane/src/main/java/org/eclipse/edc/sample/extension/proxy/CustomProxyDataPlaneExtension.java @@ -27,8 +27,6 @@ import org.eclipse.edc.web.spi.configuration.PortMapping; import org.eclipse.edc.web.spi.configuration.PortMappingRegistry; -import static org.eclipse.edc.web.spi.configuration.ApiContext.PUBLIC; - public class CustomProxyDataPlaneExtension implements ServiceExtension { private static final int DEFAULT_PUBLIC_PORT = 8185; @@ -51,18 +49,18 @@ public class CustomProxyDataPlaneExtension implements ServiceExtension { @Override public void initialize(ServiceExtensionContext context) { - portMappingRegistry.register(new PortMapping(PUBLIC, apiConfiguration.port(), apiConfiguration.path())); + portMappingRegistry.register(new PortMapping("public", apiConfiguration.port(), apiConfiguration.path())); generatorService.addGeneratorFunction("HttpData", dataAddress -> Endpoint.url(proxyPublicEndpoint)); - webService.registerResource(PUBLIC, new ProxyController(authorizationService)); + webService.registerResource("public", new ProxyController(authorizationService)); } @Settings record PublicApiConfiguration( - @Setting(key = "web.http." + PUBLIC + ".port", description = "Port for " + PUBLIC + " api context", defaultValue = DEFAULT_PUBLIC_PORT + "") + @Setting(key = "web.http.public.port", description = "Port for public api context", defaultValue = DEFAULT_PUBLIC_PORT + "") int port, - @Setting(key = "web.http." + PUBLIC + ".path", description = "Path for " + PUBLIC + " api context", defaultValue = DEFAULT_PUBLIC_PATH) + @Setting(key = "web.http.public.path", description = "Path for public api context", defaultValue = DEFAULT_PUBLIC_PATH) String path ) { diff --git a/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts b/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts index aaf633bf..2bea00d9 100644 --- a/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts +++ b/transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts @@ -43,7 +43,6 @@ dependencies { implementation(libs.edc.data.plane.self.registration) implementation(libs.edc.data.plane.signaling.api) - implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) implementation(libs.edc.data.plane.iam) diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts index 3d57fa73..4e599166 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts @@ -41,7 +41,6 @@ dependencies { implementation(libs.edc.data.plane.self.registration) implementation(libs.edc.data.plane.signaling.api) - implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) diff --git a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts index 4c18f16b..f69279e2 100644 --- a/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts +++ b/transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts @@ -43,7 +43,6 @@ dependencies { implementation(libs.edc.data.plane.self.registration) implementation(libs.edc.data.plane.signaling.api) - implementation(libs.edc.data.plane.public.api) implementation(libs.edc.data.plane.core) implementation(libs.edc.data.plane.http) diff --git a/transfer/transfer-06-kafka-broker/kafka-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java b/transfer/transfer-06-kafka-broker/kafka-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java index ae5261a0..8744ad31 100644 --- a/transfer/transfer-06-kafka-broker/kafka-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java +++ b/transfer/transfer-06-kafka-broker/kafka-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java @@ -37,7 +37,7 @@ public boolean canHandle(TransferProcess transferProcess) { } @Override - public StatusResult provision(TransferProcess transferProcess, Policy policy) { + public StatusResult prepare(TransferProcess transferProcess, Policy policy) { // here the flow can be provisioned, not something covered in this sample return StatusResult.success(null); }