Move key classes to dedicated SPI

eclipse-edc · Mar 22, 2024 · 2a98e38 · 2a98e38
1 parent cf249a2
commit 2a98e38
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 22 deletions.
diff --git a/...tor-core/src/main/java/org/eclipse/edc/connector/core/LocalPublicKeyDefaultExtension.java b/...tor-core/src/main/java/org/eclipse/edc/connector/core/LocalPublicKeyDefaultExtension.java
@@ -16,13 +16,13 @@
 
 import org.eclipse.edc.keys.LocalPublicKeyServiceImpl;
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
+import org.eclipse.edc.keys.spi.LocalPublicKeyService;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.EdcException;
-import org.eclipse.edc.spi.iam.LocalPublicKeyService;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtension;

diff --git a/core/common/lib/keys-lib/src/main/java/org/eclipse/edc/keys/AbstractPublicKeyResolver.java b/core/common/lib/keys-lib/src/main/java/org/eclipse/edc/keys/AbstractPublicKeyResolver.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.keys;
 
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.result.Result;
 
 import java.security.PublicKey;

diff --git a/core/common/lib/keys-lib/src/main/java/org/eclipse/edc/keys/LocalPublicKeyServiceImpl.java b/core/common/lib/keys-lib/src/main/java/org/eclipse/edc/keys/LocalPublicKeyServiceImpl.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.keys;
 
 import org.eclipse.edc.keys.spi.KeyParserRegistry;
-import org.eclipse.edc.spi.iam.LocalPublicKeyService;
+import org.eclipse.edc.keys.spi.LocalPublicKeyService;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.security.Vault;
 

