diff --git a/data-protocols/dsp/dsp-api-configuration/build.gradle.kts b/data-protocols/dsp/dsp-api-configuration/build.gradle.kts index 3e6872cfbde..7cf2641d8e7 100644 --- a/data-protocols/dsp/dsp-api-configuration/build.gradle.kts +++ b/data-protocols/dsp/dsp-api-configuration/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":data-protocols:dsp:dsp-spi")) api(project(":data-protocols:dsp:dsp-http-spi")) - implementation(project(":extensions:common:lib:jersey-providers-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:control-plane:control-plane-transform")) diff --git a/data-protocols/dsp/dsp-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java b/data-protocols/dsp/dsp-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java index 01be31346f6..5de797c7c83 100644 --- a/data-protocols/dsp/dsp-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java +++ b/data-protocols/dsp/dsp-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java @@ -39,8 +39,8 @@ import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToCriterionTransformer; import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToQuerySpecTransformer; import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebServer; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer; diff --git a/data-protocols/dsp/dsp-api-configuration/src/test/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java b/data-protocols/dsp/dsp-api-configuration/src/test/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java index 601ba9409aa..53be44893c5 100644 --- a/data-protocols/dsp/dsp-api-configuration/src/test/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java +++ b/data-protocols/dsp/dsp-api-configuration/src/test/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java @@ -20,8 +20,8 @@ import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.spi.types.TypeManager; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebServer; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration; @@ -108,5 +108,5 @@ void initialize_shouldRegisterWebServiceProviders(DspApiConfigurationExtension e verify(webService).registerResource(eq(CONTEXT_ALIAS), isA(ObjectMapperProvider.class)); verify(webService).registerResource(eq(CONTEXT_ALIAS), isA(JerseyJsonLdInterceptor.class)); } - + } diff --git a/extensions/common/api/management-api-configuration/build.gradle.kts b/extensions/common/api/management-api-configuration/build.gradle.kts index ded2fc440b7..6cae385c0d6 100644 --- a/extensions/common/api/management-api-configuration/build.gradle.kts +++ b/extensions/common/api/management-api-configuration/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":spi:common:web-spi")) api(project(":spi:control-plane:contract-spi")) - implementation(project(":extensions:common:lib:jersey-providers-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) implementation(project(":extensions:common:api:api-core")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":core:control-plane:control-plane-transform")) diff --git a/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java b/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java index 6cdcf40deaf..9a0d6d4922f 100644 --- a/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java +++ b/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java @@ -38,8 +38,8 @@ import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToDataAddressTransformer; import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToQuerySpecTransformer; import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebServer; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer; diff --git a/extensions/common/api/management-api-configuration/src/test/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java b/extensions/common/api/management-api-configuration/src/test/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java index ef7523d4025..b846219f6cd 100644 --- a/extensions/common/api/management-api-configuration/src/test/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java +++ b/extensions/common/api/management-api-configuration/src/test/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java @@ -23,8 +23,8 @@ import org.eclipse.edc.spi.system.configuration.Config; import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration; import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer; diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java index 71b44fa8e3a..852d67118d6 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jwt.SignedJWT; -import org.eclipse.edc.identitytrust.verification.CredentialVerifier; -import org.eclipse.edc.identitytrust.verification.VerifierContext; +import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier; +import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext; import org.eclipse.edc.keys.spi.PublicKeyResolver; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.result.Result; diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java index bc779bfb752..7138a9f38f2 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java @@ -23,7 +23,7 @@ import java.util.Map; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; /** * Verifies that the "token" claim is present (= non-empty) diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java b/extensions/common/crypto/jwt-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java index f22201ebdfe..c5d7a683a65 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java @@ -21,7 +21,7 @@ import com.nimbusds.jose.jwk.Curve; import com.nimbusds.jose.jwk.ECKey; import com.nimbusds.jose.jwk.gen.ECKeyGenerator; -import org.eclipse.edc.identitytrust.verification.VerifierContext; +import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.junit.annotations.ComponentTest; import org.eclipse.edc.keys.spi.PublicKeyResolver; @@ -38,7 +38,6 @@ import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.spi.result.Result.success; -import static org.eclipse.edc.verifiablecredentials.TestFunctions.createPublicKey; import static org.eclipse.edc.verifiablecredentials.jwt.JwtPresentationVerifier.JWT_VP_TOKEN_CONTEXT; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_DID; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_KEY_ID; @@ -48,6 +47,7 @@ import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VC_CONTENT_DEGREE_EXAMPLE; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VP_CONTENT_TEMPLATE; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VP_HOLDER_ID; +import static org.eclipse.edc.verifiablecredentials.jwt.TestFunctions.createPublicKey; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/TestFunctions.java b/extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/jwt/TestFunctions.java similarity index 95% rename from extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/TestFunctions.java rename to extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/jwt/TestFunctions.java index 8acb2e16e35..07dccd72c2d 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/TestFunctions.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/jwt/TestFunctions.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.verifiablecredentials; +package org.eclipse.edc.verifiablecredentials.jwt; import com.nimbusds.jose.jwk.ECKey; import com.nimbusds.jose.jwk.KeyConverter; diff --git a/extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts b/extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts index c002c0c6a1b..855ae4f00aa 100644 --- a/extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts +++ b/extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts @@ -29,14 +29,14 @@ dependencies { } testImplementation(testFixtures(project(":core:common:junit"))) - testImplementation(project(":extensions:common:crypto:jws2020")) + testImplementation(project(":extensions:common:crypto:lib:jws2020-lib")) testImplementation(project(":core:common:lib:json-ld-lib")) // deps for test fixtures testFixturesImplementation(project(":spi:common:json-ld-spi")) testFixturesImplementation(project(":core:common:lib:json-ld-lib")) testFixturesApi(libs.nimbus.jwt) - testFixturesApi(testFixtures(project(":extensions:common:crypto:jws2020"))) + testFixturesApi(testFixtures(project(":extensions:common:crypto:lib:jws2020-lib"))) } diff --git a/extensions/common/crypto/ldp-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java b/extensions/common/crypto/ldp-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java index b050e3c4072..09e9d81cb4e 100644 --- a/extensions/common/crypto/ldp-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java +++ b/extensions/common/crypto/ldp-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java @@ -39,9 +39,9 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.identitytrust.verification.CredentialVerifier; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; -import org.eclipse.edc.identitytrust.verification.VerifierContext; +import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.spi.result.Result; diff --git a/extensions/common/crypto/ldp-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java b/extensions/common/crypto/ldp-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java index bf58557de3d..911f62036c7 100644 --- a/extensions/common/crypto/ldp-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java +++ b/extensions/common/crypto/ldp-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java @@ -26,15 +26,13 @@ import com.nimbusds.jose.jwk.ECKey; import com.nimbusds.jose.jwk.gen.ECKeyGenerator; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; -import org.eclipse.edc.identitytrust.verification.VerifierContext; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.security.signature.jws2020.JwkMethod; 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.verifiablecredentials.verfiablecredentials.LdpCreationUtils; -import org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -47,11 +45,11 @@ import static org.eclipse.edc.jsonld.util.JacksonJsonLd.createObjectMapper; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.MEMBERSHIP_CREDENTIAL_ISSUER; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.NAME_CREDENTIAL_ISSUER; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.VC_CONTENT_CERTIFICATE_EXAMPLE; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createMembershipCredential; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createNameCredential; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.MEMBERSHIP_CREDENTIAL_ISSUER; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.NAME_CREDENTIAL_ISSUER; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.VC_CONTENT_CERTIFICATE_EXAMPLE; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createMembershipCredential; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createNameCredential; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; diff --git a/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/LdpCreationUtils.java b/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpCreationUtils.java similarity index 97% rename from extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/LdpCreationUtils.java rename to extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpCreationUtils.java index 14959dc2a61..de45d60b00d 100644 --- a/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/LdpCreationUtils.java +++ b/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpCreationUtils.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.verifiablecredentials.verfiablecredentials; +package org.eclipse.edc.verifiablecredentials.linkeddata; import com.apicatalog.jsonld.loader.DocumentLoader; import com.apicatalog.ld.DocumentError; diff --git a/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/TestData.java b/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/TestData.java similarity index 98% rename from extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/TestData.java rename to extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/TestData.java index 746fca78a50..63564e5b847 100644 --- a/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/TestData.java +++ b/extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/TestData.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.verifiablecredentials.verfiablecredentials; +package org.eclipse.edc.verifiablecredentials.linkeddata; import jakarta.json.Json; import jakarta.json.JsonObject; diff --git a/extensions/common/crypto/jws2020/README.md b/extensions/common/crypto/lib/jws2020-lib/README.md similarity index 100% rename from extensions/common/crypto/jws2020/README.md rename to extensions/common/crypto/lib/jws2020-lib/README.md diff --git a/extensions/common/crypto/jws2020/build.gradle.kts b/extensions/common/crypto/lib/jws2020-lib/build.gradle.kts similarity index 100% rename from extensions/common/crypto/jws2020/build.gradle.kts rename to extensions/common/crypto/lib/jws2020-lib/build.gradle.kts diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompatibility.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompatibility.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompatibility.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompatibility.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java diff --git a/extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java b/extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java similarity index 100% rename from extensions/common/crypto/jws2020/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java rename to extensions/common/crypto/lib/jws2020-lib/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java diff --git a/extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java b/extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java similarity index 100% rename from extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java rename to extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java diff --git a/extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java b/extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java similarity index 100% rename from extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java rename to extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java diff --git a/extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java b/extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java similarity index 100% rename from extensions/common/crypto/jws2020/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java rename to extensions/common/crypto/lib/jws2020-lib/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0001_vc.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0001_vc.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0001_vc.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0001_vc.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0003_vc_embedded.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0003_vc_embedded.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0003_vc_embedded.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0003_vc_embedded.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0004_vc_did_key.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0004_vc_did_key.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0004_vc_did_key.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0004_vc_did_key.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/linkedCredentialData.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/linkedCredentialData.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/linkedCredentialData.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/linkedCredentialData.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/private-key.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/private-key.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/issuing/private-key.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/issuing/private-key.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0001_vc.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0001_vc.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0001_vc.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0001_vc.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0002_vc_forged.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0002_vc_forged.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0002_vc_forged.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0002_vc_forged.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0003_vc_embedded.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0003_vc_embedded.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0003_vc_embedded.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0003_vc_embedded.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0006_vc_did_key.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0006_vc_did_key.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0006_vc_did_key.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0006_vc_did_key.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0007_vp_compacted.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0007_vp_compacted.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0007_vp_compacted.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0007_vp_compacted.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/linkedCredentialData.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/linkedCredentialData.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/linkedCredentialData.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/linkedCredentialData.json diff --git a/extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/verification-method.json b/extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/verification-method.json similarity index 100% rename from extensions/common/crypto/jws2020/src/test/resources/jws2020/verifying/verification-method.json rename to extensions/common/crypto/lib/jws2020-lib/src/test/resources/jws2020/verifying/verification-method.json diff --git a/extensions/common/crypto/jws2020/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestDocumentLoader.java b/extensions/common/crypto/lib/jws2020-lib/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestDocumentLoader.java similarity index 100% rename from extensions/common/crypto/jws2020/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestDocumentLoader.java rename to extensions/common/crypto/lib/jws2020-lib/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestDocumentLoader.java diff --git a/extensions/common/crypto/jws2020/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java b/extensions/common/crypto/lib/jws2020-lib/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java similarity index 100% rename from extensions/common/crypto/jws2020/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java rename to extensions/common/crypto/lib/jws2020-lib/src/testFixtures/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java diff --git a/extensions/common/http/jersey-core/build.gradle.kts b/extensions/common/http/jersey-core/build.gradle.kts index 8d4b9227768..030d92fd04e 100644 --- a/extensions/common/http/jersey-core/build.gradle.kts +++ b/extensions/common/http/jersey-core/build.gradle.kts @@ -20,7 +20,7 @@ plugins { dependencies { api(project(":spi:common:web-spi")) - implementation(project(":extensions:common:lib:jersey-providers-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) implementation(libs.bundles.jersey.core) implementation(libs.jetty.jakarta.servlet.api) @@ -34,7 +34,7 @@ dependencies { testFixturesApi(project(":core:common:junit")) testFixturesApi(project(":extensions:common:http:jetty-core")) testFixturesApi(project(":extensions:common:json-ld")) - testFixturesImplementation(project(":extensions:common:lib:jersey-providers-lib")) + testFixturesImplementation(project(":extensions:common:http:lib:jersey-providers-lib")) testFixturesApi(libs.jakarta.rsApi) testFixturesApi(libs.jackson.datatype.jakarta.jsonp) testFixturesApi(libs.junit.jupiter.api) diff --git a/extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java b/extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java index d49928e14c3..8d847e75036 100644 --- a/extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java +++ b/extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java @@ -18,9 +18,9 @@ import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.types.TypeManager; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.jersey.mapper.EdcApiExceptionMapper; import org.eclipse.edc.web.jersey.mapper.UnexpectedExceptionMapper; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebServer; import org.eclipse.edc.web.spi.WebService; import org.glassfish.hk2.utilities.binding.AbstractBinder; diff --git a/extensions/common/http/jersey-core/src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java b/extensions/common/http/jersey-core/src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java index f92a045bd30..f753d91b57f 100644 --- a/extensions/common/http/jersey-core/src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java +++ b/extensions/common/http/jersey-core/src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java @@ -20,7 +20,7 @@ import org.eclipse.edc.spi.types.TypeManager; import org.eclipse.edc.web.jersey.JerseyConfiguration; import org.eclipse.edc.web.jersey.JerseyRestService; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.jetty.JettyConfiguration; import org.eclipse.edc.web.jetty.JettyService; import org.eclipse.edc.web.jetty.PortMapping; diff --git a/extensions/common/lib/jersey-providers-lib/build.gradle.kts b/extensions/common/http/lib/jersey-providers-lib/build.gradle.kts similarity index 100% rename from extensions/common/lib/jersey-providers-lib/build.gradle.kts rename to extensions/common/http/lib/jersey-providers-lib/build.gradle.kts diff --git a/extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptor.java b/extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptor.java similarity index 98% rename from extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptor.java rename to extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptor.java index a19a2c4a085..d0f47e0a40f 100644 --- a/extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptor.java +++ b/extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptor.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.web.jersey.jsonld; +package org.eclipse.edc.web.jersey.providers.jsonld; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.JsonArray; diff --git a/extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/ObjectMapperProvider.java b/extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/ObjectMapperProvider.java similarity index 94% rename from extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/ObjectMapperProvider.java rename to extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/ObjectMapperProvider.java index e955d578379..bcb06d22e63 100644 --- a/extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/ObjectMapperProvider.java +++ b/extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/ObjectMapperProvider.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.web.jersey.jsonld; +package org.eclipse.edc.web.jersey.providers.jsonld; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.ws.rs.ext.ContextResolver; @@ -22,13 +22,13 @@ * Jakarta JSON API is required to allow JsonObject as a controller parameter. */ public class ObjectMapperProvider implements ContextResolver { - + private final ObjectMapper objectMapper; - + public ObjectMapperProvider(ObjectMapper objectMapper) { this.objectMapper = objectMapper; } - + @Override public ObjectMapper getContext(Class type) { return objectMapper; diff --git a/extensions/common/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptorTest.java b/extensions/common/http/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptorTest.java similarity index 99% rename from extensions/common/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptorTest.java rename to extensions/common/http/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptorTest.java index 65de7291613..84b9997a35f 100644 --- a/extensions/common/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptorTest.java +++ b/extensions/common/http/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptorTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.web.jersey.jsonld; +package org.eclipse.edc.web.jersey.providers.jsonld; import jakarta.json.Json; import jakarta.json.JsonArray; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts index e63bdee2537..dcd203edb90 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":core:common:lib:util-lib")) implementation(project(":core:common:lib:crypto-common-lib")) implementation(project(":core:common:token-core")) - implementation(project(":extensions:common:crypto:jws2020")) + implementation(project(":extensions:common:crypto:lib:jws2020-lib")) implementation(project(":extensions:common:crypto:jwt-verifiable-credentials")) implementation(project(":extensions:common:crypto:ldp-verifiable-credentials")) implementation(project(":extensions:common:iam:identity-trust:identity-trust-service")) diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java index 87bc14bb5ca..2abcef3bbf7 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java @@ -18,13 +18,13 @@ import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultTrustedIssuerRegistry; import org.eclipse.edc.iam.identitytrust.core.defaults.InMemorySignatureSuiteRegistry; import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction; +import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; import org.eclipse.edc.iam.identitytrust.sts.embedded.EmbeddedSecureTokenService; -import org.eclipse.edc.identitytrust.ClaimTokenCreatorFunction; -import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension; -import org.eclipse.edc.identitytrust.SecureTokenService; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; import org.eclipse.edc.keys.spi.PrivateKeyResolver; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java index e1a83807e8a..bb1a174abed 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.core; import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorFunction; -import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java index a30c07c95dd..a478afab958 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java @@ -18,18 +18,18 @@ import org.eclipse.edc.http.spi.EdcHttpClient; import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver; import org.eclipse.edc.iam.did.spi.resolution.DidResolverRegistry; -import org.eclipse.edc.iam.identitytrust.DidCredentialServiceUrlResolver; -import org.eclipse.edc.iam.identitytrust.IdentityAndTrustService; import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultCredentialServiceClient; -import org.eclipse.edc.iam.identitytrust.verification.MultiFormatPresentationVerifier; -import org.eclipse.edc.identitytrust.ClaimTokenCreatorFunction; -import org.eclipse.edc.identitytrust.CredentialServiceClient; -import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension; -import org.eclipse.edc.identitytrust.SecureTokenService; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.validation.TokenValidationAction; -import org.eclipse.edc.identitytrust.verification.PresentationVerifier; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.identitytrust.service.DidCredentialServiceUrlResolver; +import org.eclipse.edc.iam.identitytrust.service.IdentityAndTrustService; +import org.eclipse.edc.iam.identitytrust.service.verification.MultiFormatPresentationVerifier; +import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction; +import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; +import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction; +import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java index c7bc9a4b09b..1ca0b4485a9 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java @@ -22,13 +22,13 @@ import okhttp3.Request; import okhttp3.RequestBody; import org.eclipse.edc.http.spi.EdcHttpClient; -import org.eclipse.edc.identitytrust.CredentialServiceClient; -import org.eclipse.edc.identitytrust.VcConstants; -import org.eclipse.edc.identitytrust.model.CredentialFormat; -import org.eclipse.edc.identitytrust.model.VerifiablePresentation; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQueryMessage; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage; +import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; +import org.eclipse.edc.iam.identitytrust.spi.VcConstants; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.spi.monitor.Monitor; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java index 0cd40d7f038..731611edbe0 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java @@ -14,9 +14,9 @@ package org.eclipse.edc.iam.identitytrust.core.defaults; -import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; import org.eclipse.edc.spi.iam.ClaimToken; import org.jetbrains.annotations.NotNull; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java index 2a01f9062db..3519553061b 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java @@ -14,8 +14,8 @@ package org.eclipse.edc.iam.identitytrust.core.defaults; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import java.util.Collection; import java.util.HashMap; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/InMemorySignatureSuiteRegistry.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/InMemorySignatureSuiteRegistry.java index ea6be77cf77..bc770ee0c01 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/InMemorySignatureSuiteRegistry.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/InMemorySignatureSuiteRegistry.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.core.defaults; import com.apicatalog.ld.signature.SignatureSuite; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; import java.util.Collection; import java.util.HashMap; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java index ab26abcb38f..f87f59531bc 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java @@ -14,8 +14,8 @@ package org.eclipse.edc.iam.identitytrust.core.scope; -import org.eclipse.edc.identitytrust.scope.ScopeExtractor; -import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractor; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.EdcException; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java index 85e688166d0..aa0ae65e4c3 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java @@ -14,8 +14,8 @@ package org.eclipse.edc.iam.identitytrust.core.scope; -import org.eclipse.edc.identitytrust.scope.ScopeExtractor; -import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractor; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.result.Result; @@ -25,7 +25,7 @@ import java.util.Set; public class IatpScopeExtractorRegistry implements ScopeExtractorRegistry { - + private final List extractors = new ArrayList<>(); @Override diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java index 957e5d6c708..6020134d68a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core.scope; -import org.eclipse.edc.identitytrust.scope.ScopeExtractor; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractor; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.AndConstraint; import org.eclipse.edc.policy.model.AtomicConstraint; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtensionTest.java index 56156bbb216..67bb3ce150a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtensionTest.java @@ -14,8 +14,8 @@ package org.eclipse.edc.iam.identitytrust.core; -import org.eclipse.edc.iam.identitytrust.IdentityAndTrustService; -import org.eclipse.edc.identitytrust.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.service.IdentityAndTrustService; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.spi.system.configuration.Config; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java index ec743b6baf6..ec837c65804 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java @@ -27,12 +27,12 @@ import okhttp3.ResponseBody; import okio.Buffer; import org.eclipse.edc.http.spi.EdcHttpClient; -import org.eclipse.edc.identitytrust.model.CredentialFormat; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.model.VerifiablePresentation; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage; +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.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.spi.result.Result; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java index e98a80a33d1..e8680414ee2 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension.CLAIMTOKEN_VC_KEY; -import static org.eclipse.edc.identitytrust.TestFunctions.createCredential; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredential; class DefaultIatpParticipantAgentServiceExtensionTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java index b8915f726aa..71f5f0cf21a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core.defaults; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java index b9c1b493ac7..eac644c6eb8 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core.scope; -import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.EdcException; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java index f96b762035b..9b03781f670 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core.scope; -import org.eclipse.edc.identitytrust.scope.ScopeExtractor; +import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractor; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.Constraint; import org.eclipse.edc.policy.model.Operator; diff --git a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java similarity index 89% rename from extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java rename to extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java index f7cde5522c2..6b140307d3b 100644 --- a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java @@ -12,11 +12,11 @@ * */ -package org.eclipse.edc.identitytrust.issuer.configuration; +package org.eclipse.edc.iam.identitytrust.issuer.configuration; import com.fasterxml.jackson.core.type.TypeReference; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.runtime.metamodel.annotation.Setting; @@ -28,7 +28,7 @@ import java.util.Map; -import static org.eclipse.edc.identitytrust.issuer.configuration.TrustedIssuerConfigurationExtension.NAME; +import static org.eclipse.edc.iam.identitytrust.issuer.configuration.TrustedIssuerConfigurationExtension.NAME; /** * This IATP extension makes it possible to configure a list of trusted issuers, that will be matched against the Verifiable Credential issuers. diff --git a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index 983933275eb..d6111aba44d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,4 +12,4 @@ # # -org.eclipse.edc.identitytrust.issuer.configuration.TrustedIssuerConfigurationExtension \ No newline at end of file +org.eclipse.edc.iam.identitytrust.issuer.configuration.TrustedIssuerConfigurationExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java similarity index 94% rename from extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java index fefdb31cb96..c80ed79b1de 100644 --- a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.identitytrust.issuer.configuration; +package org.eclipse.edc.iam.identitytrust.issuer.configuration; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.system.ServiceExtensionContext; @@ -61,7 +61,7 @@ void initialize(ServiceExtensionContext context, TrustedIssuerConfigurationExten void initialize_failure_WithNoIssuer(ServiceExtensionContext context, TrustedIssuerConfigurationExtension ext) { var cfg = ConfigFactory.fromMap(Map.of()); when(context.getConfig("edc.iam.trusted-issuer")).thenReturn(cfg); - + assertThatThrownBy(() -> ext.initialize(context)).isInstanceOf(EdcException.class); } diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/model/PresentationResponse.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/model/PresentationResponse.java deleted file mode 100644 index 155dc501ccc..00000000000 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/model/PresentationResponse.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation - * - */ - -package org.eclipse.edc.iam.identitytrust.model; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; -import org.jetbrains.annotations.NotNull; - -import java.util.Objects; - -@JsonDeserialize(builder = PresentationResponse.Builder.class) -public class PresentationResponse { - - private VerifiablePresentationContainer verifiablePresentation; - - @NotNull - public VerifiablePresentationContainer getVerifiablePresentation() { - return verifiablePresentation; - } - - - @JsonPOJOBuilder(withPrefix = "") - public static final class Builder { - private final PresentationResponse instance; - - private Builder() { - instance = new PresentationResponse(); - } - - @JsonCreator - public static Builder newInstance() { - return new Builder(); - } - - public Builder verifiablePresentation(VerifiablePresentationContainer verifiablePresentation) { - this.instance.verifiablePresentation = verifiablePresentation; - return this; - } - - public PresentationResponse build() { - Objects.requireNonNull(instance.verifiablePresentation); - return instance; - } - } -} - diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceUrlResolver.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/CredentialServiceUrlResolver.java similarity index 95% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceUrlResolver.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/CredentialServiceUrlResolver.java index 5230f3b599a..1d82ba2c37a 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceUrlResolver.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/CredentialServiceUrlResolver.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.service; import org.eclipse.edc.spi.result.Result; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolver.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java similarity index 95% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolver.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java index 24eecfc46c5..00b39e8c889 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolver.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java @@ -12,10 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust; +package org.eclipse.edc.iam.identitytrust.service; import org.eclipse.edc.iam.did.spi.resolution.DidResolverRegistry; -import org.eclipse.edc.identitytrust.CredentialServiceUrlResolver; import org.eclipse.edc.spi.result.Result; import static org.eclipse.edc.spi.result.Result.failure; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityAndTrustService.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustService.java similarity index 88% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityAndTrustService.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustService.java index ff208b7d46a..6e1e24c9f7a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityAndTrustService.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustService.java @@ -12,22 +12,21 @@ * */ -package org.eclipse.edc.iam.identitytrust; - -import org.eclipse.edc.iam.identitytrust.validation.rules.HasValidIssuer; -import org.eclipse.edc.iam.identitytrust.validation.rules.HasValidSubjectIds; -import org.eclipse.edc.iam.identitytrust.validation.rules.IsNotExpired; -import org.eclipse.edc.iam.identitytrust.validation.rules.IsRevoked; -import org.eclipse.edc.identitytrust.ClaimTokenCreatorFunction; -import org.eclipse.edc.identitytrust.CredentialServiceClient; -import org.eclipse.edc.identitytrust.CredentialServiceUrlResolver; -import org.eclipse.edc.identitytrust.SecureTokenService; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.validation.CredentialValidationRule; -import org.eclipse.edc.identitytrust.validation.TokenValidationAction; -import org.eclipse.edc.identitytrust.verification.PresentationVerifier; +package org.eclipse.edc.iam.identitytrust.service; + +import org.eclipse.edc.iam.identitytrust.service.validation.rules.HasValidIssuer; +import org.eclipse.edc.iam.identitytrust.service.validation.rules.HasValidSubjectIds; +import org.eclipse.edc.iam.identitytrust.service.validation.rules.IsNotExpired; +import org.eclipse.edc.iam.identitytrust.service.validation.rules.IsRevoked; +import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction; +import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +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.validation.CredentialValidationRule; +import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction; +import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.iam.IdentityService; import org.eclipse.edc.spi.iam.TokenParameters; @@ -48,7 +47,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.EXPIRATION_TIME; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUED_AT; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuer.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuer.java similarity index 87% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuer.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuer.java index d61862c6abb..7d11e66e8bb 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuer.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuer.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.validation.CredentialValidationRule; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule; import org.eclipse.edc.spi.result.Result; import java.util.Collection; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIds.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIds.java similarity index 86% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIds.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIds.java index cb837836e9e..2090f6085bb 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIds.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIds.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.validation.CredentialValidationRule; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule; import org.eclipse.edc.spi.result.Result; import static org.eclipse.edc.spi.result.Result.failure; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsNotExpired.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsNotExpired.java similarity index 81% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsNotExpired.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsNotExpired.java index 52fc80fd067..4b90f9811bc 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsNotExpired.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsNotExpired.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.validation.CredentialValidationRule; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule; import org.eclipse.edc.spi.result.Result; import java.time.Clock; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsRevoked.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsRevoked.java similarity index 82% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsRevoked.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsRevoked.java index 7dee35a71a2..cb62fc34c92 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/validation/rules/IsRevoked.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsRevoked.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.validation.CredentialValidationRule; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule; import org.eclipse.edc.spi.result.Result; import static org.eclipse.edc.spi.result.Result.success; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifier.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifier.java similarity index 74% rename from extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifier.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifier.java index 6471e5b33b6..6ec291041f5 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifier.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifier.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.iam.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.service.verification; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; -import org.eclipse.edc.identitytrust.verification.CredentialVerifier; -import org.eclipse.edc.identitytrust.verification.PresentationVerifier; -import org.eclipse.edc.identitytrust.verification.VerifierContext; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier; +import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier; +import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext; import org.eclipse.edc.spi.result.Result; import java.util.List; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolverTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolverTest.java similarity index 98% rename from extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolverTest.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolverTest.java index a3f10abd67c..c291e7d2aee 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/DidCredentialServiceUrlResolverTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolverTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust; +package org.eclipse.edc.iam.identitytrust.service; import org.eclipse.edc.iam.did.spi.document.DidDocument; import org.eclipse.edc.iam.did.spi.document.Service; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java index 1d1679397ab..fa25d779e89 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java @@ -17,18 +17,16 @@ import com.nimbusds.jwt.JWTClaimsSet; import org.assertj.core.api.Assertions; -import org.eclipse.edc.iam.identitytrust.IdentityAndTrustService; -import org.eclipse.edc.identitytrust.CredentialServiceClient; -import org.eclipse.edc.identitytrust.CredentialServiceUrlResolver; -import org.eclipse.edc.identitytrust.SecureTokenService; -import org.eclipse.edc.identitytrust.TrustedIssuerRegistry; -import org.eclipse.edc.identitytrust.model.CredentialFormat; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; -import org.eclipse.edc.identitytrust.validation.TokenValidationAction; -import org.eclipse.edc.identitytrust.verification.PresentationVerifier; +import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry; +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.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction; +import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.iam.TokenParameters; @@ -51,12 +49,12 @@ import java.util.Map; import java.util.Set; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; -import static org.eclipse.edc.identitytrust.TestFunctions.TRUSTED_ISSUER; -import static org.eclipse.edc.identitytrust.TestFunctions.createCredentialBuilder; -import static org.eclipse.edc.identitytrust.TestFunctions.createJwt; -import static org.eclipse.edc.identitytrust.TestFunctions.createPresentationBuilder; -import static org.eclipse.edc.identitytrust.TestFunctions.createPresentationContainer; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.TRUSTED_ISSUER; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createJwt; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createPresentationBuilder; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createPresentationContainer; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SCOPE; diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/SelfIssuedIdTokenValidatorTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/SelfIssuedIdTokenValidatorTest.java similarity index 98% rename from extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/SelfIssuedIdTokenValidatorTest.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/SelfIssuedIdTokenValidatorTest.java index 8d2a37c0f98..b8478e3a13a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/SelfIssuedIdTokenValidatorTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/SelfIssuedIdTokenValidatorTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation; +package org.eclipse.edc.iam.identitytrust.service.validation; class SelfIssuedIdTokenValidatorTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuerTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuerTest.java similarity index 91% rename from extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuerTest.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuerTest.java index 95da5f7a9e0..ac8cbb01e13 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidIssuerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuerTest.java @@ -12,16 +12,16 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; -import static org.eclipse.edc.identitytrust.TestFunctions.createCredentialBuilder; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; class HasValidIssuerTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIdsTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIdsTest.java similarity index 90% rename from extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIdsTest.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIdsTest.java index 532d8c7b5fa..52efe96e6bd 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/validation/rules/HasValidSubjectIdsTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIdsTest.java @@ -12,15 +12,15 @@ * */ -package org.eclipse.edc.iam.identitytrust.validation.rules; +package org.eclipse.edc.iam.identitytrust.service.validation.rules; -import org.eclipse.edc.identitytrust.model.CredentialSubject; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; import org.junit.jupiter.api.Test; import java.util.List; -import static org.eclipse.edc.identitytrust.TestFunctions.createCredentialBuilder; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; class HasValidSubjectIdsTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifierTest.java b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifierTest.java similarity index 96% rename from extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifierTest.java rename to extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifierTest.java index ffb41fd3914..bd948a1eb7c 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/verification/MultiFormatPresentationVerifierTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifierTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.service.verification; import com.apicatalog.jsonld.loader.SchemeRouter; import com.apicatalog.vc.integrity.DataIntegrityProofOptions; @@ -23,9 +23,9 @@ import com.nimbusds.jose.jwk.Curve; import com.nimbusds.jose.jwk.ECKey; import com.nimbusds.jose.jwk.gen.ECKeyGenerator; -import org.eclipse.edc.identitytrust.model.CredentialFormat; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; -import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.keys.spi.PublicKeyResolver; @@ -36,9 +36,9 @@ import org.eclipse.edc.token.spi.TokenValidationService; import org.eclipse.edc.verifiablecredentials.jwt.JwtCreationUtils; import org.eclipse.edc.verifiablecredentials.jwt.JwtPresentationVerifier; +import org.eclipse.edc.verifiablecredentials.linkeddata.LdpCreationUtils; import org.eclipse.edc.verifiablecredentials.linkeddata.LdpVerifier; -import org.eclipse.edc.verifiablecredentials.verfiablecredentials.LdpCreationUtils; -import org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData; +import org.eclipse.edc.verifiablecredentials.linkeddata.TestData; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -53,17 +53,17 @@ import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.spi.result.Result.success; -import static org.eclipse.edc.verifiablecredentials.TestFunctions.createPublicKey; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_DID; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_KEY_ID; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.MY_OWN_DID; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.PRESENTER_KEY_ID; import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VP_HOLDER_ID; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.MEMBERSHIP_CREDENTIAL_ISSUER; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.NAME_CREDENTIAL_ISSUER; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.VP_CONTENT_TEMPLATE; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createMembershipCredential; -import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createNameCredential; +import static org.eclipse.edc.verifiablecredentials.jwt.TestFunctions.createPublicKey; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.MEMBERSHIP_CREDENTIAL_ISSUER; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.NAME_CREDENTIAL_ISSUER; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.VP_CONTENT_TEMPLATE; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createMembershipCredential; +import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createNameCredential; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyString; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts index acb38c602f4..1985d621759 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts @@ -20,9 +20,9 @@ plugins { dependencies { api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded")) api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core")) - api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote")) - api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote-core")) + api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote-client")) api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api")) api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-client-configuration")) + api(project(":extensions:common:iam:identity-trust:identity-trust-sts:lib:identity-trust-sts-remote-lib")) } diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApi.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApi.java similarity index 84% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApi.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApi.java index ffcfdb6418d..9422a4fe23a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApi.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApi.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts; +package org.eclipse.edc.api.iam.identitytrust.sts; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.Operation; @@ -22,9 +22,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.ws.rs.BeanParam; -import org.eclipse.edc.connector.api.sts.model.StsTokenErrorResponse; -import org.eclipse.edc.connector.api.sts.model.StsTokenRequest; -import org.eclipse.edc.connector.api.sts.model.StsTokenResponse; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenErrorResponse; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenRequest; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenResponse; @OpenAPIDefinition @Tag(name = "Secure Token Service Api") @@ -39,5 +39,5 @@ public interface SecureTokenServiceApi { content = @Content(array = @ArraySchema(schema = @Schema(implementation = StsTokenErrorResponse.class)))) }) StsTokenResponse token(@BeanParam StsTokenRequest request); - + } diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtension.java similarity index 74% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtension.java index 0aaa6518bf4..b30f357f98e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtension.java @@ -12,14 +12,14 @@ * */ -package org.eclipse.edc.connector.api.sts; - -import org.eclipse.edc.connector.api.sts.configuration.StsApiConfiguration; -import org.eclipse.edc.connector.api.sts.controller.SecureTokenServiceApiController; -import org.eclipse.edc.connector.api.sts.exception.StsTokenExceptionMapper; -import org.eclipse.edc.connector.api.sts.validation.StsTokenRequestValidator; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientService; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; +package org.eclipse.edc.api.iam.identitytrust.sts; + +import org.eclipse.edc.api.iam.identitytrust.sts.configuration.StsApiConfiguration; +import org.eclipse.edc.api.iam.identitytrust.sts.controller.SecureTokenServiceApiController; +import org.eclipse.edc.api.iam.identitytrust.sts.exception.StsTokenExceptionMapper; +import org.eclipse.edc.api.iam.identitytrust.sts.validation.StsTokenRequestValidator; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.spi.monitor.Monitor; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java similarity index 94% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java index f97bbef57c9..8f592ba97be 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.api.sts; +package org.eclipse.edc.api.iam.identitytrust.sts; -import org.eclipse.edc.connector.api.sts.configuration.StsApiConfiguration; +import org.eclipse.edc.api.iam.identitytrust.sts.configuration.StsApiConfiguration; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.runtime.metamodel.annotation.Provides; @@ -33,7 +33,7 @@ public class StsApiConfigurationExtension implements ServiceExtension { private static final String WEB_SERVICE_NAME = "STS API"; private static final int DEFAULT_STS_API_PORT = 9292; private static final String DEFAULT_STS_API_CONTEXT_PATH = "/api/v1/sts"; - + public static final WebServiceSettings SETTINGS = WebServiceSettings.Builder.newInstance() .apiConfigKey("web.http." + STS_CONTEXT_ALIAS) .contextAlias(STS_CONTEXT_ALIAS) diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/configuration/StsApiConfiguration.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/configuration/StsApiConfiguration.java similarity index 93% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/configuration/StsApiConfiguration.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/configuration/StsApiConfiguration.java index 0d173c14646..abbb4acad1e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/configuration/StsApiConfiguration.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/configuration/StsApiConfiguration.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.configuration; +package org.eclipse.edc.api.iam.identitytrust.sts.configuration; import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/controller/SecureTokenServiceApiController.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureTokenServiceApiController.java similarity index 73% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/controller/SecureTokenServiceApiController.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureTokenServiceApiController.java index 95c1dd3e519..4343cd90e60 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/controller/SecureTokenServiceApiController.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureTokenServiceApiController.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.controller; +package org.eclipse.edc.api.iam.identitytrust.sts.controller; import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.Consumes; @@ -20,18 +20,16 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import org.eclipse.edc.connector.api.sts.SecureTokenServiceApi; -import org.eclipse.edc.connector.api.sts.model.StsTokenRequest; -import org.eclipse.edc.connector.api.sts.model.StsTokenResponse; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClientTokenAdditionalParams; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientService; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; +import org.eclipse.edc.api.iam.identitytrust.sts.SecureTokenServiceApi; +import org.eclipse.edc.api.iam.identitytrust.sts.exception.StsTokenException; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenRequest; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenResponse; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClientTokenAdditionalParams; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.connector.api.sts.exception.StsTokenException.tokenException; -import static org.eclipse.edc.connector.api.sts.exception.StsTokenException.validationException; - @Path("/") public class SecureTokenServiceApiController implements SecureTokenServiceApi { @@ -53,12 +51,12 @@ public SecureTokenServiceApiController(StsClientService clientService, StsClient @POST @Override public StsTokenResponse token(@BeanParam StsTokenRequest request) { - tokenRequestValidator.validate(request).orElseThrow(validationException(request.getClientId())); + tokenRequestValidator.validate(request).orElseThrow(StsTokenException.validationException(request.getClientId())); return clientService.findByClientId(request.getClientId()) .compose(client -> clientService.authenticate(client, request.getClientSecret())) .compose(client -> tokenService.tokenFor(client, additionalParams(request))) .map(this::mapToken) - .orElseThrow(tokenException(request.getClientId())); + .orElseThrow(StsTokenException.tokenException(request.getClientId())); } diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenException.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenException.java similarity index 93% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenException.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenException.java index c90b059471f..18a995b26f5 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenException.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenException.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.api.sts.exception; +package org.eclipse.edc.api.iam.identitytrust.sts.exception; -import org.eclipse.edc.connector.api.sts.model.StsTokenErrorResponse; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenErrorResponse; import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.spi.result.ServiceFailure; import org.eclipse.edc.validator.spi.ValidationFailure; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenExceptionMapper.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenExceptionMapper.java similarity index 95% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenExceptionMapper.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenExceptionMapper.java index 392cb55b7af..0e662802899 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/exception/StsTokenExceptionMapper.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/exception/StsTokenExceptionMapper.java @@ -13,11 +13,11 @@ * */ -package org.eclipse.edc.connector.api.sts.exception; +package org.eclipse.edc.api.iam.identitytrust.sts.exception; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; -import org.eclipse.edc.connector.api.sts.model.StsTokenErrorResponse; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenErrorResponse; import org.eclipse.edc.spi.result.ServiceFailure; import java.util.Map; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponse.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponse.java similarity index 93% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponse.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponse.java index 6caccf88f06..2dfab481b9b 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponse.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponse.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.model; +package org.eclipse.edc.api.iam.identitytrust.sts.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenRequest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenRequest.java similarity index 98% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenRequest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenRequest.java index ad939664719..dc8bd100a6f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenRequest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenRequest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.model; +package org.eclipse.edc.api.iam.identitytrust.sts.model; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterStyle; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponse.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponse.java similarity index 95% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponse.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponse.java index ef1bd48beb1..bbe7b4da4ef 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponse.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponse.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.model; +package org.eclipse.edc.api.iam.identitytrust.sts.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidator.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidator.java similarity index 93% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidator.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidator.java index a1b8181bf33..9c52dcd6e3e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidator.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidator.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.api.sts.validation; +package org.eclipse.edc.api.iam.identitytrust.sts.validation; -import org.eclipse.edc.connector.api.sts.model.StsTokenRequest; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenRequest; import org.eclipse.edc.validator.spi.ValidationResult; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index a940e2a95e6..6e149b6425d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,5 +12,5 @@ # # -org.eclipse.edc.connector.api.sts.StsApiConfigurationExtension -org.eclipse.edc.connector.api.sts.SecureTokenServiceApiExtension \ No newline at end of file +org.eclipse.edc.api.iam.identitytrust.sts.StsApiConfigurationExtension +org.eclipse.edc.api.iam.identitytrust.sts.SecureTokenServiceApiExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtensionTest.java similarity index 85% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtensionTest.java index c490f5f1eab..1dfcb8bcf2f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/SecureTokenServiceApiExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/SecureTokenServiceApiExtensionTest.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.connector.api.sts; +package org.eclipse.edc.api.iam.identitytrust.sts; -import org.eclipse.edc.connector.api.sts.configuration.StsApiConfiguration; -import org.eclipse.edc.connector.api.sts.controller.SecureTokenServiceApiController; +import org.eclipse.edc.api.iam.identitytrust.sts.configuration.StsApiConfiguration; +import org.eclipse.edc.api.iam.identitytrust.sts.controller.SecureTokenServiceApiController; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.web.spi.WebService; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.connector.api.sts.StsApiConfigurationExtension.SETTINGS; +import static org.eclipse.edc.api.iam.identitytrust.sts.StsApiConfigurationExtension.SETTINGS; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; @@ -40,7 +40,7 @@ public class SecureTokenServiceApiExtensionTest { .path(SETTINGS.getDefaultPath()) .port(SETTINGS.getDefaultPort()) .build(); - + @BeforeEach void setUp(ServiceExtensionContext context) { context.registerService(WebService.class, webService); diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtensionTest.java similarity index 94% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtensionTest.java index ae149fa14e2..59c983bf11d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/StsApiConfigurationExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtensionTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts; +package org.eclipse.edc.api.iam.identitytrust.sts; import org.eclipse.edc.boot.system.DefaultServiceExtensionContext; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; @@ -30,7 +30,7 @@ import java.util.List; -import static org.eclipse.edc.connector.api.sts.StsApiConfigurationExtension.SETTINGS; +import static org.eclipse.edc.api.iam.identitytrust.sts.StsApiConfigurationExtension.SETTINGS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/controller/SecureServiceTokenApiControllerTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureServiceTokenApiControllerTest.java similarity index 91% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/controller/SecureServiceTokenApiControllerTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureServiceTokenApiControllerTest.java index 8ad2b2f1ae3..0a0d5aee47e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/controller/SecureServiceTokenApiControllerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/controller/SecureServiceTokenApiControllerTest.java @@ -12,14 +12,14 @@ * */ -package org.eclipse.edc.connector.api.sts.controller; +package org.eclipse.edc.api.iam.identitytrust.sts.controller; import io.restassured.specification.RequestSpecification; -import org.eclipse.edc.connector.api.sts.exception.StsTokenExceptionMapper; -import org.eclipse.edc.connector.api.sts.model.StsTokenRequest; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientService; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; +import org.eclipse.edc.api.iam.identitytrust.sts.exception.StsTokenExceptionMapper; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenRequest; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; import org.eclipse.edc.junit.annotations.ApiTest; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.ServiceResult; @@ -30,7 +30,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.http.ContentType.JSON; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClient; +import static org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.TestFunctions.createClient; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponseTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponseTest.java similarity index 95% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponseTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponseTest.java index c62f9ff569c..8f556cdd0d0 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenErrorResponseTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenErrorResponseTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.model; +package org.eclipse.edc.api.iam.identitytrust.sts.model; import org.eclipse.edc.spi.types.TypeManager; import org.junit.jupiter.api.Test; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponseTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponseTest.java similarity index 96% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponseTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponseTest.java index 74062933378..f3b81e1c623 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/model/StsTokenResponseTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/model/StsTokenResponseTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.api.sts.model; +package org.eclipse.edc.api.iam.identitytrust.sts.model; import org.eclipse.edc.spi.types.TypeManager; import org.junit.jupiter.api.Test; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidatorTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidatorTest.java similarity index 95% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidatorTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidatorTest.java index 079701697a5..923fd236944 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/connector/api/sts/validation/StsTokenRequestValidatorTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/test/java/org/eclipse/edc/api/iam/identitytrust/sts/validation/StsTokenRequestValidatorTest.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.api.sts.validation; +package org.eclipse.edc.api.iam.identitytrust.sts.validation; -import org.eclipse.edc.connector.api.sts.model.StsTokenRequest; +import org.eclipse.edc.api.iam.identitytrust.sts.model.StsTokenRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtension.java similarity index 93% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtension.java index 660951158b0..967a549f788 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtension.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.connector.api.sts.client.configuration; +package org.eclipse.edc.iam.identitytrust.sts.client.configuration; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.spi.monitor.Monitor; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index 8518e20ba79..da8a46ce97f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,4 +12,4 @@ # # -org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension \ No newline at end of file +org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtensionTest.java similarity index 74% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtensionTest.java index 28a18093fc8..55fd2087724 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/connector/api/sts/client/configuration/StsClientConfigurationExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-client-configuration/src/test/java/org/eclipse/edc/iam/identitytrust/sts/client/configuration/StsClientConfigurationExtensionTest.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.connector.api.sts.client.configuration; +package org.eclipse.edc.iam.identitytrust.sts.client.configuration; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; @@ -28,13 +28,13 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CLIENT_DID; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CLIENT_ID; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CLIENT_NAME; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CLIENT_PRIVATE_KEY_ALIAS; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CLIENT_SECRET_ALIAS; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.CONFIG_PREFIX; -import static org.eclipse.edc.connector.api.sts.client.configuration.StsClientConfigurationExtension.ID; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CLIENT_DID; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CLIENT_ID; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CLIENT_NAME; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CLIENT_PRIVATE_KEY_ALIAS; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CLIENT_SECRET_ALIAS; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.CONFIG_PREFIX; +import static org.eclipse.edc.iam.identitytrust.sts.client.configuration.StsClientConfigurationExtension.ID; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts index 301e7634ed9..6746595d4ad 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded")) implementation(project(":core:common:token-core")) - testImplementation(project(":core:common:connector-core")) // TEMPORARY - REMOVE testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi"))) testImplementation(project(":core:common:lib:boot-lib")) testImplementation(project(":core:common:lib:keys-lib")) diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultServicesExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtension.java similarity index 84% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultServicesExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtension.java index 542ad7180e6..88dc54ad83d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultServicesExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtension.java @@ -12,13 +12,13 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core; +package org.eclipse.edc.iam.identitytrust.sts.defaults; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientServiceImpl; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientTokenGeneratorServiceImpl; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientService; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientTokenGeneratorServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.keys.spi.PrivateKeyResolver; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultStoresExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtension.java similarity index 82% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultStoresExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtension.java index 71b000b77a8..c19617b05eb 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/StsDefaultStoresExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtension.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core; +package org.eclipse.edc.iam.identitytrust.sts.defaults; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.store.InMemoryStsClientStore; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.defaults.store.InMemoryStsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Provider; import org.eclipse.edc.spi.system.ServiceExtension; @@ -29,7 +29,7 @@ public class StsDefaultStoresExtension implements ServiceExtension { public String name() { return NAME; } - + @Provider(isDefault = true) public StsClientStore clientStore() { return new InMemoryStsClientStore(); diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImpl.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImpl.java similarity index 87% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImpl.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImpl.java index 711ab2c201c..f685d3c492f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImpl.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImpl.java @@ -12,11 +12,11 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.service; +package org.eclipse.edc.iam.identitytrust.sts.defaults.service; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientService; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientService; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.spi.result.ServiceResult; import org.eclipse.edc.spi.security.Vault; import org.eclipse.edc.transaction.spi.TransactionContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImpl.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImpl.java similarity index 88% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImpl.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImpl.java index 0e7459a9be6..8f585580378 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImpl.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImpl.java @@ -12,13 +12,13 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.service; +package org.eclipse.edc.iam.identitytrust.sts.defaults.service; import org.eclipse.edc.iam.identitytrust.sts.embedded.EmbeddedSecureTokenService; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClientTokenAdditionalParams; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; -import org.eclipse.edc.iam.identitytrust.sts.service.StsTokenGenerationProvider; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClientTokenAdditionalParams; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsTokenGenerationProvider; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.ServiceResult; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.function.Function; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUER; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SUBJECT; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStore.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStore.java similarity index 88% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStore.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStore.java index 69e98042f1d..79387862e04 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStore.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStore.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.store; +package org.eclipse.edc.iam.identitytrust.sts.defaults.store; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.spi.result.StoreResult; import java.util.Map; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index e1626c2e042..4f086708394 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,5 +12,5 @@ # # -org.eclipse.edc.iam.identitytrust.sts.core.StsDefaultServicesExtension -org.eclipse.edc.iam.identitytrust.sts.core.StsDefaultStoresExtension \ No newline at end of file +org.eclipse.edc.iam.identitytrust.sts.defaults.StsDefaultServicesExtension +org.eclipse.edc.iam.identitytrust.sts.defaults.StsDefaultStoresExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsClientTokenIssuanceIntegrationTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsClientTokenIssuanceIntegrationTest.java similarity index 92% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsClientTokenIssuanceIntegrationTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsClientTokenIssuanceIntegrationTest.java index c6460c35498..76513774da8 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsClientTokenIssuanceIntegrationTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsClientTokenIssuanceIntegrationTest.java @@ -12,15 +12,15 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults; +package org.eclipse.edc.iam.identitytrust.sts.defaults; import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jwt.SignedJWT; import org.eclipse.edc.boot.vault.InMemoryVault; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientServiceImpl; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientTokenGeneratorServiceImpl; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.store.InMemoryStsClientStore; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClientTokenAdditionalParams; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientTokenGeneratorServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.defaults.store.InMemoryStsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClientTokenAdditionalParams; import org.eclipse.edc.junit.annotations.ComponentTest; import org.eclipse.edc.keys.KeyParserRegistryImpl; import org.eclipse.edc.keys.VaultPrivateKeyResolver; @@ -46,8 +46,8 @@ import static com.nimbusds.jwt.JWTClaimNames.JWT_ID; import static com.nimbusds.jwt.JWTClaimNames.SUBJECT; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClientBuilder; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.TestFunctions.createClientBuilder; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.CLIENT_ID; import static org.mockito.Mockito.mock; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultServicesExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtensionTest.java similarity index 77% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultServicesExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtensionTest.java index 6205c5b5a53..6cbfa7c36fc 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultServicesExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultServicesExtensionTest.java @@ -12,11 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults; +package org.eclipse.edc.iam.identitytrust.sts.defaults; -import org.eclipse.edc.iam.identitytrust.sts.core.StsDefaultServicesExtension; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientServiceImpl; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.service.StsClientTokenGeneratorServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientServiceImpl; +import org.eclipse.edc.iam.identitytrust.sts.defaults.service.StsClientTokenGeneratorServiceImpl; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.junit.jupiter.api.Test; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultStoresExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtensionTest.java similarity index 81% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultStoresExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtensionTest.java index 80d1843b977..eee883f8835 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/StsDefaultStoresExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/StsDefaultStoresExtensionTest.java @@ -12,10 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults; +package org.eclipse.edc.iam.identitytrust.sts.defaults; -import org.eclipse.edc.iam.identitytrust.sts.core.StsDefaultStoresExtension; -import org.eclipse.edc.iam.identitytrust.sts.core.defaults.store.InMemoryStsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.defaults.store.InMemoryStsClientStore; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.junit.jupiter.api.Test; @@ -25,7 +24,7 @@ @ExtendWith(DependencyInjectionExtension.class) public class StsDefaultStoresExtensionTest { - + @Test void initialize(StsDefaultStoresExtension extension, ServiceExtensionContext context) { extension.initialize(context); diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImplTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImplTest.java similarity index 91% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImplTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImplTest.java index 1efd7c43195..cbde0899eb4 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientServiceImplTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientServiceImplTest.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.service; +package org.eclipse.edc.iam.identitytrust.sts.defaults.service; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.spi.result.StoreResult; import org.eclipse.edc.spi.security.Vault; import org.eclipse.edc.transaction.spi.NoopTransactionContext; @@ -22,7 +22,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClient; +import static org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.TestFunctions.createClient; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImplTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImplTest.java similarity index 89% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImplTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImplTest.java index 2a4f717e410..b6e97b676dd 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/service/StsClientTokenGeneratorServiceImplTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/service/StsClientTokenGeneratorServiceImplTest.java @@ -12,11 +12,11 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.service; +package org.eclipse.edc.iam.identitytrust.sts.defaults.service; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClientTokenAdditionalParams; -import org.eclipse.edc.iam.identitytrust.sts.service.StsTokenGenerationProvider; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClientTokenAdditionalParams; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsTokenGenerationProvider; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.spi.result.ServiceFailure; @@ -28,7 +28,7 @@ import java.time.Clock; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClient; +import static org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.TestFunctions.createClient; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStoreTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStoreTest.java similarity index 78% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStoreTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStoreTest.java index abcecc4aada..e63b1e0e7ea 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/core/defaults/store/InMemoryStsClientStoreTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/defaults/store/InMemoryStsClientStoreTest.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.core.defaults.store; +package org.eclipse.edc.iam.identitytrust.sts.defaults.store; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; -import org.eclipse.edc.iam.identitytrust.sts.store.fixtures.StsClientStoreTestBase; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.StsClientStoreTestBase; import org.junit.jupiter.api.BeforeEach; public class InMemoryStsClientStoreTest extends StsClientStoreTestBase { diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/main/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenService.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/main/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenService.java index 56f92a9ed78..4af49ad7489 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/main/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenService.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/main/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenService.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.sts.embedded; -import org.eclipse.edc.identitytrust.SecureTokenService; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.token.spi.KeyIdDecorator; @@ -33,7 +33,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUER; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SCOPE; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/test/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenServiceIntegrationTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/test/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenServiceIntegrationTest.java index 66cebaac4f2..cd18011feab 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/test/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenServiceIntegrationTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/src/test/java/org/eclipse/edc/iam/identitytrust/sts/embedded/EmbeddedSecureTokenServiceIntegrationTest.java @@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.STRING; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SCOPE; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/build.gradle.kts similarity index 84% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/build.gradle.kts rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/build.gradle.kts index e66fdbf4bbe..6ac6cbf800e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/build.gradle.kts +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":spi:common:identity-trust-spi")) api(project(":spi:common:oauth2-spi")) api(project(":spi:common:jwt-spi")) - implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote")) + implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:lib:identity-trust-sts-remote-lib")) testImplementation(project(":core:common:junit")) } diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtension.java similarity index 97% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtension.java index f5aece59b9f..586ef6a2ea9 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtension.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.remote.core; +package org.eclipse.edc.iam.identitytrust.sts.remote.client; import org.eclipse.edc.iam.identitytrust.sts.remote.StsRemoteClientConfiguration; import org.eclipse.edc.runtime.metamodel.annotation.Extension; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtension.java similarity index 92% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtension.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtension.java index 223056741c9..d34cc4e225f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtension.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.remote.core; +package org.eclipse.edc.iam.identitytrust.sts.remote.client; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; import org.eclipse.edc.iam.identitytrust.sts.remote.RemoteSecureTokenService; import org.eclipse.edc.iam.identitytrust.sts.remote.StsRemoteClientConfiguration; import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client; -import org.eclipse.edc.identitytrust.SecureTokenService; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.runtime.metamodel.annotation.Provider; @@ -28,7 +28,7 @@ */ @Extension(StsRemoteClientExtension.NAME) public class StsRemoteClientExtension implements ServiceExtension { - + protected static final String NAME = "Sts remote client configuration extension"; @Inject diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension similarity index 72% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index 57ba67f05e5..816f20696f2 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,5 +12,5 @@ # # -org.eclipse.edc.iam.identitytrust.sts.remote.core.StsRemoteClientConfigurationExtension -org.eclipse.edc.iam.identitytrust.sts.remote.core.StsRemoteClientExtension \ No newline at end of file +org.eclipse.edc.iam.identitytrust.sts.remote.client.StsRemoteClientConfigurationExtension +org.eclipse.edc.iam.identitytrust.sts.remote.client.StsRemoteClientExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtensionTest.java similarity index 87% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtensionTest.java index 6822c5be49c..3a74cec83d7 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientConfigurationExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientConfigurationExtensionTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.remote.core; +package org.eclipse.edc.iam.identitytrust.sts.remote.client; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.security.Vault; @@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.eclipse.edc.iam.identitytrust.sts.remote.core.StsRemoteClientConfigurationExtension.CLIENT_ID; -import static org.eclipse.edc.iam.identitytrust.sts.remote.core.StsRemoteClientConfigurationExtension.CLIENT_SECRET_ALIAS; -import static org.eclipse.edc.iam.identitytrust.sts.remote.core.StsRemoteClientConfigurationExtension.TOKEN_URL; +import static org.eclipse.edc.iam.identitytrust.sts.remote.client.StsRemoteClientConfigurationExtension.CLIENT_ID; +import static org.eclipse.edc.iam.identitytrust.sts.remote.client.StsRemoteClientConfigurationExtension.CLIENT_SECRET_ALIAS; +import static org.eclipse.edc.iam.identitytrust.sts.remote.client.StsRemoteClientConfigurationExtension.TOKEN_URL; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtensionTest.java similarity index 96% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtensionTest.java index 5b4d3618611..9b99bb2b758 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-core/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/core/StsRemoteClientExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote-client/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/client/StsRemoteClientExtensionTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.remote.core; +package org.eclipse.edc.iam.identitytrust.sts.remote.client; import org.eclipse.edc.iam.identitytrust.sts.remote.RemoteSecureTokenService; import org.eclipse.edc.iam.identitytrust.sts.remote.StsRemoteClientConfiguration; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/build.gradle.kts similarity index 100% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/build.gradle.kts rename to extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/build.gradle.kts diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java similarity index 91% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java rename to extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java index e271c531ea3..5c48d8a7d50 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenService.java @@ -14,10 +14,10 @@ package org.eclipse.edc.iam.identitytrust.sts.remote; +import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; 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.SharedSecretOauth2CredentialsRequest; -import org.eclipse.edc.identitytrust.SecureTokenService; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.Result; import org.jetbrains.annotations.NotNull; @@ -26,8 +26,8 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.BEARER_ACCESS_SCOPE; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.BEARER_ACCESS_SCOPE; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; public class RemoteSecureTokenService implements SecureTokenService { diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/StsRemoteClientConfiguration.java b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/StsRemoteClientConfiguration.java similarity index 100% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/StsRemoteClientConfiguration.java rename to extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/main/java/org/eclipse/edc/iam/identitytrust/sts/remote/StsRemoteClientConfiguration.java diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java similarity index 96% rename from extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java rename to extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java index 3a35e33c863..28d1534928c 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-remote/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/lib/identity-trust-sts-remote-lib/src/test/java/org/eclipse/edc/iam/identitytrust/sts/remote/RemoteSecureTokenServiceTest.java @@ -25,10 +25,10 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.BEARER_ACCESS_SCOPE; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.iam.identitytrust.sts.remote.RemoteSecureTokenService.AUDIENCE_PARAM; import static org.eclipse.edc.iam.identitytrust.sts.remote.RemoteSecureTokenService.GRANT_TYPE; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.BEARER_ACCESS_SCOPE; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.mockito.ArgumentMatchers.any; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtension.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtension.java similarity index 96% rename from extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtension.java rename to extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtension.java index c93155209ed..e36103413a4 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtension.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust; +package org.eclipse.edc.iam.identitytrust.transform; import org.eclipse.edc.iam.identitytrust.transform.from.JsonObjectFromPresentationQueryTransformer; import org.eclipse.edc.iam.identitytrust.transform.from.JsonObjectFromPresentationResponseMessageTransformer; @@ -40,10 +40,10 @@ import java.net.URISyntaxException; import static java.lang.String.format; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; -@Extension(value = IdentityTrustTransformExtension.NAME, categories = {"iam", "transform", "jsonld"}) +@Extension(value = IdentityTrustTransformExtension.NAME, categories = { "iam", "transform", "jsonld" }) public class IdentityTrustTransformExtension implements ServiceExtension { public static final String NAME = "Identity And Trust Transform Extension"; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java index bc1d779b930..1953d0ca7d9 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.transform.from; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.jetbrains.annotations.NotNull; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java index 8e36a48ec63..a10d2b13b24 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java @@ -16,15 +16,15 @@ import jakarta.json.Json; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY; -import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; @@ -44,7 +44,7 @@ public JsonObjectFromPresentationResponseMessageTransformer() { .add(PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY, createJson(responseMessage)) .build(); } - + private JsonObject createJson(PresentationResponseMessage responseMessage) { var jo = Json.createObjectBuilder(); jo.add(JsonLdKeywords.VALUE, Json.createArrayBuilder(responseMessage.getPresentation()).build()); diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java index 50360037ee5..2f5abd823a6 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.transform.to; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.CredentialStatus; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.jetbrains.annotations.NotNull; @@ -23,7 +23,7 @@ import java.util.HashMap; -import static org.eclipse.edc.identitytrust.model.CredentialStatus.CREDENTIAL_STATUS_TYPE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus.CREDENTIAL_STATUS_TYPE_PROPERTY; public class JsonObjectToCredentialStatusTransformer extends AbstractJsonLdTransformer { public JsonObjectToCredentialStatusTransformer() { diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java index acee238cb64..a15240f1230 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.transform.to; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.CredentialSubject; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.jetbrains.annotations.NotNull; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java index 50b15af219d..4f7490798c2 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.transform.to; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryTransformer.java index 4a2d270e35e..f8e350db396 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryTransformer.java @@ -19,8 +19,8 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQueryMessage; -import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformer.java index 8a30162def8..ac3ff835b6e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformer.java @@ -21,8 +21,8 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationSubmission; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationSubmission; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformer.java index 855fb2a8449..2664855d122 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformer.java @@ -16,10 +16,10 @@ import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.identitytrust.model.CredentialStatus; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus; +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.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; @@ -29,17 +29,17 @@ import java.time.Instant; import java.util.Map; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.Builder; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_DESCRIPTION_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_EXPIRATIONDATE_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_ISSUANCEDATE_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_ISSUER_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_NAME_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_PROOF_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_STATUS_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_SUBJECT_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_VALIDFROM_PROPERTY; -import static org.eclipse.edc.identitytrust.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_VALIDUNTIL_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.Builder; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_DESCRIPTION_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_EXPIRATIONDATE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_ISSUANCEDATE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_ISSUER_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_NAME_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_PROOF_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_STATUS_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_SUBJECT_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_VALIDFROM_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential.VERIFIABLE_CREDENTIAL_VALIDUNTIL_PROPERTY; /** * Transforms a JSON-LD structure into a {@link VerifiableCredential}. diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformer.java index 9b86f493ee5..0beab880bc5 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformer.java @@ -17,8 +17,8 @@ import jakarta.json.JsonArray; import jakarta.json.JsonObject; import jakarta.json.JsonValue; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.model.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiableCredentialTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiableCredentialTransformer.java index 37f7a26239a..2f847579437 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiableCredentialTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiableCredentialTransformer.java @@ -15,10 +15,10 @@ package org.eclipse.edc.iam.identitytrust.transform.to; import com.nimbusds.jwt.SignedJWT; -import org.eclipse.edc.identitytrust.model.CredentialStatus; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus; +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.spi.monitor.Monitor; import org.eclipse.edc.transform.spi.TransformerContext; import org.jetbrains.annotations.NotNull; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformer.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformer.java index 34f205d7be8..3e4d30a9d2d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformer.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformer.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jwt.SignedJWT; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.model.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index 6f4a4247e63..e5795b306ef 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -1 +1 @@ -org.eclipse.edc.iam.identitytrust.IdentityTrustTransformExtension \ No newline at end of file +org.eclipse.edc.iam.identitytrust.transform.IdentityTrustTransformExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtensionTest.java similarity index 98% rename from extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtensionTest.java index 774b7b070a3..56791c6e315 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/IdentityTrustTransformExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtensionTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust; +package org.eclipse.edc.iam.identitytrust.transform; import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.edc.iam.identitytrust.transform.from.JsonObjectFromPresentationResponseMessageTransformer; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformerTest.java index 42955b7ca6e..881e88cef51 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformerTest.java @@ -15,7 +15,7 @@ package org.eclipse.edc.iam.identitytrust.transform.from; import jakarta.json.Json; -import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage; +import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -23,8 +23,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY; -import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY; +import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VALUE; import static org.mockito.Mockito.mock; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java index f8c56c93647..c20819dcd4d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL; import static org.mockito.Mockito.mock; public class PresentationResponseMessageSerdeTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformerTest.java index 72a8030a8d4..041837a1a05 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformerTest.java @@ -17,8 +17,8 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import jakarta.json.JsonValue; +import org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus; import org.eclipse.edc.iam.identitytrust.transform.TestObject; -import org.eclipse.edc.identitytrust.model.CredentialStatus; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.transform.spi.TransformerContext; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformerTest.java index cbf755553e4..0a3a5a85660 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformerTest.java @@ -26,8 +26,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject.CREDENTIAL_SUBJECT_ID_PROPERTY; import static org.eclipse.edc.iam.identitytrust.transform.TestData.TEST_NAMESPACE; -import static org.eclipse.edc.identitytrust.model.CredentialSubject.CREDENTIAL_SUBJECT_ID_PROPERTY; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VALUE; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java index 7cb7cf74da7..74dd79c799d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL; import static org.mockito.Mockito.mock; class JsonObjectToPresentationQueryMessageTransformerTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java index ad65474ced5..51e274f898a 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java @@ -32,7 +32,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL; import static org.mockito.Mockito.mock; class JsonObjectToPresentationResponseMessageTransformerTest { diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformerTest.java index 1802cec618d..aba23a46b17 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiableCredentialTransformerTest.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformerTest.java index 7fc38e5f155..c0676eb4516 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToVerifiablePresentationTransformerTest.java @@ -30,8 +30,8 @@ import java.net.URISyntaxException; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.VC_PREFIX; import static org.eclipse.edc.iam.identitytrust.transform.TestData.EXAMPLE_VP_JSONLD; -import static org.eclipse.edc.identitytrust.VcConstants.VC_PREFIX; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformerTest.java index 4dd1c1b72d9..180c121d59b 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JwtToVerifiablePresentationTransformerTest.java @@ -17,9 +17,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.JsonObject; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +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.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.junit.testfixtures.TestUtils; diff --git a/extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/Oauth2ClientExtension.java b/extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientExtension.java similarity index 93% rename from extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/Oauth2ClientExtension.java rename to extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientExtension.java index 68b178439f2..794cf2b87af 100644 --- a/extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/Oauth2ClientExtension.java +++ b/extensions/common/iam/oauth2/oauth2-client/src/main/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientExtension.java @@ -12,10 +12,9 @@ * */ -package org.eclipse.edc.iam.oauth2; +package org.eclipse.edc.iam.oauth2.client; import org.eclipse.edc.http.spi.EdcHttpClient; -import org.eclipse.edc.iam.oauth2.client.Oauth2ClientImpl; import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; diff --git a/extensions/common/iam/oauth2/oauth2-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/oauth2/oauth2-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index 6b741a431ba..21332f6fc87 100644 --- a/extensions/common/iam/oauth2/oauth2-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/oauth2/oauth2-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,4 +12,4 @@ # # -org.eclipse.edc.iam.oauth2.Oauth2ClientExtension +org.eclipse.edc.iam.oauth2.client.Oauth2ClientExtension diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndex.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndex.java similarity index 97% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndex.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndex.java index 8cf18acd819..bca02ddb2c1 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndex.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndex.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.connector.store.sql.edr; +package org.eclipse.edc.edr.store.index; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.edc.connector.store.sql.edr.schema.EndpointDataReferenceEntryStatements; import org.eclipse.edc.edr.spi.store.EndpointDataReferenceEntryIndex; import org.eclipse.edc.edr.spi.types.EndpointDataReferenceEntry; +import org.eclipse.edc.edr.store.index.sql.schema.EndpointDataReferenceEntryStatements; import org.eclipse.edc.spi.persistence.EdcPersistenceException; import org.eclipse.edc.spi.query.QuerySpec; import org.eclipse.edc.spi.result.StoreResult; diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtension.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndexExtension.java similarity index 91% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtension.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndexExtension.java index 223856c9ff2..0c57b240146 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtension.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/SqlEndpointDataReferenceEntryIndexExtension.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.connector.store.sql.edr; +package org.eclipse.edc.edr.store.index; -import org.eclipse.edc.connector.store.sql.edr.schema.EndpointDataReferenceEntryStatements; -import org.eclipse.edc.connector.store.sql.edr.schema.postgres.PostgresDialectStatements; import org.eclipse.edc.edr.spi.store.EndpointDataReferenceEntryIndex; +import org.eclipse.edc.edr.store.index.sql.schema.EndpointDataReferenceEntryStatements; +import org.eclipse.edc.edr.store.index.sql.schema.postgres.PostgresDialectStatements; import org.eclipse.edc.runtime.metamodel.annotation.Extension; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.runtime.metamodel.annotation.Provides; diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/BaseSqlDialectStatements.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/BaseSqlDialectStatements.java similarity index 94% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/BaseSqlDialectStatements.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/BaseSqlDialectStatements.java index d316a5f37fe..0ddd9a8eefc 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/BaseSqlDialectStatements.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/BaseSqlDialectStatements.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.store.sql.edr.schema; +package org.eclipse.edc.edr.store.index.sql.schema; -import org.eclipse.edc.connector.store.sql.edr.schema.postgres.EndpointDataReferenceEntryMapping; +import org.eclipse.edc.edr.store.index.sql.schema.postgres.EndpointDataReferenceEntryMapping; import org.eclipse.edc.spi.query.QuerySpec; import org.eclipse.edc.sql.translation.SqlOperatorTranslator; import org.eclipse.edc.sql.translation.SqlQueryStatement; diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/EndpointDataReferenceEntryStatements.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/EndpointDataReferenceEntryStatements.java similarity index 96% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/EndpointDataReferenceEntryStatements.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/EndpointDataReferenceEntryStatements.java index 5ae583bc309..b48496d58d5 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/EndpointDataReferenceEntryStatements.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/EndpointDataReferenceEntryStatements.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.connector.store.sql.edr.schema; +package org.eclipse.edc.edr.store.index.sql.schema; import org.eclipse.edc.edr.spi.types.EndpointDataReferenceEntry; import org.eclipse.edc.spi.query.QuerySpec; diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/EndpointDataReferenceEntryMapping.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/EndpointDataReferenceEntryMapping.java similarity index 88% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/EndpointDataReferenceEntryMapping.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/EndpointDataReferenceEntryMapping.java index ddd787c028f..48087c4a4ed 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/EndpointDataReferenceEntryMapping.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/EndpointDataReferenceEntryMapping.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.connector.store.sql.edr.schema.postgres; +package org.eclipse.edc.edr.store.index.sql.schema.postgres; -import org.eclipse.edc.connector.store.sql.edr.schema.EndpointDataReferenceEntryStatements; import org.eclipse.edc.edr.spi.types.EndpointDataReferenceEntry; +import org.eclipse.edc.edr.store.index.sql.schema.EndpointDataReferenceEntryStatements; import org.eclipse.edc.sql.translation.TranslationMapping; /** diff --git a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/PostgresDialectStatements.java b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/PostgresDialectStatements.java similarity index 86% rename from extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/PostgresDialectStatements.java rename to extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/PostgresDialectStatements.java index 5b42f92d169..f440a42344a 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/connector/store/sql/edr/schema/postgres/PostgresDialectStatements.java +++ b/extensions/common/store/sql/edr-index-sql/src/main/java/org/eclipse/edc/edr/store/index/sql/schema/postgres/PostgresDialectStatements.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.connector.store.sql.edr.schema.postgres; +package org.eclipse.edc.edr.store.index.sql.schema.postgres; -import org.eclipse.edc.connector.store.sql.edr.schema.BaseSqlDialectStatements; +import org.eclipse.edc.edr.store.index.sql.schema.BaseSqlDialectStatements; import org.eclipse.edc.sql.dialect.PostgresDialect; import org.eclipse.edc.sql.translation.PostgresqlOperatorTranslator; diff --git a/extensions/common/store/sql/edr-index-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/store/sql/edr-index-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index bcac987def1..f362a2f186a 100644 --- a/extensions/common/store/sql/edr-index-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/store/sql/edr-index-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,4 +12,4 @@ # # -org.eclipse.edc.connector.store.sql.edr.SqlEndpointDataReferenceEntryIndexExtension \ No newline at end of file +org.eclipse.edc.edr.store.index.SqlEndpointDataReferenceEntryIndexExtension \ No newline at end of file diff --git a/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtensionTest.java b/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexExtensionTest.java similarity index 86% rename from extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtensionTest.java rename to extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexExtensionTest.java index a55f82b32e4..34ee386f8b5 100644 --- a/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexExtensionTest.java +++ b/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexExtensionTest.java @@ -12,9 +12,11 @@ * */ -package org.eclipse.edc.connector.store.sql.edr; +package org.eclipse.edc.edr.store.index.sql; import org.eclipse.edc.edr.spi.store.EndpointDataReferenceEntryIndex; +import org.eclipse.edc.edr.store.index.SqlEndpointDataReferenceEntryIndex; +import org.eclipse.edc.edr.store.index.SqlEndpointDataReferenceEntryIndexExtension; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.edc.spi.system.configuration.Config; @@ -25,7 +27,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.connector.store.sql.edr.SqlEndpointDataReferenceEntryIndexExtension.DATASOURCE_SETTING_NAME; +import static org.eclipse.edc.edr.store.index.SqlEndpointDataReferenceEntryIndexExtension.DATASOURCE_SETTING_NAME; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexTest.java b/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexTest.java similarity index 88% rename from extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexTest.java rename to extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexTest.java index 5534148a27f..86ea7882cf2 100644 --- a/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/connector/store/sql/edr/SqlEndpointDataReferenceEntryIndexTest.java +++ b/extensions/common/store/sql/edr-index-sql/src/test/java/org/eclipse/edc/edr/store/index/sql/SqlEndpointDataReferenceEntryIndexTest.java @@ -12,13 +12,14 @@ * */ -package org.eclipse.edc.connector.store.sql.edr; +package org.eclipse.edc.edr.store.index.sql; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.edc.connector.store.sql.edr.schema.BaseSqlDialectStatements; -import org.eclipse.edc.connector.store.sql.edr.schema.postgres.PostgresDialectStatements; import org.eclipse.edc.edr.spi.store.EndpointDataReferenceEntryIndex; import org.eclipse.edc.edr.spi.store.EndpointDataReferenceEntryIndexTestBase; +import org.eclipse.edc.edr.store.index.SqlEndpointDataReferenceEntryIndex; +import org.eclipse.edc.edr.store.index.sql.schema.BaseSqlDialectStatements; +import org.eclipse.edc.edr.store.index.sql.schema.postgres.PostgresDialectStatements; import org.eclipse.edc.junit.annotations.ComponentTest; import org.eclipse.edc.sql.QueryExecutor; import org.eclipse.edc.sql.testfixtures.PostgresqlStoreSetupExtension; diff --git a/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts b/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts index 774f23fca75..f3534509cb2 100644 --- a/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts +++ b/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":core:common:lib:transform-lib")) - testImplementation(project(":extensions:common:lib:jersey-providers-lib")) + testImplementation(project(":extensions:common:http:lib:jersey-providers-lib")) testImplementation(testFixtures(project(":core:common:lib:http-lib"))) testImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) diff --git a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java index b676e0c3b03..ae863dadedc 100644 --- a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java +++ b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java @@ -32,7 +32,7 @@ import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToDataAddressTransformer; import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer; import org.eclipse.edc.validator.spi.JsonObjectValidatorRegistry; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; import org.eclipse.edc.web.jersey.testfixtures.RestControllerTestBase; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/build.gradle.kts b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/build.gradle.kts index 79794d7da3e..c5f5b2b5055 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/build.gradle.kts +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":spi:data-plane:data-plane-spi")) implementation(project(":core:common:lib:transform-lib")) - implementation(project(":extensions:common:lib:jersey-providers-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) implementation(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-transform")) implementation(libs.jakarta.rsApi) diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/main/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtension.java b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/main/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtension.java index 6741da4b0ba..5fef0b4909a 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/main/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtension.java +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/main/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtension.java @@ -30,8 +30,8 @@ import org.eclipse.edc.transform.spi.TypeTransformerRegistry; import org.eclipse.edc.transform.transformer.dspace.from.JsonObjectFromDataAddressDspaceTransformer; import org.eclipse.edc.transform.transformer.dspace.to.JsonObjectToDataAddressDspaceTransformer; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebServer; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer; diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/test/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtensionTest.java b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/test/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtensionTest.java index 45bba0766cb..f95d41dece0 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/test/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtensionTest.java +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-api-configuration/src/test/java/org/eclipse/edc/connector/api/signaling/configuration/SignalingApiConfigurationExtensionTest.java @@ -21,8 +21,8 @@ import org.eclipse.edc.spi.system.configuration.Config; import org.eclipse.edc.spi.system.configuration.ConfigFactory; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; -import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor; -import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider; +import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor; +import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider; import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration; import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer; diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-transform/build.gradle.kts b/extensions/data-plane/data-plane-signaling/data-plane-signaling-transform/build.gradle.kts index 23985e594e5..29325ca4d6b 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-transform/build.gradle.kts +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-transform/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":spi:data-plane:data-plane-spi")) implementation(project(":core:common:lib:transform-lib")) - implementation(project(":extensions:common:lib:jersey-providers-lib")) + implementation(project(":extensions:common:http:lib:jersey-providers-lib")) implementation(libs.jakarta.rsApi) testImplementation(project(":core:common:junit")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1d717bf0488..9ca2e4edfe7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -103,9 +103,9 @@ include(":extensions:common:auth:auth-basic") include(":extensions:common:auth:auth-tokenbased") include(":extensions:common:crypto:ldp-verifiable-credentials") include(":extensions:common:crypto:jwt-verifiable-credentials") -include(":extensions:common:crypto:jws2020") +include(":extensions:common:crypto:lib:jws2020-lib") -include(":extensions:common:lib:jersey-providers-lib") +include(":extensions:common:http:lib:jersey-providers-lib") include(":extensions:common:configuration:configuration-filesystem") include(":extensions:common:events:events-cloud-http") @@ -129,10 +129,10 @@ include(":extensions:common:iam:identity-trust:identity-trust-core") include(":extensions:common:iam:identity-trust:identity-trust-sts") include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded") include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core") -include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote") -include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote-core") +include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote-client") include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api") include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-client-configuration") +include(":extensions:common:iam:identity-trust:identity-trust-sts:lib:identity-trust-sts-remote-lib") include(":extensions:common:iam:identity-trust:identity-trust-issuers-configuration") include(":extensions:common:json-ld") diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/ClaimTokenCreatorFunction.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/ClaimTokenCreatorFunction.java similarity index 90% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/ClaimTokenCreatorFunction.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/ClaimTokenCreatorFunction.java index 59a122e7227..8a994a080a1 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/ClaimTokenCreatorFunction.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/ClaimTokenCreatorFunction.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.result.Result; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceClient.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/CredentialServiceClient.java similarity index 93% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceClient.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/CredentialServiceClient.java index 1012f14c230..e3e14be62f9 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/CredentialServiceClient.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/CredentialServiceClient.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; import org.eclipse.edc.spi.result.Result; import java.util.List; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/IatpParticipantAgentServiceExtension.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java similarity index 93% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/IatpParticipantAgentServiceExtension.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java index f1a36956fe9..1e9b00f4ce2 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/IatpParticipantAgentServiceExtension.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; import org.eclipse.edc.spi.agent.ParticipantAgentServiceExtension; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SecureTokenService.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java similarity index 97% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SecureTokenService.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java index 1a4fee1429f..4d7dc6d9053 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SecureTokenService.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.Result; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SelfIssuedTokenConstants.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SelfIssuedTokenConstants.java similarity index 94% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SelfIssuedTokenConstants.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SelfIssuedTokenConstants.java index 9d4e8df1f36..f2570ebe0dc 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/SelfIssuedTokenConstants.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SelfIssuedTokenConstants.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; /** * Constants for the Self-Issued ID Token diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/TrustedIssuerRegistry.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/TrustedIssuerRegistry.java similarity index 86% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/TrustedIssuerRegistry.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/TrustedIssuerRegistry.java index 436517e081d..e13c0bd7f8d 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/TrustedIssuerRegistry.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/TrustedIssuerRegistry.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; -import org.eclipse.edc.identitytrust.model.Issuer; +import org.eclipse.edc.iam.identitytrust.spi.model.Issuer; import java.util.Collection; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/VcConstants.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/VcConstants.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/VcConstants.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/VcConstants.java index 53c1906c1ab..ef65cd0e7ee 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/VcConstants.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/VcConstants.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; public interface VcConstants { diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialFormat.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialFormat.java similarity index 90% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialFormat.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialFormat.java index fb825995189..ae392148448 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialFormat.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialFormat.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; public enum CredentialFormat { JSON_LD, diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialStatus.java similarity index 93% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialStatus.java index a3b7ff056d4..1cd63b39a82 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialStatus.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialStatus.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import java.util.Map; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialSubject.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubject.java similarity index 94% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialSubject.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubject.java index 04ccb36b01c..a2826b74dcf 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/CredentialSubject.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubject.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import static org.eclipse.edc.identitytrust.VcConstants.VC_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.VC_PREFIX; /** * Credential subject as defined in W3C specification. diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/Issuer.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/Issuer.java similarity index 92% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/Issuer.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/Issuer.java index 9e4311ec5e3..a3bc1e6cee5 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/Issuer.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/Issuer.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import java.util.Map; import java.util.Objects; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredential.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredential.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredential.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredential.java index 286c375a5a3..d630720edf9 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredential.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredential.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import org.jetbrains.annotations.NotNull; @@ -21,8 +21,8 @@ import java.util.List; import java.util.Objects; -import static org.eclipse.edc.identitytrust.VcConstants.SCHEMA_ORG_NAMESPACE; -import static org.eclipse.edc.identitytrust.VcConstants.VC_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.SCHEMA_ORG_NAMESPACE; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.VC_PREFIX; /** * Represents a VerifiableCredential as per the VerifiableCredential Data Model 2.0. diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialContainer.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialContainer.java similarity index 95% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialContainer.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialContainer.java index c88ecb7c1dd..800b6e50131 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialContainer.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialContainer.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; /** * This container object is intended to hold a {@link VerifiableCredential}, its raw representation and which format it is in. diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentation.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentation.java similarity index 95% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentation.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentation.java index cf5d7f72825..85d71c47121 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentation.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentation.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import java.util.ArrayList; import java.util.List; -import static org.eclipse.edc.identitytrust.VcConstants.VC_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.VC_PREFIX; /** * Represents a VerifiablePresentation object as specified by the diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationContainer.java similarity index 95% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationContainer.java index 26b7c0f9d5d..3bb227ec154 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationContainer.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationContainer.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; /** * This container object is intended to hold a {@link VerifiableCredential}, its raw representation and which format it is in. diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/InputDescriptorMapping.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/InputDescriptorMapping.java similarity index 90% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/InputDescriptorMapping.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/InputDescriptorMapping.java index f61e509ce7c..d490a0ce7a3 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/InputDescriptorMapping.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/InputDescriptorMapping.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.credentialservice; +package org.eclipse.edc.iam.identitytrust.spi.model.credentialservice; /** * Represents the {@code descriptor_map} of a Presentation Submission diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationQueryMessage.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationQueryMessage.java similarity index 90% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationQueryMessage.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationQueryMessage.java index a294d833471..180cba3f8c4 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationQueryMessage.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationQueryMessage.java @@ -12,15 +12,15 @@ * */ -package org.eclipse.edc.identitytrust.model.credentialservice; +package org.eclipse.edc.iam.identitytrust.spi.model.credentialservice; -import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition; +import org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition.PresentationDefinition; import java.util.ArrayList; import java.util.List; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_PREFIX; /** diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationResponseMessage.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationResponseMessage.java similarity index 94% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationResponseMessage.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationResponseMessage.java index 71de133b1aa..d93e352b997 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationResponseMessage.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationResponseMessage.java @@ -12,12 +12,12 @@ * */ -package org.eclipse.edc.identitytrust.model.credentialservice; +package org.eclipse.edc.iam.identitytrust.spi.model.credentialservice; import java.util.ArrayList; import java.util.List; -import static org.eclipse.edc.identitytrust.VcConstants.IATP_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_PREFIX; /** * A representation of a Presentation Response diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmission.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmission.java similarity index 93% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmission.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmission.java index d1e458402b2..31d568ebf46 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmission.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmission.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.credentialservice; +package org.eclipse.edc.iam.identitytrust.spi.model.credentialservice; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Constraints.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Constraints.java similarity index 87% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Constraints.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Constraints.java index 330c43e703a..144143dad51 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Constraints.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Constraints.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; import java.util.List; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Field.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Field.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Field.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Field.java index 270d86447e8..8da39970ce5 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Field.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Field.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/FilterExpression.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/FilterExpression.java similarity index 86% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/FilterExpression.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/FilterExpression.java index 5cc9b663a6b..dbbe0b8099c 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/FilterExpression.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/FilterExpression.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; public record FilterExpression(String type, String pattern) { } diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Format.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Format.java similarity index 86% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Format.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Format.java index 9a0d8be9d42..2303c49516b 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/Format.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/Format.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; public class Format { //todo diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/InputDescriptor.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/InputDescriptor.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/InputDescriptor.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/InputDescriptor.java index 3dd998edb77..25d14ba81ee 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/InputDescriptor.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/InputDescriptor.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; import java.util.Objects; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/PresentationDefinition.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/PresentationDefinition.java similarity index 97% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/PresentationDefinition.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/PresentationDefinition.java index a72e1ac81b9..c820f6467a6 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/model/presentationdefinition/PresentationDefinition.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/presentationdefinition/PresentationDefinition.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.presentationdefinition; +package org.eclipse.edc.iam.identitytrust.spi.model.presentationdefinition; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractor.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractor.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java index 59554b81624..851db68ed1a 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractor.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.scope; +package org.eclipse.edc.iam.identitytrust.spi.scope; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.engine.spi.PolicyEngine; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractorRegistry.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractorRegistry.java similarity index 95% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractorRegistry.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractorRegistry.java index 960a720e907..e7412af02f9 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/scope/ScopeExtractorRegistry.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractorRegistry.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.scope; +package org.eclipse.edc.iam.identitytrust.spi.scope; import org.eclipse.edc.policy.engine.spi.PolicyContext; import org.eclipse.edc.policy.model.Policy; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/CredentialValidationRule.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/CredentialValidationRule.java similarity index 92% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/CredentialValidationRule.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/CredentialValidationRule.java index 303b2e74e3d..4883281fe77 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/CredentialValidationRule.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/CredentialValidationRule.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.identitytrust.validation; +package org.eclipse.edc.iam.identitytrust.spi.validation; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential; import org.eclipse.edc.spi.result.Result; import java.util.function.Function; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/TokenValidationAction.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/TokenValidationAction.java similarity index 93% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/TokenValidationAction.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/TokenValidationAction.java index a7473ff6991..beec231e12e 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/validation/TokenValidationAction.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/validation/TokenValidationAction.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.validation; +package org.eclipse.edc.iam.identitytrust.spi.validation; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.iam.TokenRepresentation; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/CredentialVerifier.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/CredentialVerifier.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/CredentialVerifier.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/CredentialVerifier.java index 1a395af3e28..0205f3552f2 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/CredentialVerifier.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/CredentialVerifier.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.spi.verification; import org.eclipse.edc.spi.result.Result; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/PresentationVerifier.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/PresentationVerifier.java similarity index 83% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/PresentationVerifier.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/PresentationVerifier.java index 21a3b20ae4d..6864d6b3e49 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/PresentationVerifier.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/PresentationVerifier.java @@ -12,13 +12,14 @@ * */ -package org.eclipse.edc.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.spi.verification; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; import org.eclipse.edc.spi.result.Result; /** - * A presentation verifier is used to assert that a certain {@link org.eclipse.edc.identitytrust.model.VerifiablePresentation} + * A presentation verifier is used to assert that a certain {@link VerifiablePresentation} * is cryptographically sound, i.e. all the proofs of the presentation, and all the proofs of all the VerifiableCredentials * can be verified. *

diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/SignatureSuiteRegistry.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/SignatureSuiteRegistry.java similarity index 96% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/SignatureSuiteRegistry.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/SignatureSuiteRegistry.java index ec8aef17cc6..a6b232f6ae7 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/SignatureSuiteRegistry.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/SignatureSuiteRegistry.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.spi.verification; import com.apicatalog.ld.signature.SignatureSuite; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/VerifierContext.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/VerifierContext.java similarity index 97% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/VerifierContext.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/VerifierContext.java index e24574a5d94..e092e1190a8 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/identitytrust/verification/VerifierContext.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/verification/VerifierContext.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.verification; +package org.eclipse.edc.iam.identitytrust.spi.verification; import org.eclipse.edc.spi.result.Result; diff --git a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/CredentialSubjectTest.java b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubjectTest.java similarity index 97% rename from spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/CredentialSubjectTest.java rename to spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubjectTest.java index d6c4f2f9284..cbb0c2309c4 100644 --- a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/CredentialSubjectTest.java +++ b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/CredentialSubjectTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialTest.java b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialTest.java similarity index 98% rename from spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialTest.java rename to spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialTest.java index 561803f2240..28e6309710b 100644 --- a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiableCredentialTest.java +++ b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiableCredentialTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import org.eclipse.edc.spi.types.TypeManager; import org.junit.jupiter.api.Test; diff --git a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationTest.java b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationTest.java similarity index 91% rename from spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationTest.java rename to spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationTest.java index 702acb6d533..2c7a11f9e01 100644 --- a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/VerifiablePresentationTest.java +++ b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/VerifiablePresentationTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model; +package org.eclipse.edc.iam.identitytrust.spi.model; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.eclipse.edc.identitytrust.TestFunctions.createCredential; +import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredential; class VerifiablePresentationTest { diff --git a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmissionSerDesTest.java b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmissionSerDesTest.java similarity index 97% rename from spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmissionSerDesTest.java rename to spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmissionSerDesTest.java index 7808e1d2101..475a5ddc9dd 100644 --- a/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/identitytrust/model/credentialservice/PresentationSubmissionSerDesTest.java +++ b/spi/common/identity-trust-spi/src/test/java/org/eclipse/edc/iam/identitytrust/spi/model/credentialservice/PresentationSubmissionSerDesTest.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust.model.credentialservice; +package org.eclipse.edc.iam.identitytrust.spi.model.credentialservice; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/identitytrust/TestFunctions.java b/spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/spi/TestFunctions.java similarity index 86% rename from spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/identitytrust/TestFunctions.java rename to spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/spi/TestFunctions.java index b5d0971251c..8880c179eda 100644 --- a/spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/identitytrust/TestFunctions.java +++ b/spi/common/identity-trust-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/spi/TestFunctions.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.identitytrust; +package org.eclipse.edc.iam.identitytrust.spi; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; @@ -23,20 +23,20 @@ import com.nimbusds.jose.jwk.gen.ECKeyGenerator; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import org.eclipse.edc.identitytrust.model.CredentialFormat; -import org.eclipse.edc.identitytrust.model.CredentialSubject; -import org.eclipse.edc.identitytrust.model.Issuer; -import org.eclipse.edc.identitytrust.model.VerifiableCredential; -import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer; -import org.eclipse.edc.identitytrust.model.VerifiablePresentation; -import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer; +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.VerifiablePresentation; +import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer; import org.eclipse.edc.spi.iam.TokenRepresentation; import java.util.Date; import java.util.Map; import static java.time.Instant.now; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; public class TestFunctions { diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClient.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClient.java similarity index 98% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClient.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClient.java index 561249345d3..d43da7cef2f 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClient.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClient.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.model; +package org.eclipse.edc.iam.identitytrust.sts.spi.model; import org.eclipse.edc.spi.security.Vault; diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClientTokenAdditionalParams.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClientTokenAdditionalParams.java similarity index 93% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClientTokenAdditionalParams.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClientTokenAdditionalParams.java index bbae3099f58..07501d6ccfe 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/model/StsClientTokenAdditionalParams.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/model/StsClientTokenAdditionalParams.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.model; +package org.eclipse.edc.iam.identitytrust.sts.spi.model; -import org.eclipse.edc.iam.identitytrust.sts.service.StsClientTokenGeneratorService; +import org.eclipse.edc.iam.identitytrust.sts.spi.service.StsClientTokenGeneratorService; import java.util.Objects; @@ -44,7 +44,7 @@ public String getAudience() { public String getAccessToken() { return accessToken; } - + public static class Builder { private final StsClientTokenAdditionalParams params; diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientService.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientService.java similarity index 92% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientService.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientService.java index d34017798d5..cbb3b7ecb09 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientService.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientService.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.service; +package org.eclipse.edc.iam.identitytrust.sts.spi.service; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint; import org.eclipse.edc.spi.result.ServiceResult; diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientTokenGeneratorService.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientTokenGeneratorService.java similarity index 84% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientTokenGeneratorService.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientTokenGeneratorService.java index 7f050a2991f..fbe1e573371 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsClientTokenGeneratorService.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsClientTokenGeneratorService.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.service; +package org.eclipse.edc.iam.identitytrust.sts.spi.service; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClientTokenAdditionalParams; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClientTokenAdditionalParams; import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint; import org.eclipse.edc.spi.iam.TokenRepresentation; import org.eclipse.edc.spi.result.ServiceResult; diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsTokenGenerationProvider.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsTokenGenerationProvider.java similarity index 90% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsTokenGenerationProvider.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsTokenGenerationProvider.java index 739e7606f71..78f60481731 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/service/StsTokenGenerationProvider.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/service/StsTokenGenerationProvider.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.service; +package org.eclipse.edc.iam.identitytrust.sts.spi.service; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint; import org.eclipse.edc.token.spi.TokenGenerationService; diff --git a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/store/StsClientStore.java b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/StsClientStore.java similarity index 90% rename from spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/store/StsClientStore.java rename to spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/StsClientStore.java index 77e846cd318..203221c9913 100644 --- a/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/store/StsClientStore.java +++ b/spi/common/identity-trust-sts-spi/src/main/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/StsClientStore.java @@ -12,10 +12,10 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.store; +package org.eclipse.edc.iam.identitytrust.sts.spi.store; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint; import org.eclipse.edc.spi.result.StoreResult; diff --git a/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/StsClientStoreTestBase.java b/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/StsClientStoreTestBase.java similarity index 86% rename from spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/StsClientStoreTestBase.java rename to spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/StsClientStoreTestBase.java index 3cbbd7979e2..89094154209 100644 --- a/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/StsClientStoreTestBase.java +++ b/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/StsClientStoreTestBase.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.store.fixtures; +package org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.spi.result.StoreFailure; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -23,7 +23,6 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClient; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; /** @@ -43,7 +42,7 @@ class Create { @Test @DisplayName("Save a single client that not exists") void create() { - var client = createClient(getRandomId()); + var client = TestFunctions.createClient(getRandomId()); assertThat(getStsClientStore().create(client)).isSucceeded(); var clientFromDb = getStsClientStore().findByClientId(client.getId()).getContent(); @@ -56,7 +55,7 @@ class FindById { @Test @DisplayName("Find client by ID that exists") void whenPresent() { - var client = createClient(getRandomId()); + var client = TestFunctions.createClient(getRandomId()); getStsClientStore().create(client); var policyFromDb = getStsClientStore().findByClientId(client.getId()).getContent(); diff --git a/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/TestFunctions.java b/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/TestFunctions.java similarity index 91% rename from spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/TestFunctions.java rename to spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/TestFunctions.java index 430afbec43c..1f041e35f9c 100644 --- a/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/store/fixtures/TestFunctions.java +++ b/spi/common/identity-trust-sts-spi/src/testFixtures/java/org/eclipse/edc/iam/identitytrust/sts/spi/store/fixtures/TestFunctions.java @@ -12,9 +12,9 @@ * */ -package org.eclipse.edc.iam.identitytrust.sts.store.fixtures; +package org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; import java.util.UUID; diff --git a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts index 0b43569f220..fdae455be39 100644 --- a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts +++ b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts @@ -19,7 +19,7 @@ plugins { dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":spi:common:identity-trust-sts-spi")) - testImplementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-remote")) + testImplementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:lib:identity-trust-sts-remote-lib")) testImplementation(project(":extensions:common:iam:oauth2:oauth2-client")) testImplementation(libs.restAssured) diff --git a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java index e3123f5fa58..b261d81c81e 100644 --- a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java +++ b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java @@ -38,7 +38,7 @@ import static com.nimbusds.jwt.JWTClaimNames.SUBJECT; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.http.client.testfixtures.HttpTestUtils.testHttpClient; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.CLIENT_ID; import static org.eclipse.edc.util.io.Ports.getFreePort; diff --git a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsApiEndToEndTest.java b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsApiEndToEndTest.java index 7a836b286f5..827c59ceffa 100644 --- a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsApiEndToEndTest.java +++ b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsApiEndToEndTest.java @@ -36,7 +36,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.http.ContentType.JSON; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; +import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.CLIENT_ID; import static org.eclipse.edc.util.io.Ports.getFreePort; import static org.hamcrest.Matchers.is; diff --git a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsEndToEndTestBase.java b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsEndToEndTestBase.java index f1722342e97..393566a4c8a 100644 --- a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsEndToEndTestBase.java +++ b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/StsEndToEndTestBase.java @@ -15,8 +15,8 @@ package org.eclipse.edc.test.e2e.sts.api; import com.nimbusds.jwt.SignedJWT; -import org.eclipse.edc.iam.identitytrust.sts.model.StsClient; -import org.eclipse.edc.iam.identitytrust.sts.store.StsClientStore; +import org.eclipse.edc.iam.identitytrust.sts.spi.model.StsClient; +import org.eclipse.edc.iam.identitytrust.sts.spi.store.StsClientStore; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.spi.security.Vault; @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.UUID; -import static org.eclipse.edc.iam.identitytrust.sts.store.fixtures.TestFunctions.createClient; +import static org.eclipse.edc.iam.identitytrust.sts.spi.store.fixtures.TestFunctions.createClient; /** * Base class for STS E2E tests