Skip to content

Commit 667a1be

Browse files
ndr-brtndr-brt
committed
cleanup
1 parent e1d236f commit 667a1be

File tree

16 files changed

+24
-27
lines changed

16 files changed

+24
-27
lines changed

‎advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434

3535
implementation(libs.edc.iam.mock)
3636
implementation(libs.edc.management.api)
37-
implementation(libs.edc.transfer.data.plane)
37+
implementation(libs.edc.transfer.data.plane.signaling)
3838
implementation(libs.edc.transfer.pull.http.receiver)
3939

4040
implementation(libs.edc.data.plane.selector.api)

‎gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ edc-control-plane-api = { module = "org.eclipse.edc:control-plane-api", version.
2929
edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
3030
edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
3131
edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "edc" }
32-
edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api", version.ref = "edc" }
32+
edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" }
3333
edc-data-plane-aws-s3 = { module = "org.eclipse.edc:data-plane-aws-s3", version.ref = "edc" }
3434
edc-data-plane-azure-storage = { module = "org.eclipse.edc:data-plane-azure-storage", version.ref = "edc" }
3535
edc-data-plane-client = { module = "org.eclipse.edc:data-plane-client", version.ref = "edc" }
@@ -54,13 +54,13 @@ edc-micrometer-core = { module = "org.eclipse.edc:micrometer-core", version.ref
5454
edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
5555
edc-provision-aws-s3 = { module = "org.eclipse.edc:provision-aws-s3", version.ref = "edc" }
5656
edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" }
57-
edc-transfer-data-plane = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
57+
edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" }
5858
edc-transfer-process-api = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" }
5959
edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-receiver", version.ref = "edc" }
6060
edc-transfer-pull-http-dynamic-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
6161
edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
6262
edc-vault-azure = { module = "org.eclipse.edc:vault-azure", version.ref = "edc" }
63-
edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
63+
edc-validator-data-address-http-data = { module = "org.eclipse.edc:validator-data-address-http-data", version.ref = "edc" }
6464
jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
6565
jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
6666
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }

