From a3838c9759e129ddcdc9779948b6f51eddda5157 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Tue, 26 Mar 2024 22:14:03 +0100 Subject: [PATCH 1/2] fix: compile errors after upstream refactor --- core/identity-hub-credentials/build.gradle.kts | 3 +++ .../edc/identityhub/defaults/CredentialResourceLookup.java | 2 +- .../edc/identityhub/defaults/InMemoryCredentialStore.java | 2 +- .../eclipse/edc/identityhub/defaults/InMemoryEntityStore.java | 2 +- .../edc/identityhub/defaults/InMemoryKeyPairResourceStore.java | 2 +- .../identityhub/defaults/InMemoryParticipantContextStore.java | 2 +- core/identity-hub-did/build.gradle.kts | 2 ++ .../edc/identityhub/did/defaults/InMemoryDidResourceStore.java | 2 +- .../identityhub/did/defaults/InMemoryDidResourceStoreTest.java | 2 +- gradle/libs.versions.toml | 3 +++ 10 files changed, 15 insertions(+), 7 deletions(-) diff --git a/core/identity-hub-credentials/build.gradle.kts b/core/identity-hub-credentials/build.gradle.kts index 1274b7fc4..764ea489c 100644 --- a/core/identity-hub-credentials/build.gradle.kts +++ b/core/identity-hub-credentials/build.gradle.kts @@ -13,7 +13,10 @@ dependencies { implementation(libs.edc.jws2020) implementation(libs.edc.vc.ldp) implementation(libs.edc.util) + implementation(libs.edc.lib.store) implementation(libs.nimbus.jwt) + implementation(libs.edc.lib.jsonld) + implementation(libs.edc.lib.query) testImplementation(libs.edc.junit) testImplementation(libs.edc.ext.jsonld) diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java index ab6ead459..18fe722e6 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java @@ -14,9 +14,9 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.connector.core.store.ReflectionPropertyLookup; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer; +import org.eclipse.edc.query.ReflectionPropertyLookup; import org.eclipse.edc.util.reflection.PathItem; import org.eclipse.edc.util.reflection.ReflectionUtil; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java index de3a26414..ead869194 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java @@ -14,10 +14,10 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.connector.core.store.ReflectionBasedQueryResolver; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identityhub.spi.store.CredentialStore; import org.eclipse.edc.spi.query.QueryResolver; +import org.eclipse.edc.store.ReflectionBasedQueryResolver; /** * In-memory variant of the {@link CredentialStore} that is thread-safe. diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryEntityStore.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryEntityStore.java index e4d867be3..efb9cf9a5 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryEntityStore.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryEntityStore.java @@ -14,7 +14,7 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.connector.core.store.CriterionOperatorRegistryImpl; +import org.eclipse.edc.query.CriterionOperatorRegistryImpl; import org.eclipse.edc.spi.query.CriterionOperatorRegistry; import org.eclipse.edc.spi.query.QueryResolver; import org.eclipse.edc.spi.query.QuerySpec; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java index cf328488f..2a6b14c0b 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java @@ -14,10 +14,10 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.connector.core.store.ReflectionBasedQueryResolver; import org.eclipse.edc.identityhub.spi.model.KeyPairResource; import org.eclipse.edc.identityhub.spi.store.KeyPairResourceStore; import org.eclipse.edc.spi.query.QueryResolver; +import org.eclipse.edc.store.ReflectionBasedQueryResolver; public class InMemoryKeyPairResourceStore extends InMemoryEntityStore implements KeyPairResourceStore { @Override diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java index 47c3df6bb..1f7dd54c8 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java @@ -14,10 +14,10 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.connector.core.store.ReflectionBasedQueryResolver; import org.eclipse.edc.identityhub.spi.model.participant.ParticipantContext; import org.eclipse.edc.identityhub.spi.store.ParticipantContextStore; import org.eclipse.edc.spi.query.QueryResolver; +import org.eclipse.edc.store.ReflectionBasedQueryResolver; /** * In-memory variant of the {@link ParticipantContextStore} that is thread-safe. diff --git a/core/identity-hub-did/build.gradle.kts b/core/identity-hub-did/build.gradle.kts index f7eb310aa..0d5fe72a1 100644 --- a/core/identity-hub-did/build.gradle.kts +++ b/core/identity-hub-did/build.gradle.kts @@ -8,6 +8,8 @@ dependencies { implementation(libs.edc.core.connector) // for the reflection-based query resolver implementation(libs.edc.common.crypto) + implementation(libs.edc.lib.store) + implementation(libs.edc.lib.query) testImplementation(libs.edc.junit) testImplementation(libs.edc.ext.jsonld) diff --git a/core/identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java b/core/identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java index fc2f76e91..a1ce1b9fe 100644 --- a/core/identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java +++ b/core/identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java @@ -14,13 +14,13 @@ package org.eclipse.edc.identityhub.did.defaults; -import org.eclipse.edc.connector.core.store.ReflectionBasedQueryResolver; import org.eclipse.edc.identithub.did.spi.model.DidResource; import org.eclipse.edc.identithub.did.spi.store.DidResourceStore; import org.eclipse.edc.spi.query.CriterionOperatorRegistry; import org.eclipse.edc.spi.query.QueryResolver; import org.eclipse.edc.spi.query.QuerySpec; import org.eclipse.edc.spi.result.StoreResult; +import org.eclipse.edc.store.ReflectionBasedQueryResolver; import java.util.Collection; import java.util.HashMap; diff --git a/core/identity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java b/core/identity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java index f220cce21..3afa44454 100644 --- a/core/identity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java +++ b/core/identity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java @@ -14,9 +14,9 @@ package org.eclipse.edc.identityhub.did.defaults; -import org.eclipse.edc.connector.core.store.CriterionOperatorRegistryImpl; import org.eclipse.edc.identithub.did.spi.store.DidResourceStore; import org.eclipse.edc.identityhub.did.store.test.DidResourceStoreTestBase; +import org.eclipse.edc.query.CriterionOperatorRegistryImpl; class InMemoryDidResourceStoreTest extends DidResourceStoreTestBase { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b01a7bbc7..c7bacdf0e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,6 +67,9 @@ edc-testfixtures-managementapi = { module = "org.eclipse.edc:management-api-test # EDC libs edc-lib-keys = { "module" = "org.eclipse.edc:keys-lib", version.ref = "edc" } +edc-lib-query = { "module" = "org.eclipse.edc:query-lib", version.ref = "edc" } +edc-lib-jsonld = { "module" = "org.eclipse.edc:json-ld-lib", version.ref = "edc" } +edc-lib-store = { "module" = "org.eclipse.edc:store-lib", version.ref = "edc" } From 978cfa700854cad0a2f6185e687b9b6744087b54 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Tue, 26 Mar 2024 22:24:34 +0100 Subject: [PATCH 2/2] DEPENDENCIES --- DEPENDENCIES | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 396cb3419..7cd1b2f78 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -244,6 +244,7 @@ maven/mavencentral/org.eclipse.edc/connector-core/0.5.2-SNAPSHOT, Apache-2.0, ap maven/mavencentral/org.eclipse.edc/contract-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-plane-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/crypto-common/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -254,8 +255,10 @@ maven/mavencentral/org.eclipse.edc/identity-did-web/0.5.2-SNAPSHOT, Apache-2.0, maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jersey-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jersey-providers/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jetty-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/json-ld-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/json-ld-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/json-ld/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/junit-base/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -267,14 +270,16 @@ maven/mavencentral/org.eclipse.edc/keys-lib/0.5.2-SNAPSHOT, Apache-2.0, approved maven/mavencentral/org.eclipse.edc/keys-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/ldp-verifiable-credentials/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/management-api-test-fixtures/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-engine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-engine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/policy-evaluator/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-model/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/query-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/sql-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/state-machine/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/state-machine-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/store-lib/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/token-core/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/token-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.5.2-SNAPSHOT, Apache-2.0, approved, technology.edc