Skip to content

Commit fdbc521

Browse files
paullatzelspergerpaullatzelsperger
authored
feat: adapt upstream package changes (Keys) (#167)
* chore: adapt to upstream package changes (Keys) * DEPENDENCIES
1 parent 77e66ec commit fdbc521

File tree

8 files changed

+45
-53
lines changed

8 files changed

+45
-53
lines changed

‎DEPENDENCIES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ maven/mavencentral/org.eclipse.edc/asset-spi/0.5.2-SNAPSHOT, Apache-2.0, approve
243243
maven/mavencentral/org.eclipse.edc/auth-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
244244
maven/mavencentral/org.eclipse.edc/autodoc-processor/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
245245
maven/mavencentral/org.eclipse.edc/azure-test/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
246+
maven/mavencentral/org.eclipse.edc/boot-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
246247
maven/mavencentral/org.eclipse.edc/boot/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
247248
maven/mavencentral/org.eclipse.edc/catalog-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
248249
maven/mavencentral/org.eclipse.edc/catalog-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -295,6 +296,7 @@ maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.5.2-SNAPSHOT
295296
maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
296297
maven/mavencentral/org.eclipse.edc/dsp-version-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
297298
maven/mavencentral/org.eclipse.edc/dsp/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
299+
maven/mavencentral/org.eclipse.edc/http-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
298300
maven/mavencentral/org.eclipse.edc/http-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
299301
maven/mavencentral/org.eclipse.edc/http/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
300302
maven/mavencentral/org.eclipse.edc/iam-mock/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -311,6 +313,8 @@ maven/mavencentral/org.eclipse.edc/json-ld-spi/0.5.2-SNAPSHOT, Apache-2.0, appro
311313
maven/mavencentral/org.eclipse.edc/json-ld/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
312314
maven/mavencentral/org.eclipse.edc/junit/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
313315
maven/mavencentral/org.eclipse.edc/jwt-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
316+
maven/mavencentral/org.eclipse.edc/keys-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
317+
maven/mavencentral/org.eclipse.edc/keys-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
314318
maven/mavencentral/org.eclipse.edc/management-api-configuration/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
315319
maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc
316320
maven/mavencentral/org.eclipse.edc/management-api/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc

‎extensions/common/azure/azure-test/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ plugins {
2020

2121
dependencies {
2222
api(libs.edc.controlplane.spi)
23+
testFixturesApi(libs.edc.spi.transaction.datasource)
2324
testFixturesApi(libs.postgres)
2425
testFixturesApi(libs.testcontainers.junit)
25-
2626
testFixturesApi(libs.edc.util)
2727
testFixturesApi(libs.edc.junit)
2828
testFixturesApi(libs.edc.sql.core)

‎extensions/common/azure/azure-test/src/testFixtures/java/org/eclipse/edc/azure/testfixtures/AbstractAzureBlobTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.List;
2626
import java.util.UUID;
2727

28-
import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
28+
import static org.eclipse.edc.util.io.Ports.getFreePort;
2929
import static org.junit.jupiter.api.Assertions.assertFalse;
3030
import static org.junit.jupiter.api.Assertions.assertTrue;
3131
import static org.junit.jupiter.api.Assertions.fail;
@@ -58,14 +58,6 @@ public void setupClient() {
5858
createContainer(providerBlobServiceClient, providerContainerName);
5959
}
6060

61-
protected void createContainer(BlobServiceClient client, String containerName) {
62-
assertFalse(client.getBlobContainerClient(containerName).exists());
63-
64-
var blobContainerClient = client.createBlobContainer(containerName);
65-
assertTrue(blobContainerClient.exists());
66-
containerCleanup.add(() -> client.deleteBlobContainer(containerName));
67-
}
68-
6961
@AfterEach
7062
public void teardown() {
7163
for (var cleanup : containerCleanup) {
@@ -76,4 +68,12 @@ public void teardown() {
7668
}
7769
}
7870
}
71+
72+
protected void createContainer(BlobServiceClient client, String containerName) {
73+
assertFalse(client.getBlobContainerClient(containerName).exists());
74+
75+
var blobContainerClient = client.createBlobContainer(containerName);
76+
assertTrue(blobContainerClient.exists());
77+
containerCleanup.add(() -> client.deleteBlobContainer(containerName));
78+
}
7979
}

‎extensions/control-plane/store/transfer-process-store-cosmos/src/test/resources/schema.sql‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,31 @@ CREATE TABLE IF NOT EXISTS edc_transfer_process
1919
transferprocess_id VARCHAR NOT NULL
2020
CONSTRAINT transfer_process_pk
2121
PRIMARY KEY,
22-
type VARCHAR NOT NULL,
23-
state INTEGER NOT NULL,
24-
state_count INTEGER DEFAULT 0 NOT NULL,
25-
state_time_stamp BIGINT,
26-
created_at BIGINT NOT NULL,
27-
updated_at BIGINT NOT NULL,
28-
trace_context JSON,
29-
error_detail VARCHAR,
30-
resource_manifest JSON,
31-
provisioned_resource_set JSON,
32-
content_data_address JSON,
33-
deprovisioned_resources JSON,
34-
private_properties JSON,
35-
callback_addresses JSON,
36-
pending BOOLEAN DEFAULT FALSE,
37-
transfer_type VARCHAR,
38-
protocol_messages JSON,
39-
lease_id VARCHAR
22+
type VARCHAR NOT NULL,
23+
state INTEGER NOT NULL,
24+
state_count INTEGER DEFAULT 0 NOT NULL,
25+
state_time_stamp BIGINT,
26+
created_at BIGINT NOT NULL,
27+
updated_at BIGINT NOT NULL,
28+
trace_context JSON,
29+
error_detail VARCHAR,
30+
resource_manifest JSON,
31+
provisioned_resource_set JSON,
32+
content_data_address JSON,
33+
deprovisioned_resources JSON,
34+
private_properties JSON,
35+
callback_addresses JSON,
36+
pending BOOLEAN DEFAULT FALSE,
37+
transfer_type VARCHAR,
38+
protocol_messages JSON,
39+
data_plane_id VARCHAR,
40+
correlation_id VARCHAR,
41+
counter_party_address VARCHAR,
42+
protocol VARCHAR,
43+
asset_id VARCHAR,
44+
contract_id VARCHAR,
45+
data_destination JSON,
46+
lease_id VARCHAR
4047
CONSTRAINT transfer_process_lease_lease_id_fk
4148
REFERENCES edc_lease
4249
ON DELETE SET NULL
@@ -56,27 +63,5 @@ COMMENT ON COLUMN edc_transfer_process.deprovisioned_resources IS 'List of depro
5663
CREATE UNIQUE INDEX IF NOT EXISTS transfer_process_id_uindex
5764
ON edc_transfer_process (transferprocess_id);
5865

59-
CREATE TABLE IF NOT EXISTS edc_data_request
60-
(
61-
datarequest_id VARCHAR NOT NULL
62-
CONSTRAINT data_request_pk
63-
PRIMARY KEY,
64-
process_id VARCHAR NOT NULL,
65-
connector_address VARCHAR NOT NULL,
66-
protocol VARCHAR NOT NULL,
67-
asset_id VARCHAR NOT NULL,
68-
contract_id VARCHAR NOT NULL,
69-
data_destination JSON NOT NULL,
70-
transfer_process_id VARCHAR NOT NULL
71-
CONSTRAINT data_request_transfer_process_id_fk
72-
REFERENCES edc_transfer_process
73-
ON UPDATE RESTRICT ON DELETE CASCADE
74-
);
75-
76-
COMMENT ON COLUMN edc_data_request.data_destination IS 'DataAddress serialized as JSON';
77-
78-
CREATE UNIQUE INDEX IF NOT EXISTS data_request_id_uindex
79-
ON edc_data_request (datarequest_id);
80-
8166
CREATE UNIQUE INDEX IF NOT EXISTS lease_lease_id_uindex
8267
ON edc_lease (lease_id);

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ edc-spi-contract = { module = "org.eclipse.edc:contract-spi", version.ref = "edc
7676
edc-spi-policy = { module = "org.eclipse.edc:policy-spi", version.ref = "edc" }
7777
edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
7878
edc-spi-transfer = { module = "org.eclipse.edc:transfer-spi", version.ref = "edc" }
79+
edc-spi-transaction-datasource = { module = "org.eclipse.edc:transaction-datasource-spi", version.ref = "edc" }
7980
edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }
8081
edc-spi-jsonld = { module = "org.eclipse.edc:json-ld-spi", version.ref = "edc" }
8182
edc-spi-dataplane = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }

‎system-tests/azure-blob-transfer-fixtures/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
testFixturesApi(project(":extensions:common:azure:azure-blob-core"))
2222
testFixturesApi(libs.edc.jsonld)
2323
testFixturesApi(testFixtures(libs.edc.management.api.test.fixtures))
24-
24+
testFixturesApi(libs.edc.util)
2525
testFixturesImplementation(libs.restAssured)
2626
testFixturesImplementation(libs.azure.storageblob)
2727
testFixturesImplementation(libs.edc.junit)

‎system-tests/azure-blob-transfer-fixtures/src/testFixtures/java/org/eclipse/edc/test/system/blob/ConsumerConstants.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
package org.eclipse.edc.test.system.blob;
1616

17-
import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
17+
18+
import static org.eclipse.edc.util.io.Ports.getFreePort;
1819

1920
public interface ConsumerConstants {
2021
String PARTICIPANT_NAME = "consumer";

‎system-tests/azure-blob-transfer-fixtures/src/testFixtures/java/org/eclipse/edc/test/system/blob/ProviderConstants.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
import java.net.URI;
1818

19-
import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
19+
import static org.eclipse.edc.util.io.Ports.getFreePort;
20+
2021

2122
public interface ProviderConstants {
2223
String PARTICIPANT_NAME = "provider";

0 commit comments

Comments
 (0)