diff --git a/core/common/token-core/build.gradle.kts b/core/common/token-core/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 dependencies {
+    api(project(":spi:common:keys-spi"))
     api(project(":spi:common:token-spi"))
     api(project(":spi:common:jwt-spi"))
 

diff --git a/core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java b/core/common/token-core/src/main/java/org/eclipse/edc/token/TokenValidationServiceImpl.java
@@ -16,9 +16,9 @@
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jwt.SignedJWT;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.security.token.jwt.CryptoConverter;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.result.AbstractResult;
 import org.eclipse.edc.spi.result.Result;
@@ -30,7 +30,6 @@
 
 public class TokenValidationServiceImpl implements TokenValidationService {
 
-
     public TokenValidationServiceImpl() {
     }
 

diff --git a/core/common/token-core/src/test/java/org/eclipse/edc/jwt/TokenValidationServiceImplTest.java b/core/common/token-core/src/test/java/org/eclipse/edc/jwt/TokenValidationServiceImplTest.java
@@ -23,7 +23,7 @@
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.TokenValidationRulesRegistryImpl;
 import org.eclipse.edc.token.TokenValidationServiceImpl;

diff --git a/...a/org/eclipse/edc/connector/dataplane/framework/DataPlaneDefaultIamServicesExtension.java b/...a/org/eclipse/edc/connector/dataplane/framework/DataPlaneDefaultIamServicesExtension.java
@@ -18,12 +18,12 @@
 import org.eclipse.edc.connector.dataplane.spi.iam.DataPlaneAccessControlService;
 import org.eclipse.edc.connector.dataplane.spi.iam.DataPlaneAccessTokenService;
 import org.eclipse.edc.connector.dataplane.spi.store.AccessTokenDataStore;
+import org.eclipse.edc.keys.spi.LocalPublicKeyService;
 import org.eclipse.edc.keys.spi.PrivateKeyResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.iam.LocalPublicKeyService;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;

diff --git a/...eclipse/edc/connector/dataplane/framework/iam/DefaultDataPlaneAccessTokenServiceImpl.java b/...eclipse/edc/connector/dataplane/framework/iam/DefaultDataPlaneAccessTokenServiceImpl.java
@@ -17,8 +17,8 @@
 import org.eclipse.edc.connector.dataplane.spi.AccessTokenData;
 import org.eclipse.edc.connector.dataplane.spi.iam.DataPlaneAccessTokenService;
 import org.eclipse.edc.connector.dataplane.spi.store.AccessTokenDataStore;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.monitor.Monitor;

diff --git a/...ials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java b/...ials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java
@@ -19,8 +19,8 @@
 import com.nimbusds.jwt.SignedJWT;
 import org.eclipse.edc.identitytrust.verification.CredentialVerifier;
 import org.eclipse.edc.identitytrust.verification.VerifierContext;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.rules.AudienceValidationRule;
 import org.eclipse.edc.token.spi.TokenValidationRule;

diff --git a/.../src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java b/.../src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java
@@ -24,7 +24,7 @@
 import org.eclipse.edc.identitytrust.verification.VerifierContext;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.annotations.ComponentTest;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.token.TokenValidationRulesRegistryImpl;
 import org.eclipse.edc.token.TokenValidationServiceImpl;
 import org.eclipse.edc.token.spi.TokenValidationRulesRegistry;

diff --git a/...a/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifierTest.java b/...a/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifierTest.java
@@ -28,10 +28,10 @@
 import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.security.signature.jws2020.JwsSignature2020Suite;
 import org.eclipse.edc.security.signature.jws2020.TestDocumentLoader;
 import org.eclipse.edc.security.signature.jws2020.TestFunctions;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.token.spi.TokenValidationService;
 import org.eclipse.edc.verifiablecredentials.jwt.JwtCreationUtils;

diff --git a/...2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolver.java b/...2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolver.java
@@ -18,9 +18,9 @@
 import okhttp3.Request;
 import org.eclipse.edc.iam.oauth2.jwt.JwkKey;
 import org.eclipse.edc.iam.oauth2.jwt.JwkKeys;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.http.EdcHttpClient;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.TypeManager;

diff --git a/...uth2/oauth2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImpl.java b/...uth2/oauth2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImpl.java
@@ -22,9 +22,9 @@
 import org.eclipse.edc.iam.oauth2.spi.client.Oauth2CredentialsRequest;
 import org.eclipse.edc.iam.oauth2.spi.client.PrivateKeyOauth2CredentialsRequest;
 import org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.iam.IdentityService;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.iam.VerificationContext;

diff --git a/.../oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImplTest.java b/.../oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImplTest.java
@@ -31,8 +31,8 @@
 import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client;
 import org.eclipse.edc.iam.oauth2.spi.client.Oauth2CredentialsRequest;
 import org.eclipse.edc.iam.oauth2.spi.client.PrivateKeyOauth2CredentialsRequest;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.iam.VerificationContext;

diff --git a/...ain/java/org/eclipse/edc/connector/transfer/dataplane/TransferDataPlaneCoreExtension.java b/...ain/java/org/eclipse/edc/connector/transfer/dataplane/TransferDataPlaneCoreExtension.java
@@ -27,11 +27,11 @@
 import org.eclipse.edc.connector.transfer.dataplane.validation.ExpirationDateValidationRule;
 import org.eclipse.edc.connector.transfer.spi.callback.ControlApiUrl;
 import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
+import org.eclipse.edc.keys.spi.LocalPublicKeyService;
 import org.eclipse.edc.keys.spi.PrivateKeyResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.iam.LocalPublicKeyService;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.types.TypeManager;

diff --git a/...dc/connector/transfer/dataplane/api/ConsumerPullTransferTokenValidationApiController.java b/...dc/connector/transfer/dataplane/api/ConsumerPullTransferTokenValidationApiController.java
@@ -21,8 +21,8 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.token.spi.TokenValidationService;

diff --git a/...onnector/transfer/dataplane/api/ConsumerPullTransferTokenValidationApiControllerTest.java b/...onnector/transfer/dataplane/api/ConsumerPullTransferTokenValidationApiControllerTest.java
@@ -15,8 +15,8 @@
 package org.eclipse.edc.connector.transfer.dataplane.api;
 
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.DataAddress;

diff --git a/spi/common/identity-did-spi/build.gradle.kts b/spi/common/identity-did-spi/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     api(project(":spi:common:core-spi"))
+    api(project(":spi:common:keys-spi"))
     // newer Nimbus versions create a version conflict with the MSAL library which uses this version as a transitive dependency
     api(libs.nimbus.jwt)
 }

diff --git a/...ty-did-spi/src/main/java/org/eclipse/edc/iam/did/spi/resolution/DidPublicKeyResolver.java b/...ty-did-spi/src/main/java/org/eclipse/edc/iam/did/spi/resolution/DidPublicKeyResolver.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.iam.did.spi.resolution;
 
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 
 /**
  * Specialized version of {@link PublicKeyResolver} which can be injected in the runtime

diff --git a/...se/edc/spi/iam/LocalPublicKeyService.java → ...e/edc/keys/spi/LocalPublicKeyService.java b/...se/edc/spi/iam/LocalPublicKeyService.java → ...e/edc/keys/spi/LocalPublicKeyService.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.spi.iam;
+package org.eclipse.edc.keys.spi;
 
 import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
 
@@ -23,5 +23,5 @@
 @ExtensionPoint
 @FunctionalInterface
 public interface LocalPublicKeyService extends PublicKeyResolver {
-    
+
 }
diff --git a/...clipse/edc/spi/iam/PublicKeyResolver.java → ...lipse/edc/keys/spi/PublicKeyResolver.java b/...clipse/edc/spi/iam/PublicKeyResolver.java → ...lipse/edc/keys/spi/PublicKeyResolver.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.spi.iam;
+package org.eclipse.edc.keys.spi;
 
 import org.eclipse.edc.spi.result.Result;
 

diff --git a/spi/common/token-spi/build.gradle.kts b/spi/common/token-spi/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
 
 dependencies {
     api(project(":spi:common:core-spi"))
+    api(project(":spi:common:keys-spi"))
 }
 
 
diff --git a/spi/common/token-spi/src/main/java/org/eclipse/edc/token/spi/TokenValidationService.java b/spi/common/token-spi/src/main/java/org/eclipse/edc/token/spi/TokenValidationService.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.token.spi;
 
+import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.iam.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
      *
      */
-    package org.eclipse.edc.spi.iam;
+    package org.eclipse.edc.keys.spi;
     import org.eclipse.edc.spi.result.Result;
@@ Expand Down @@