Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: align packages and create additional lib modules for shared classes #4074

Merged
merged 1 commit into from
Apr 3, 2024
+486 −555
Merged

chore: align packages and create additional lib modules for shared classes #4074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data-protocols/dsp/dsp-api-configuration/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

}
2 changes: 1 addition & 1 deletion extensions/common/api/management-api-configuration/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
4 changes: 2 additions & 2 deletions ...lipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...e/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../verifiablecredentials/TestFunctions.java → ...ifiablecredentials/jwt/TestFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))


}
6 changes: 3 additions & 3 deletions ...edentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 7 additions & 9 deletions ...tials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...erfiablecredentials/LdpCreationUtils.java → ...dentials/linkeddata/LdpCreationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ntials/verfiablecredentials/TestData.java → ...iablecredentials/linkeddata/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.edc.verifiablecredentials.verfiablecredentials;
package org.eclipse.edc.verifiablecredentials.linkeddata;

import jakarta.json.Json;
import jakarta.json.JsonObject;
Expand Down
0 extensions/common/crypto/jws2020/README.md → ...s/common/crypto/lib/jws2020-lib/README.md
View file
Open in desktop
File renamed without changes.
0 ...ns/common/crypto/jws2020/build.gradle.kts → ...n/crypto/lib/jws2020-lib/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...y/signature/jws2020/ByteArrayAdapter.java → ...y/signature/jws2020/ByteArrayAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ignature/jws2020/IssuerCompatibility.java → ...ignature/jws2020/IssuerCompatibility.java
View file
Open in desktop
File renamed without changes.
0 ...curity/signature/jws2020/JsonAdapter.java → ...curity/signature/jws2020/JsonAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ecurity/signature/jws2020/JwkAdapter.java → ...ecurity/signature/jws2020/JwkAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...security/signature/jws2020/JwkMethod.java → ...security/signature/jws2020/JwkMethod.java
View file
Open in desktop
File renamed without changes.
0 ...signature/jws2020/Jws2020CryptoSuite.java → ...signature/jws2020/Jws2020CryptoSuite.java
View file
Open in desktop
File renamed without changes.
0 ...rity/signature/jws2020/Jws2020Schema.java → ...rity/signature/jws2020/Jws2020Schema.java
View file
Open in desktop
File renamed without changes.
0 ...ure/jws2020/Jws2020SignatureProvider.java → ...ure/jws2020/Jws2020SignatureProvider.java
View file
Open in desktop
File renamed without changes.
0 ...nature/jws2020/JwsSignature2020Suite.java → ...nature/jws2020/JwsSignature2020Suite.java
View file
Open in desktop
File renamed without changes.
0 ...ure/jws2020/JwsSignatureProofOptions.java → ...ure/jws2020/JwsSignatureProofOptions.java
View file
Open in desktop
File renamed without changes.
0 ...curity/signature/jws2020/IssuerTests.java → ...curity/signature/jws2020/IssuerTests.java
View file
Open in desktop
File renamed without changes.
0 ...ty/signature/jws2020/JsonAdapterTest.java → ...ty/signature/jws2020/JsonAdapterTest.java
View file
Open in desktop
File renamed without changes.
0 ...rity/signature/jws2020/VerifierTests.java → ...rity/signature/jws2020/VerifierTests.java
View file
Open in desktop
File renamed without changes.
0 ...st/resources/jws2020/issuing/0001_vc.json → ...st/resources/jws2020/issuing/0001_vc.json
View file
Open in desktop
File renamed without changes.
0 ...ces/jws2020/issuing/0003_vc_embedded.json → ...ces/jws2020/issuing/0003_vc_embedded.json
View file
Open in desktop
File renamed without changes.
0 ...rces/jws2020/issuing/0004_vc_did_key.json → ...rces/jws2020/issuing/0004_vc_did_key.json
View file
Open in desktop
File renamed without changes.
0 ...020/issuing/0005_vp_compacted_signed.json → ...020/issuing/0005_vp_compacted_signed.json
View file
Open in desktop
File renamed without changes.
0 ...jws2020/issuing/linkedCredentialData.json → ...jws2020/issuing/linkedCredentialData.json
View file
Open in desktop
File renamed without changes.
0 ...esources/jws2020/issuing/private-key.json → ...esources/jws2020/issuing/private-key.json
View file
Open in desktop
File renamed without changes.
0 .../resources/jws2020/verifying/0001_vc.json → .../resources/jws2020/verifying/0001_vc.json
View file
Open in desktop
File renamed without changes.
0 ...ces/jws2020/verifying/0002_vc_forged.json → ...ces/jws2020/verifying/0002_vc_forged.json
View file
Open in desktop
File renamed without changes.
0 ...s/jws2020/verifying/0003_vc_embedded.json → ...s/jws2020/verifying/0003_vc_embedded.json
View file
Open in desktop
File renamed without changes.
0 ...0/verifying/0004_vc_two_valid_proofs.json → ...0/verifying/0004_vc_two_valid_proofs.json
View file
Open in desktop
File renamed without changes.
0 ...0/verifying/0005_vc_one_forged_proof.json → ...0/verifying/0005_vc_one_forged_proof.json
View file
Open in desktop
File renamed without changes.
0 ...es/jws2020/verifying/0006_vc_did_key.json → ...es/jws2020/verifying/0006_vc_did_key.json
View file
Open in desktop
File renamed without changes.
0 .../jws2020/verifying/0007_vp_compacted.json → .../jws2020/verifying/0007_vp_compacted.json
View file
Open in desktop
File renamed without changes.
0 ...0/verifying/0007_vp_compacted_forged.json → ...0/verifying/0007_vp_compacted_forged.json
View file
Open in desktop
File renamed without changes.
0 ...s2020/verifying/linkedCredentialData.json → ...s2020/verifying/linkedCredentialData.json
View file
Open in desktop
File renamed without changes.
0 ...ws2020/verifying/verification-method.json → ...ws2020/verifying/verification-method.json
View file
Open in desktop
File renamed without changes.
0 ...signature/jws2020/TestDocumentLoader.java → ...signature/jws2020/TestDocumentLoader.java
View file
Open in desktop
File renamed without changes.
0 ...rity/signature/jws2020/TestFunctions.java → ...rity/signature/jws2020/TestFunctions.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions extensions/common/http/jersey-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...s/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...lib/jersey-providers-lib/build.gradle.kts → ...lib/jersey-providers-lib/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ersey/jsonld/JerseyJsonLdInterceptor.java → ...iders/jsonld/JerseyJsonLdInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...b/jersey/jsonld/ObjectMapperProvider.java → ...roviders/jsonld/ObjectMapperProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,13 +22,13 @@
* Jakarta JSON API is required to allow JsonObject as a controller parameter.
*/
public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {

private final ObjectMapper objectMapper;

public ObjectMapperProvider(ObjectMapper objectMapper) {
this.objectMapper = objectMapper;
}

@Override
public ObjectMapper getContext(Class<?> type) {
return objectMapper;
Expand Down
2 changes: 1 addition & 1 deletion ...y/jsonld/JerseyJsonLdInterceptorTest.java → ...s/jsonld/JerseyJsonLdInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
12 changes: 6 additions & 6 deletions ...re/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions ...-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions .../java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading
Loading