‎system-tests/src/test/java/org/eclipse/edc/samples/common/PrerequisitesCommon.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,19 @@ public class PrerequisitesCommon {
4141
private static final String KEYSTORE_PASSWORD = "123456";
4242
private static final String PROVIDER_CONFIG_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties";
4343
private static final String CONSUMER_CONFIG_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties";
44-
private static final String PROVIDER_VAULT_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/provider-vault.properties";
45-
private static final String CONSUMER_VAULT_PROPERTIES_FILE_PATH = "transfer/transfer-00-prerequisites/resources/configuration/consumer-vault.properties";
4644
private static final String REGISTER_DATA_PLANE_PROVIDER_JSON = "transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json";
4745

4846
public static EdcRuntimeExtension getProvider() {
49-
return getConnector(CONNECTOR_MODULE_PATH, PROVIDER, PROVIDER_VAULT_PROPERTIES_FILE_PATH, PROVIDER_CONFIG_PROPERTIES_FILE_PATH);
47+
return getConnector(CONNECTOR_MODULE_PATH, PROVIDER, PROVIDER_CONFIG_PROPERTIES_FILE_PATH);
5048

5149
}
5250

5351
public static EdcRuntimeExtension getConsumer() {
54-
return getConnector(CONNECTOR_MODULE_PATH, CONSUMER, CONSUMER_VAULT_PROPERTIES_FILE_PATH, CONSUMER_CONFIG_PROPERTIES_FILE_PATH);
52+
return getConnector(CONNECTOR_MODULE_PATH, CONSUMER, CONSUMER_CONFIG_PROPERTIES_FILE_PATH);
5553
}
5654

5755
public static EdcRuntimeExtension getConsumer(String modulePath) {
58-
return getConnector(modulePath, CONSUMER, CONSUMER_VAULT_PROPERTIES_FILE_PATH, CONSUMER_CONFIG_PROPERTIES_FILE_PATH);
56+
return getConnector(modulePath, CONSUMER, CONSUMER_CONFIG_PROPERTIES_FILE_PATH);
5957
}
6058

6159
public static void registerDataPlaneProvider() {
@@ -69,7 +67,6 @@ public static void runPrerequisites() {
6967
private static EdcRuntimeExtension getConnector(
7068
String modulePath,
7169
String moduleName,
72-
String vaultPropertiesFilePath,
7370
String configPropertiesFilePath
7471
) {
7572
return new EdcRuntimeExtension(

‎system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.time.Duration;
2323

2424
import static io.restassured.RestAssured.given;
25+
import static org.assertj.core.api.Assertions.assertThat;
2526
import static org.awaitility.Awaitility.await;
2627
import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
2728
import static org.eclipse.edc.samples.common.PrerequisitesCommon.API_KEY_HEADER_KEY;
@@ -104,9 +105,9 @@ public static void checkTransferStatus(String transferProcessId, TransferProcess
104105
.atMost(TIMEOUT)
105106
.pollDelay(POLL_DELAY)
106107
.pollInterval(POLL_INTERVAL)
107-
.until(
108-
() -> get(CONSUMER_MANAGEMENT_URL + V2_TRANSFER_PROCESSES_PATH + transferProcessId, EDC_STATE),
109-
(result) -> status.name().equals(result)
110-
);
108+
.untilAsserted(() -> {
109+
var state = get(CONSUMER_MANAGEMENT_URL + V2_TRANSFER_PROCESSES_PATH + transferProcessId, EDC_STATE);
110+
assertThat(state).isEqualTo(status.name());
111+
});
111112
}
112113
}

‎transfer/streaming/streaming-01-http-to-http/streaming-01-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation(libs.edc.management.api)
3131
implementation(libs.edc.dsp)
3232
implementation(libs.edc.data.plane.selector.api)
33-
implementation(libs.edc.transfer.data.plane)
33+
implementation(libs.edc.transfer.data.plane.signaling)
3434
implementation(libs.edc.data.plane.spi)
3535
implementation(libs.edc.data.plane.core)
3636
implementation(libs.edc.data.plane.http)

‎transfer/streaming/streaming-02-kafka-to-http/streaming-02-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation(libs.edc.management.api)
3131
implementation(libs.edc.dsp)
3232
implementation(libs.edc.data.plane.selector.api)
33-
implementation(libs.edc.transfer.data.plane)
33+
implementation(libs.edc.transfer.data.plane.signaling)
3434
implementation(libs.edc.data.plane.spi)
3535
implementation(libs.edc.data.plane.core)
3636
implementation(libs.edc.data.plane.http)

‎transfer/streaming/streaming-03-kafka-broker/streaming-03-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
implementation(libs.edc.management.api)
2929
implementation(libs.edc.dsp)
3030
implementation(libs.edc.data.plane.selector.api)
31-
implementation(libs.edc.transfer.data.plane)
31+
implementation(libs.edc.transfer.data.plane.signaling)
3232
implementation(libs.edc.transfer.pull.http.dynamic.receiver)
3333
implementation(libs.edc.data.plane.spi)
3434
implementation(libs.edc.data.plane.core)

‎transfer/transfer-00-prerequisites/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ This property is used to define the endpoint exposed by the control plane to val
5757
To run the provider, just run the following command
5858

5959
```bash
60-
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.vault=transfer/transfer-00-prerequisites/resources/configuration/provider-vault.properties -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties -jar transfer/transfer-00-prerequisites/connector/build/libs/connector.jar
60+
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/provider-configuration.properties -jar transfer/transfer-00-prerequisites/connector/build/libs/connector.jar
6161
```
6262

6363
To run the consumer, just run the following command (different terminal)
6464

6565
```bash
66-
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.vault=transfer/transfer-00-prerequisites/resources/configuration/consumer-vault.properties -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties -jar transfer/transfer-00-prerequisites/connector/build/libs/connector.jar
66+
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties -jar transfer/transfer-00-prerequisites/connector/build/libs/connector.jar
6767
```
6868

6969
Assuming you didn't change the ports in config files, the consumer will listen on the

‎transfer/transfer-00-prerequisites/connector/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ dependencies {
2626
implementation(libs.edc.configuration.filesystem)
2727
implementation(libs.edc.iam.mock)
2828
implementation(libs.edc.management.api)
29-
implementation(libs.edc.transfer.data.plane)
29+
implementation(libs.edc.transfer.data.plane.signaling)
3030
implementation(libs.edc.transfer.pull.http.receiver)
31+
implementation(libs.edc.validator.data.address.http.data)
3132

3233
implementation(libs.edc.data.plane.selector.api)
3334
implementation(libs.edc.data.plane.selector.core)

‎transfer/transfer-00-prerequisites/resources/configuration/consumer-vault.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎transfer/transfer-00-prerequisites/resources/configuration/provider-vault.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎transfer/transfer-04-event-consumer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Run this to build and launch the consumer with listener extension:
6464

6565
```bash
6666
./gradlew transfer:transfer-04-event-consumer:consumer-with-listener:build
67-
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.vault=transfer/transfer-00-prerequisites/resources/configuration/consumer-vault.properties -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties -jar transfer/transfer-04-event-consumer/consumer-with-listener/build/libs/connector.jar
67+
java -Dedc.keystore=transfer/transfer-00-prerequisites/resources/certs/cert.pfx -Dedc.keystore.password=123456 -Dedc.fs.config=transfer/transfer-00-prerequisites/resources/configuration/consumer-configuration.properties -jar transfer/transfer-04-event-consumer/consumer-with-listener/build/libs/connector.jar
6868
````
6969

7070
### 2. Negotiate a new contract

‎transfer/transfer-04-event-consumer/consumer-with-listener/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
implementation(libs.edc.configuration.filesystem)
2828
implementation(libs.edc.iam.mock)
2929
implementation(libs.edc.management.api)
30-
implementation(libs.edc.transfer.data.plane)
30+
implementation(libs.edc.transfer.data.plane.signaling)
3131
implementation(libs.edc.transfer.pull.http.receiver)
3232

3333
implementation(libs.edc.data.plane.selector.api)

‎transfer/transfer-05-file-transfer-cloud/cloud-transfer-consumer/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939

4040
implementation(libs.edc.control.plane.api.client)
4141
implementation(libs.edc.control.plane.api)
42-
implementation(libs.edc.transfer.data.plane)
42+
implementation(libs.edc.transfer.data.plane.signaling)
4343
implementation(libs.edc.transfer.pull.http.receiver)
4444

4545
implementation(libs.edc.data.plane.selector.api)

‎transfer/transfer-05-file-transfer-cloud/cloud-transfer-provider/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939

4040
implementation(libs.edc.control.plane.api.client)
4141
implementation(libs.edc.control.plane.api)
42-
implementation(libs.edc.transfer.data.plane)
42+
implementation(libs.edc.transfer.data.plane.signaling)
4343
implementation(libs.edc.transfer.pull.http.receiver)
4444

4545
implementation(libs.edc.data.plane.selector.api)

‎transfer/transfer-05-file-transfer-cloud/transfer-file-cloud/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
implementation(libs.edc.data.plane.aws.s3)
2525
implementation(libs.edc.data.plane.client)
2626
implementation(libs.edc.data.plane.selector.core)
27-
implementation(libs.edc.transfer.data.plane)
27+
implementation(libs.edc.transfer.data.plane.signaling)
2828

2929
implementation(libs.opentelemetry.annotations)
3030
}

0 commit comments

Comments
 (0)