From 4deec27846b8a9ce1f222dbb3b7d9268ac14a5bd Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Wed, 3 Apr 2024 18:37:03 +0200 Subject: [PATCH] chore: fixes after edc vc module refactor (#316) * chore: fixes after edc vc module refactor * chore: dependencies file --- DEPENDENCIES | 1 + .../api/PresentationApiExtension.java | 4 ++-- .../api/v1/PresentationApiController.java | 4 ++-- .../validation/PresentationQueryValidator.java | 2 +- .../api/v1/PresentationApiControllerTest.java | 12 ++++++------ .../PresentationQueryValidatorTest.java | 10 +++++----- core/identity-hub-credentials/build.gradle.kts | 1 + .../identityhub/core/CoreServicesExtension.java | 4 ++-- .../core/CredentialQueryResolverImpl.java | 2 +- .../core/PresentationCreatorRegistryImpl.java | 4 ++-- .../core/VerifiablePresentationServiceImpl.java | 12 ++++++------ .../core/creators/JwtPresentationGenerator.java | 4 ++-- .../core/creators/LdpPresentationGenerator.java | 6 +++--- .../defaults/CredentialResourceLookup.java | 2 +- .../core/CredentialQueryResolverImplTest.java | 15 +++++++-------- .../PresentationCreatorRegistryImplTest.java | 2 +- .../VerifiablePresentationServiceImplTest.java | 16 ++++++++-------- .../creators/JwtPresentationGeneratorTest.java | 4 ++-- .../creators/LdpPresentationGeneratorTest.java | 6 +++--- .../core/creators/PresentationGeneratorTest.java | 6 +++--- .../tests/PresentationApiComponentTest.java | 6 +++--- .../VerifiableCredentialsApiControllerTest.java | 10 +++++----- .../sql/credentials/SqlCredentialStore.java | 6 +++--- gradle/libs.versions.toml | 1 + spi/identity-hub-spi/build.gradle.kts | 1 + .../generator/PresentationCreatorRegistry.java | 4 ++-- .../spi/generator/PresentationGenerator.java | 2 +- .../generator/VerifiablePresentationService.java | 7 ++++--- .../spi/model/IdentityHubConstants.java | 2 +- .../spi/model/VerifiableCredentialResource.java | 2 +- .../spi/resolution/CredentialQueryResolver.java | 4 ++-- .../identityhub/spi/resolution/QueryResult.java | 2 +- .../store/test/CredentialStoreTestBase.java | 10 +++++----- 33 files changed, 89 insertions(+), 85 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 272d79b95..253ee93ca 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -293,6 +293,7 @@ maven/mavencentral/org.eclipse.edc/util-lib/0.6.1-SNAPSHOT, Apache-2.0, approved maven/mavencentral/org.eclipse.edc/util/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/web-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty diff --git a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/PresentationApiExtension.java b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/PresentationApiExtension.java index 8517f6c0d..8c8299319 100644 --- a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/PresentationApiExtension.java +++ b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/PresentationApiExtension.java @@ -15,7 +15,7 @@ package org.eclipse.edc.identityhub.api; import org.eclipse.edc.core.transform.transformer.edc.to.JsonValueToGenericTypeTransformer; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; import org.eclipse.edc.iam.identitytrust.transform.to.JsonObjectToPresentationQueryTransformer; import org.eclipse.edc.identityhub.api.v1.PresentationApiController; import org.eclipse.edc.identityhub.api.validation.PresentationQueryValidator; @@ -35,7 +35,7 @@ import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebService; -import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.api.PresentationApiExtension.NAME; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; diff --git a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApiController.java b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApiController.java index 19678449a..d83dc110f 100644 --- a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApiController.java +++ b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/v1/PresentationApiController.java @@ -23,7 +23,7 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; import org.eclipse.edc.identityhub.spi.ParticipantContextService; import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService; import org.eclipse.edc.identityhub.spi.model.participant.ParticipantContext; @@ -46,7 +46,7 @@ import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY; import static org.eclipse.edc.identityhub.spi.ParticipantContextId.onEncoded; import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper; diff --git a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/validation/PresentationQueryValidator.java b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/validation/PresentationQueryValidator.java index d03a1e67d..4a9c25adb 100644 --- a/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/validation/PresentationQueryValidator.java +++ b/core/identity-hub-api/src/main/java/org/eclipse/edc/identityhub/api/validation/PresentationQueryValidator.java @@ -17,7 +17,7 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.validator.spi.ValidationResult; import org.eclipse.edc.validator.spi.Validator; diff --git a/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java b/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java index 2076ccee0..12f1ec04d 100644 --- a/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java +++ b/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java @@ -17,11 +17,11 @@ import com.nimbusds.jwt.JWTClaimsSet; import jakarta.json.Json; import jakarta.json.JsonObject; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.InputDescriptorMapping; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationSubmission; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.credentialservice.InputDescriptorMapping; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.credentialservice.PresentationSubmission; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.identityhub.api.v1.PresentationApiController; import org.eclipse.edc.identityhub.spi.ParticipantContextService; import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService; @@ -52,7 +52,7 @@ import static jakarta.json.Json.createObjectBuilder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY; import static org.eclipse.edc.identityhub.junit.testfixtures.VerifiableCredentialTestUtil.buildSignedJwt; import static org.eclipse.edc.identityhub.junit.testfixtures.VerifiableCredentialTestUtil.generateEcKey; import static org.eclipse.edc.identityhub.spi.resolution.QueryResult.success; diff --git a/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java b/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java index 402f6ee04..7610e2187 100644 --- a/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java +++ b/core/identity-hub-api/src/test/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.JsonArray; import jakarta.json.JsonObject; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.Constraints; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.Field; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.InputDescriptor; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.Constraints; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.Field; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.InputDescriptor; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.identityhub.api.validation.PresentationQueryValidator; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.spi.JsonLd; diff --git a/core/identity-hub-credentials/build.gradle.kts b/core/identity-hub-credentials/build.gradle.kts index 764ea489c..476ccac1b 100644 --- a/core/identity-hub-credentials/build.gradle.kts +++ b/core/identity-hub-credentials/build.gradle.kts @@ -6,6 +6,7 @@ dependencies { api(project(":spi:identity-hub-spi")) api(project(":spi:identity-hub-store-spi")) implementation(libs.edc.spi.token) + implementation(libs.edc.spi.vc) implementation(libs.edc.core.token) // for Jwt generation service, token validation service and rule registry impl implementation(libs.edc.core.connector) // for the CriterionToPredicateConverterImpl implementation(libs.edc.common.crypto) // for the crypto converter diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java index 760958b3c..f2cdca226 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java @@ -15,8 +15,8 @@ package org.eclipse.edc.identityhub.core; import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; import org.eclipse.edc.identityhub.core.creators.JwtPresentationGenerator; import org.eclipse.edc.identityhub.core.creators.LdpPresentationGenerator; import org.eclipse.edc.identityhub.spi.KeyPairService; @@ -49,9 +49,9 @@ import java.net.URISyntaxException; import java.time.Clock; +import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.core.CoreServicesExtension.NAME; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.DID_CONTEXT_URL; -import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.JWS_2020_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.PRESENTATION_EXCHANGE_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.PRESENTATION_SUBMISSION_URL; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java index 3982214fa..f29e711aa 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java @@ -14,7 +14,7 @@ package org.eclipse.edc.identityhub.core; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; import org.eclipse.edc.identityhub.spi.ScopeToCriterionTransformer; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImpl.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImpl.java index 5599f0fc2..ff1a03689 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImpl.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImpl.java @@ -14,8 +14,8 @@ package org.eclipse.edc.identityhub.core; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.KeyPairService; import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry; import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImpl.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImpl.java index b88d5a524..faa3fd627 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImpl.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImpl.java @@ -15,10 +15,10 @@ package org.eclipse.edc.identityhub.core; import jakarta.json.JsonObject; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry; import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService; import org.eclipse.edc.spi.monitor.Monitor; @@ -33,8 +33,8 @@ import static com.nimbusds.jwt.JWTClaimNames.AUDIENCE; import static java.util.Optional.ofNullable; -import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.VERIFIABLE_PRESENTATION_TYPE; -import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat.JSON_LD; +import static org.eclipse.edc.iam.verifiablecredentials.spi.VcConstants.VERIFIABLE_PRESENTATION_TYPE; +import static org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat.JSON_LD; import static org.eclipse.edc.identityhub.core.creators.LdpPresentationGenerator.TYPE_ADDITIONAL_DATA; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.CONTROLLER_ADDITIONAL_DATA; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGenerator.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGenerator.java index 6eecea87a..4be51cc95 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGenerator.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGenerator.java @@ -14,7 +14,7 @@ package org.eclipse.edc.identityhub.core.creators; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator; import org.eclipse.edc.keys.spi.PrivateKeyResolver; import org.eclipse.edc.spi.EdcException; @@ -33,10 +33,10 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.CONTROLLER_ADDITIONAL_DATA; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.VERIFIABLE_CREDENTIAL_PROPERTY; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.VP_TYPE_PROPERTY; -import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.PRESENTATION_EXCHANGE_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.VERIFIABLE_PRESENTATION_TYPE; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.W3C_CREDENTIALS_URL; diff --git a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGenerator.java b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGenerator.java index 608c78803..a69bfffdf 100644 --- a/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGenerator.java +++ b/core/identity-hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGenerator.java @@ -22,9 +22,9 @@ import jakarta.json.JsonArray; import jakarta.json.JsonArrayBuilder; import jakarta.json.JsonObject; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator; import org.eclipse.edc.keys.spi.PrivateKeyResolver; import org.eclipse.edc.security.signature.jws2020.JwkMethod; @@ -41,10 +41,10 @@ import java.util.Map; import java.util.UUID; +import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.CONTROLLER_ADDITIONAL_DATA; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.VERIFIABLE_CREDENTIAL_PROPERTY; import static org.eclipse.edc.identityhub.core.creators.PresentationGeneratorConstants.VP_TYPE_PROPERTY; -import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.PRESENTATION_EXCHANGE_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.W3C_CREDENTIALS_URL; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT; 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 7ed88f081..7f627ca2b 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,7 +14,7 @@ package org.eclipse.edc.identityhub.defaults; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.query.ReflectionPropertyLookup; import org.eclipse.edc.util.reflection.PathItem; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java index 9e4f652b0..fdb427ee6 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java @@ -14,14 +14,13 @@ package org.eclipse.edc.identityhub.core; - -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; -import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.identityhub.defaults.EdcScopeToCriterionTransformer; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identityhub.spi.resolution.QueryFailure; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImplTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImplTest.java index 52cfbdeb2..d14223542 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImplTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/PresentationCreatorRegistryImplTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.identityhub.core; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; import org.eclipse.edc.identityhub.spi.KeyPairService; import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator; import org.eclipse.edc.identityhub.spi.model.KeyPairResource; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImplTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImplTest.java index ae331c38f..159db04d1 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImplTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/VerifiablePresentationServiceImplTest.java @@ -17,12 +17,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.JsonObject; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; -import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames; @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; -import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat.JSON_LD; -import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat.JWT; +import static org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat.JSON_LD; +import static org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat.JWT; import static org.eclipse.edc.identityhub.core.creators.TestData.EMPTY_LDP_VP; import static org.eclipse.edc.identityhub.core.creators.TestData.JWT_VP; import static org.eclipse.edc.identityhub.core.creators.TestData.LDP_VP_WITH_PROOF; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGeneratorTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGeneratorTest.java index 4b6cac266..0202afc21 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGeneratorTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/JwtPresentationGeneratorTest.java @@ -19,8 +19,8 @@ import com.nimbusds.jose.jwk.Curve; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.keys.spi.PrivateKeyResolver; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.token.JwtGenerationService; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGeneratorTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGeneratorTest.java index 634730328..08aa8abfc 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGeneratorTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/LdpPresentationGeneratorTest.java @@ -16,9 +16,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jose.jwk.Curve; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.model.IdentityHubConstants; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; @@ -41,8 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.DID_CONTEXT_URL; -import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.JWS_2020_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.PRESENTATION_EXCHANGE_URL; import static org.eclipse.edc.identityhub.spi.model.IdentityHubConstants.W3C_CREDENTIALS_URL; diff --git a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/PresentationGeneratorTest.java b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/PresentationGeneratorTest.java index 159bb8607..5d4fad1a7 100644 --- a/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/PresentationGeneratorTest.java +++ b/core/identity-hub-credentials/src/test/java/org/eclipse/edc/identityhub/core/creators/PresentationGeneratorTest.java @@ -18,9 +18,9 @@ import com.nimbusds.jose.jwk.Curve; import com.nimbusds.jose.jwk.ECKey; import com.nimbusds.jose.jwk.gen.ECKeyGenerator; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; -import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/e2e-tests/api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiComponentTest.java b/e2e-tests/api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiComponentTest.java index a37cca1bf..93625ba4e 100644 --- a/e2e-tests/api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiComponentTest.java +++ b/e2e-tests/api-tests/src/test/java/org/eclipse/edc/identityhub/tests/PresentationApiComponentTest.java @@ -17,9 +17,9 @@ import com.nimbusds.jose.JOSEException; import jakarta.json.JsonObject; import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.InputDescriptorMapping; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationSubmission; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.credentialservice.InputDescriptorMapping; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.credentialservice.PresentationSubmission; import org.eclipse.edc.identityhub.junit.testfixtures.JwtCreationUtil; import org.eclipse.edc.identityhub.spi.ParticipantContextService; import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService; diff --git a/extensions/api/verifiable-credential-mgmt-api/src/test/java/org/eclipse/edc/identityhub/api/verifiablecredentials/v1/VerifiableCredentialsApiControllerTest.java b/extensions/api/verifiable-credential-mgmt-api/src/test/java/org/eclipse/edc/identityhub/api/verifiablecredentials/v1/VerifiableCredentialsApiControllerTest.java index 2c346b151..552e9867b 100644 --- a/extensions/api/verifiable-credential-mgmt-api/src/test/java/org/eclipse/edc/identityhub/api/verifiablecredentials/v1/VerifiableCredentialsApiControllerTest.java +++ b/extensions/api/verifiable-credential-mgmt-api/src/test/java/org/eclipse/edc/identityhub/api/verifiablecredentials/v1/VerifiableCredentialsApiControllerTest.java @@ -15,11 +15,11 @@ package org.eclipse.edc.identityhub.api.verifiablecredentials.v1; import io.restassured.specification.RequestSpecification; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; -import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.AuthorizationService; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identityhub.spi.store.CredentialStore; diff --git a/extensions/store/sql/identity-hub-credentials-store-sql/src/main/java/org/eclipse/edc/identityhub/store/sql/credentials/SqlCredentialStore.java b/extensions/store/sql/identity-hub-credentials-store-sql/src/main/java/org/eclipse/edc/identityhub/store/sql/credentials/SqlCredentialStore.java index 94b67c687..89d594034 100644 --- a/extensions/store/sql/identity-hub-credentials-store-sql/src/main/java/org/eclipse/edc/identityhub/store/sql/credentials/SqlCredentialStore.java +++ b/extensions/store/sql/identity-hub-credentials-store-sql/src/main/java/org/eclipse/edc/identityhub/store/sql/credentials/SqlCredentialStore.java @@ -15,9 +15,9 @@ package org.eclipse.edc.identityhub.store.sql.credentials; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.model.VcState; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource; import org.eclipse.edc.identityhub.spi.store.CredentialStore; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a2a0db974..7df963016 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,6 +37,7 @@ edc-spi-validator = { module = "org.eclipse.edc:validator-spi", version.ref = "e edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" } edc-spi-token = { module = "org.eclipse.edc:token-spi", version.ref = "edc" } edc-spi-identitytrust = { module = "org.eclipse.edc:identity-trust-spi", version.ref = "edc" } +edc-spi-vc = { module = "org.eclipse.edc:verifiable-credentials-spi", version.ref = "edc" } edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" } edc-core-sql = { module = "org.eclipse.edc:sql-core", version.ref = "edc" } edc-core-token = { module = "org.eclipse.edc:token-core", version.ref = "edc" } diff --git a/spi/identity-hub-spi/build.gradle.kts b/spi/identity-hub-spi/build.gradle.kts index 4fd5dcbce..a287cc903 100644 --- a/spi/identity-hub-spi/build.gradle.kts +++ b/spi/identity-hub-spi/build.gradle.kts @@ -23,6 +23,7 @@ val swagger: String by project dependencies { api(libs.edc.spi.identitytrust) + api(libs.edc.spi.vc) api(libs.edc.spi.web) implementation(libs.jackson.databind) implementation(libs.nimbus.jwt) diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationCreatorRegistry.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationCreatorRegistry.java index a9b9d3e6f..77cbbc72c 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationCreatorRegistry.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationCreatorRegistry.java @@ -15,8 +15,8 @@ package org.eclipse.edc.identityhub.spi.generator; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import java.util.List; import java.util.Map; diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationGenerator.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationGenerator.java index 423dd404f..869833efd 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationGenerator.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/PresentationGenerator.java @@ -15,7 +15,7 @@ package org.eclipse.edc.identityhub.spi.generator; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import java.util.List; import java.util.Map; diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/VerifiablePresentationService.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/VerifiablePresentationService.java index 35fb4a345..f93cbb401 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/VerifiablePresentationService.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/generator/VerifiablePresentationService.java @@ -14,9 +14,10 @@ package org.eclipse.edc.identityhub.spi.generator; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; -import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; + +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.spi.result.Result; import org.jetbrains.annotations.Nullable; diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/IdentityHubConstants.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/IdentityHubConstants.java index 4ff1cfbb3..78a48360c 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/IdentityHubConstants.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/IdentityHubConstants.java @@ -15,7 +15,7 @@ package org.eclipse.edc.identityhub.spi.model; -import org.eclipse.edc.iam.identitytrust.spi.VcConstants; +import org.eclipse.edc.iam.verifiablecredentials.spi.VcConstants; public interface IdentityHubConstants extends VcConstants { } diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/VerifiableCredentialResource.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/VerifiableCredentialResource.java index 547cc473d..4df825ef0 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/VerifiableCredentialResource.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/model/VerifiableCredentialResource.java @@ -15,7 +15,7 @@ package org.eclipse.edc.identityhub.spi.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.policy.model.Policy; /** diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/CredentialQueryResolver.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/CredentialQueryResolver.java index 0a3658e09..80e8f8015 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/CredentialQueryResolver.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/CredentialQueryResolver.java @@ -15,8 +15,8 @@ package org.eclipse.edc.identityhub.spi.resolution; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; -import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import java.util.List; diff --git a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/QueryResult.java b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/QueryResult.java index 75b7aac69..7db8c0379 100644 --- a/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/QueryResult.java +++ b/spi/identity-hub-spi/src/main/java/org/eclipse/edc/identityhub/spi/resolution/QueryResult.java @@ -14,7 +14,7 @@ package org.eclipse.edc.identityhub.spi.resolution; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.spi.result.AbstractResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/spi/identity-hub-store-spi/src/testFixtures/java/org/eclipse/edc/identityhub/store/test/CredentialStoreTestBase.java b/spi/identity-hub-store-spi/src/testFixtures/java/org/eclipse/edc/identityhub/store/test/CredentialStoreTestBase.java index d5644c54c..a9c922246 100644 --- a/spi/identity-hub-store-spi/src/testFixtures/java/org/eclipse/edc/identityhub/store/test/CredentialStoreTestBase.java +++ b/spi/identity-hub-store-spi/src/testFixtures/java/org/eclipse/edc/identityhub/store/test/CredentialStoreTestBase.java @@ -15,11 +15,11 @@ package org.eclipse.edc.identityhub.store.test; import org.assertj.core.api.Assertions; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; -import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; -import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; -import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredentialContainer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer; import org.eclipse.edc.identityhub.spi.model.ParticipantResource; import org.eclipse.edc.identityhub.spi.model.VcState; import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource;