refactor: split/restructure core and spi packages (#337)

* add core/lib/verifiable-presentation-lib * add core/lib/accesstoken-lib * add core/lib/credentials-query-lib * add core/lib/keypair-lib * restructure api extensions * split SPI * rename identity-hub-did-spi -> did-spi * moved did events, pruned did-spi dependencies * pruned more dependencies * pruned more dependencies * fx javadoc
eclipse-edc · May 3, 2024 · c121bea · c121bea
1 parent ef9577b
commit c121bea
Show file tree

Hide file tree

Showing 231 changed files with 995 additions and 763 deletions.
diff --git a/core/identity-hub-credentials/build.gradle.kts b/core/identity-hub-credentials/build.gradle.kts
@@ -5,24 +5,25 @@ plugins {
 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(project(":core:lib:verifiable-presentation-lib"))
+    implementation(project(":core:lib:accesstoken-lib"))
+    implementation(project(":core:lib:credential-query-lib"))
     implementation(libs.edc.spi.iatp) //SignatureSuiteRegistry
-    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
     implementation(libs.edc.ext.jsonld) // for the JSON-LD mapper
-    implementation(libs.edc.lib.jws2020)
-    implementation(libs.edc.vc.ldp)
     implementation(libs.edc.lib.util)
     implementation(libs.edc.lib.store)
-    implementation(libs.nimbus.jwt)
     implementation(libs.edc.lib.jsonld)
     implementation(libs.edc.lib.query)
+    implementation(libs.edc.lib.jws2020)
+    implementation(libs.edc.spi.token)
+    implementation(libs.edc.spi.identity.did)
+    implementation(libs.edc.vc.ldp)
+    implementation(libs.edc.core.token)
+
 
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.ext.jsonld)
-    testImplementation(testFixtures(project(":spi:identity-hub-spi")))
     testImplementation(testFixtures(project(":spi:identity-hub-store-spi")))
     testImplementation(testFixtures(libs.edc.vc.jwt)) // JWT generator
 }
diff --git a/...y-hub-credentials/src/main/java/org/eclipse/edc/identityhub/DefaultServicesExtension.java b/...y-hub-credentials/src/main/java/org/eclipse/edc/identityhub/DefaultServicesExtension.java
@@ -15,16 +15,16 @@
 package org.eclipse.edc.identityhub;
 
 import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
-import org.eclipse.edc.identityhub.defaults.EdcScopeToCriterionTransformer;
+import org.eclipse.edc.identityhub.accesstoken.rules.ClaimIsPresentRule;
 import org.eclipse.edc.identityhub.defaults.InMemoryCredentialStore;
 import org.eclipse.edc.identityhub.defaults.InMemoryKeyPairResourceStore;
 import org.eclipse.edc.identityhub.defaults.InMemoryParticipantContextStore;
 import org.eclipse.edc.identityhub.defaults.InMemorySignatureSuiteRegistry;
+import org.eclipse.edc.identityhub.query.EdcScopeToCriterionTransformer;
 import org.eclipse.edc.identityhub.spi.ScopeToCriterionTransformer;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
 import org.eclipse.edc.identityhub.spi.store.KeyPairResourceStore;
 import org.eclipse.edc.identityhub.spi.store.ParticipantContextStore;
-import org.eclipse.edc.identityhub.token.rules.ClaimIsPresentRule;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
@@ -33,15 +33,16 @@
 import org.eclipse.edc.token.spi.TokenValidationRulesRegistry;
 
 import static org.eclipse.edc.identityhub.DefaultServicesExtension.NAME;
+import static org.eclipse.edc.identityhub.accesstoken.verification.AccessTokenConstants.ACCESS_TOKEN_SCOPE_CLAIM;
+import static org.eclipse.edc.identityhub.accesstoken.verification.AccessTokenConstants.IATP_ACCESS_TOKEN_CONTEXT;
+import static org.eclipse.edc.identityhub.accesstoken.verification.AccessTokenConstants.IATP_SELF_ISSUED_TOKEN_CONTEXT;
+import static org.eclipse.edc.identityhub.accesstoken.verification.AccessTokenConstants.TOKEN_CLAIM;
 
 @Extension(NAME)
 public class DefaultServicesExtension implements ServiceExtension {
 
     public static final String NAME = "IdentityHub Default Services Extension";
-    public static final String IATP_SELF_ISSUED_TOKEN_CONTEXT = "iatp-si";
-    public static final String IATP_ACCESS_TOKEN_CONTEXT = "iatp-access-token";
-    public static final String TOKEN_CLAIM = "token";
-    public static final String ACCESS_TOKEN_SCOPE_CLAIM = "scope";
+
 
     @Inject
     private TokenValidationRulesRegistry registry;
@@ -59,7 +60,6 @@ public void initialize(ServiceExtensionContext context) {
 
         var scopeIsPresentRule = new ClaimIsPresentRule(ACCESS_TOKEN_SCOPE_CLAIM);
         registry.addRule(IATP_ACCESS_TOKEN_CONTEXT, scopeIsPresentRule);
-
     }
 
     @Provider(isDefault = true)

diff --git a/...hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java b/...hub-credentials/src/main/java/org/eclipse/edc/identityhub/core/CoreServicesExtension.java
@@ -17,17 +17,20 @@
 import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver;
 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;
+import org.eclipse.edc.identithub.verifiablepresentation.PresentationCreatorRegistryImpl;
+import org.eclipse.edc.identithub.verifiablepresentation.VerifiablePresentationServiceImpl;
+import org.eclipse.edc.identithub.verifiablepresentation.generators.JwtPresentationGenerator;
+import org.eclipse.edc.identithub.verifiablepresentation.generators.LdpPresentationGenerator;
+import org.eclipse.edc.identityhub.accesstoken.verification.AccessTokenVerifierImpl;
+import org.eclipse.edc.identityhub.query.CredentialQueryResolverImpl;
 import org.eclipse.edc.identityhub.spi.ScopeToCriterionTransformer;
-import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
-import org.eclipse.edc.identityhub.spi.generator.VerifiablePresentationService;
+import org.eclipse.edc.identityhub.spi.keypair.KeyPairService;
 import org.eclipse.edc.identityhub.spi.model.IdentityHubConstants;
-import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
+import org.eclipse.edc.identityhub.spi.verifiablecredentials.generator.PresentationCreatorRegistry;
+import org.eclipse.edc.identityhub.spi.verifiablecredentials.generator.VerifiablePresentationService;
+import org.eclipse.edc.identityhub.spi.verifiablecredentials.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
-import org.eclipse.edc.identityhub.token.verification.AccessTokenVerifierImpl;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.keys.spi.KeyParserRegistry;

diff --git a/...ub-credentials/src/main/java/org/eclipse/edc/identityhub/core/LocalPublicKeySupplier.java b/...ub-credentials/src/main/java/org/eclipse/edc/identityhub/core/LocalPublicKeySupplier.java
@@ -37,7 +37,7 @@
  * <p>
  * It is NOT intended for general use when resolving arbitrary public keys!
  */
-public class LocalPublicKeySupplier implements Supplier<PublicKey> {
+class LocalPublicKeySupplier implements Supplier<PublicKey> {
     public static final String NO_PUBLIC_KEY_CONFIGURED_ERROR = "No public key was configured! Please either configure '%s', '%s' or '%s'."
             .formatted(PUBLIC_KEY_VAULT_ALIAS_PROPERTY, PUBLIC_KEY_PATH_PROPERTY, PUBLIC_KEY_VAULT_ALIAS_PROPERTY);
     private String vaultAlias;

diff --git a/...dentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java b/...dentials/src/main/java/org/eclipse/edc/identityhub/defaults/CredentialResourceLookup.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.identityhub.defaults;
 
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredentialContainer;
-import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource;
+import org.eclipse.edc.identityhub.spi.verifiablecredentials.model.VerifiableCredentialResource;
 import org.eclipse.edc.query.ReflectionPropertyLookup;
 import org.eclipse.edc.util.reflection.PathItem;
 import org.eclipse.edc.util.reflection.ReflectionUtil;

diff --git a/...edentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java b/...edentials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryCredentialStore.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.identityhub.defaults;
 
-import org.eclipse.edc.identityhub.spi.model.VerifiableCredentialResource;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
+import org.eclipse.edc.identityhub.spi.verifiablecredentials.model.VerifiableCredentialResource;
 import org.eclipse.edc.spi.query.QueryResolver;
 import org.eclipse.edc.store.ReflectionBasedQueryResolver;
 

diff --git a/...ials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java b/...ials/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryKeyPairResourceStore.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.identityhub.defaults;
 
-import org.eclipse.edc.identityhub.spi.model.KeyPairResource;
+import org.eclipse.edc.identityhub.spi.keypair.model.KeyPairResource;
 import org.eclipse.edc.identityhub.spi.store.KeyPairResourceStore;
 import org.eclipse.edc.spi.query.QueryResolver;
 import org.eclipse.edc.store.ReflectionBasedQueryResolver;

diff --git a/...s/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java b/...s/src/main/java/org/eclipse/edc/identityhub/defaults/InMemoryParticipantContextStore.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.identityhub.defaults;
 
-import org.eclipse.edc.identityhub.spi.model.participant.ParticipantContext;
+import org.eclipse.edc.identityhub.spi.participantcontext.model.ParticipantContext;
 import org.eclipse.edc.identityhub.spi.store.ParticipantContextStore;
 import org.eclipse.edc.spi.query.QueryResolver;
 import org.eclipse.edc.store.ReflectionBasedQueryResolver;

diff --git a/...b-credentials/src/test/java/org/eclipse/edc/identityhub/DefaultServicesExtensionTest.java b/...b-credentials/src/test/java/org/eclipse/edc/identityhub/DefaultServicesExtensionTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.identityhub;
 
-import org.eclipse.edc.identityhub.token.rules.ClaimIsPresentRule;
+import org.eclipse.edc.identityhub.accesstoken.rules.ClaimIsPresentRule;
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.token.spi.TokenValidationRulesRegistry;

diff --git a/core/identity-hub-did/build.gradle.kts b/core/identity-hub-did/build.gradle.kts
@@ -4,8 +4,10 @@ plugins {
 
 dependencies {
     api(project(":spi:identity-hub-spi"))
-    api(project(":spi:identity-hub-did-spi"))
+    api(project(":spi:did-spi"))
 
+    implementation(project(":spi:keypair-spi"))
+    implementation(project(":spi:participant-context-spi"))
     implementation(libs.edc.core.connector) // for the reflection-based query resolver
     implementation(libs.edc.common.crypto)
     implementation(libs.edc.lib.store)
@@ -15,5 +17,5 @@ dependencies {
     testImplementation(libs.edc.ext.jsonld)
     testImplementation(libs.edc.lib.keys)
     testImplementation(testFixtures(project(":spi:identity-hub-spi")))
-    testImplementation(testFixtures(project(":spi:identity-hub-did-spi")))
+    testImplementation(testFixtures(project(":spi:did-spi")))
 }
diff --git a/...b-did/src/main/java/org/eclipse/edc/identityhub/did/DidDocumentPublisherRegistryImpl.java b/...b-did/src/main/java/org/eclipse/edc/identityhub/did/DidDocumentPublisherRegistryImpl.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.identityhub.did;
 
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisher;
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisherRegistry;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisher;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisherRegistry;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...dentity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/DidDocumentServiceImpl.java b/...dentity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/DidDocumentServiceImpl.java
@@ -17,17 +17,17 @@
 import org.eclipse.edc.iam.did.spi.document.DidDocument;
 import org.eclipse.edc.iam.did.spi.document.Service;
 import org.eclipse.edc.iam.did.spi.document.VerificationMethod;
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisherRegistry;
-import org.eclipse.edc.identithub.did.spi.DidDocumentService;
-import org.eclipse.edc.identithub.did.spi.model.DidResource;
-import org.eclipse.edc.identithub.did.spi.model.DidState;
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairAdded;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairRevoked;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextCreated;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextDeleted;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextUpdated;
-import org.eclipse.edc.identityhub.spi.model.ParticipantResource;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisherRegistry;
+import org.eclipse.edc.identithub.spi.did.DidDocumentService;
+import org.eclipse.edc.identithub.spi.did.model.DidResource;
+import org.eclipse.edc.identithub.spi.did.model.DidState;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairAdded;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairRevoked;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextCreated;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextDeleted;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextUpdated;
+import org.eclipse.edc.identityhub.spi.participantcontext.model.ParticipantResource;
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
 import org.eclipse.edc.security.token.jwt.CryptoConverter;
 import org.eclipse.edc.spi.event.Event;

diff --git a/.../identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/DidServicesExtension.java b/.../identity-hub-did/src/main/java/org/eclipse/edc/identityhub/did/DidServicesExtension.java
@@ -14,13 +14,13 @@
 
 package org.eclipse.edc.identityhub.did;
 
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisherRegistry;
-import org.eclipse.edc.identithub.did.spi.DidDocumentService;
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairAdded;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairRevoked;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextDeleted;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextUpdated;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisherRegistry;
+import org.eclipse.edc.identithub.spi.did.DidDocumentService;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairAdded;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairRevoked;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextDeleted;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextUpdated;
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;

diff --git a/...d/src/main/java/org/eclipse/edc/identityhub/did/defaults/DidDefaultServicesExtension.java b/...d/src/main/java/org/eclipse/edc/identityhub/did/defaults/DidDefaultServicesExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.identityhub.did.defaults;
 
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;

diff --git a/...-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java b/...-did/src/main/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStore.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.identityhub.did.defaults;
 
-import org.eclipse.edc.identithub.did.spi.model.DidResource;
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
+import org.eclipse.edc.identithub.spi.did.model.DidResource;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
 import org.eclipse.edc.spi.query.CriterionOperatorRegistry;
 import org.eclipse.edc.spi.query.QueryResolver;
 import org.eclipse.edc.spi.query.QuerySpec;

diff --git a/...d/src/test/java/org/eclipse/edc/identityhub/did/DidDocumentPublisherRegistryImplTest.java b/...d/src/test/java/org/eclipse/edc/identityhub/did/DidDocumentPublisherRegistryImplTest.java
@@ -14,12 +14,12 @@
 
 package org.eclipse.edc.identityhub.did;
 
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisher;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisher;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.eclipse.edc.identithub.did.spi.DidConstants.DID_WEB_METHOD;
+import static org.eclipse.edc.identithub.spi.did.DidConstants.DID_WEB_METHOD;
 import static org.mockito.Mockito.mock;
 
 class DidDocumentPublisherRegistryImplTest {

diff --git a/...ity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/DidDocumentServiceImplTest.java b/...ity-hub-did/src/test/java/org/eclipse/edc/identityhub/did/DidDocumentServiceImplTest.java
@@ -18,11 +18,11 @@
 import org.eclipse.edc.iam.did.spi.document.DidDocument;
 import org.eclipse.edc.iam.did.spi.document.Service;
 import org.eclipse.edc.iam.did.spi.document.VerificationMethod;
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisher;
-import org.eclipse.edc.identithub.did.spi.DidDocumentPublisherRegistry;
-import org.eclipse.edc.identithub.did.spi.model.DidResource;
-import org.eclipse.edc.identithub.did.spi.model.DidState;
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisher;
+import org.eclipse.edc.identithub.spi.did.DidDocumentPublisherRegistry;
+import org.eclipse.edc.identithub.spi.did.model.DidResource;
+import org.eclipse.edc.identithub.spi.did.model.DidState;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
 import org.eclipse.edc.keys.KeyParserRegistryImpl;
 import org.eclipse.edc.keys.keyparsers.JwkParser;
 import org.eclipse.edc.keys.keyparsers.PemParser;

diff --git a/.../src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java b/.../src/test/java/org/eclipse/edc/identityhub/did/defaults/InMemoryDidResourceStoreTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.identityhub.did.defaults;
 
-import org.eclipse.edc.identithub.did.spi.store.DidResourceStore;
+import org.eclipse.edc.identithub.spi.did.store.DidResourceStore;
 import org.eclipse.edc.identityhub.did.store.test.DidResourceStoreTestBase;
 import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
 

diff --git a/core/identity-hub-keypairs/build.gradle.kts b/core/identity-hub-keypairs/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     api(project(":spi:identity-hub-spi"))
     api(project(":spi:identity-hub-store-spi"))
     api(libs.edc.spi.transaction)
-    implementation(project(":extensions:common:security"))
+    implementation(project(":core:lib:keypair-lib"))
     implementation(libs.edc.common.crypto)
     implementation(libs.edc.core.connector)
     testImplementation(libs.edc.junit)

diff --git a/...ub-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairEventPublisher.java b/...ub-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairEventPublisher.java
@@ -14,12 +14,12 @@
 
 package org.eclipse.edc.identityhub.keypairs;
 
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairAdded;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairEvent;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairEventListener;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairRevoked;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairRotated;
-import org.eclipse.edc.identityhub.spi.model.KeyPairResource;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairAdded;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairEvent;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairEventListener;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairRevoked;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairRotated;
+import org.eclipse.edc.identityhub.spi.keypair.model.KeyPairResource;
 import org.eclipse.edc.spi.event.EventEnvelope;
 import org.eclipse.edc.spi.event.EventRouter;
 
@@ -45,24 +45,23 @@ public void added(KeyPairResource keyPair, String type) {
     }
 
     @Override
-    public void revoked(KeyPairResource keyPair) {
-        var event = KeyPairRevoked.Builder.newInstance()
+    public void rotated(KeyPairResource keyPair) {
+        var event = KeyPairRotated.Builder.newInstance()
                 .participantId(keyPair.getParticipantId())
                 .keyId(keyPair.getId())
                 .build();
         publish(event);
     }
 
     @Override
-    public void rotated(KeyPairResource keyPair) {
-        var event = KeyPairRotated.Builder.newInstance()
+    public void revoked(KeyPairResource keyPair) {
+        var event = KeyPairRevoked.Builder.newInstance()
                 .participantId(keyPair.getParticipantId())
                 .keyId(keyPair.getId())
                 .build();
         publish(event);
     }
 
-
     private void publish(KeyPairEvent event) {
         var envelope = EventEnvelope.Builder.newInstance()
                 .payload(event)

diff --git a/...ub-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairObservableImpl.java b/...ub-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairObservableImpl.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.identityhub.keypairs;
 
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairEventListener;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairObservable;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairEventListener;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairObservable;
 import org.eclipse.edc.spi.observe.ObservableImpl;
 
 public class KeyPairObservableImpl extends ObservableImpl<KeyPairEventListener> implements KeyPairObservable {

diff --git a/...-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairServiceExtension.java b/...-keypairs/src/main/java/org/eclipse/edc/identityhub/keypairs/KeyPairServiceExtension.java
@@ -14,9 +14,9 @@
 
 package org.eclipse.edc.identityhub.keypairs;
 
-import org.eclipse.edc.identityhub.spi.KeyPairService;
-import org.eclipse.edc.identityhub.spi.events.keypair.KeyPairObservable;
-import org.eclipse.edc.identityhub.spi.events.participant.ParticipantContextDeleted;
+import org.eclipse.edc.identityhub.spi.keypair.KeyPairService;
+import org.eclipse.edc.identityhub.spi.keypair.events.KeyPairObservable;
+import org.eclipse.edc.identityhub.spi.participantcontext.events.ParticipantContextDeleted;
 import org.eclipse.edc.identityhub.spi.store.KeyPairResourceStore;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;