chore: delete model classes that were moved to EDC (#173)

* chore: delete model classes that were moved to EDC * DEPENDENCIES
eclipse-edc · Nov 15, 2023 · 26f806a · 26f806a
1 parent 3d5c122
commit 26f806a
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 901 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -231,6 +231,7 @@ maven/mavencentral/org.eclipse.edc/identity-did-spi/0.3.2-SNAPSHOT, Apache-2.0,
 maven/mavencentral/org.eclipse.edc/identity-did-web/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-service/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/identity-trust-transform/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jersey-core/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jersey-providers/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/jetty-core/0.3.2-SNAPSHOT, Apache-2.0, approved, technology.edc

diff --git a/core/identity-hub-api/build.gradle.kts b/core/identity-hub-api/build.gradle.kts
@@ -22,11 +22,11 @@ dependencies {
     api(libs.edc.spi.jsonld)
     api(libs.edc.spi.core)
     api(project(":spi:identity-hub-spi"))
-    implementation(project(":core:identity-hub-transform"))
     implementation(libs.edc.spi.validator)
     implementation(libs.edc.spi.web)
     implementation(libs.edc.core.jerseyproviders)
     implementation(libs.edc.core.transform)
+    implementation(libs.edc.iatp.transform)
     implementation(libs.jakarta.rsApi)
     testImplementation(libs.edc.junit)
     testImplementation(libs.edc.ext.jsonld)

diff --git a/...y-hub-api/src/main/java/org/eclipse/edc/identityservice/api/PresentationApiExtension.java b/...y-hub-api/src/main/java/org/eclipse/edc/identityservice/api/PresentationApiExtension.java
@@ -15,13 +15,13 @@
 package org.eclipse.edc.identityservice.api;
 
 import org.eclipse.edc.core.transform.transformer.to.JsonValueToGenericTypeTransformer;
+import org.eclipse.edc.iam.identitytrust.transform.to.JsonObjectToPresentationQueryTransformer;
 import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
-import org.eclipse.edc.identityhub.transform.JsonObjectToPresentationQueryTransformer;
 import org.eclipse.edc.identityservice.api.v1.PresentationApiController;
 import org.eclipse.edc.identityservice.api.validation.PresentationQueryValidator;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -79,7 +79,7 @@ public void initialize(ServiceExtensionContext context) {
         webService.registerResource(RESOLUTION_CONTEXT, new JerseyJsonLdInterceptor(jsonLd, jsonLdMapper, RESOLUTION_SCOPE));
         webService.registerResource(RESOLUTION_CONTEXT, controller);
 
-        // register transformer
+        // register transformer -- remove once registration is handled in EDC
         typeTransformer.register(new JsonObjectToPresentationQueryTransformer(jsonLdMapper));
         typeTransformer.register(new JsonValueToGenericTypeTransformer(jsonLdMapper));
     }

diff --git a/...dentity-hub-api/src/main/java/org/eclipse/edc/identityservice/api/v1/PresentationApi.java b/...dentity-hub-api/src/main/java/org/eclipse/edc/identityservice/api/v1/PresentationApi.java
@@ -29,8 +29,8 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.identityhub.spi.model.PresentationResponse;
 import org.eclipse.edc.identityservice.api.v1.ApiSchema.ApiErrorDetailSchema;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponse;
 
 @OpenAPIDefinition(
         info = @Info(description = "This represents the Presentation API as per IATP specification. It serves endpoints to query for specific VerifiablePresentations.", title = "Resolution API",

diff --git a/...b-api/src/main/java/org/eclipse/edc/identityservice/api/v1/PresentationApiController.java b/...b-api/src/main/java/org/eclipse/edc/identityservice/api/v1/PresentationApiController.java
@@ -22,9 +22,9 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
 import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
@@ -37,7 +37,7 @@
 
 import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;
 import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static org.eclipse.edc.identityhub.spi.model.PresentationQuery.PRESENTATION_QUERY_TYPE_PROPERTY;
+import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery.PRESENTATION_QUERY_TYPE_PROPERTY;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/.../main/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidator.java b/.../main/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidator.java
@@ -17,7 +17,7 @@
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.validator.spi.ValidationResult;
 import org.eclipse.edc.validator.spi.Validator;

diff --git a/...i/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java b/...i/src/test/java/org/eclipse/edc/identityservice/api/v1/PresentationApiControllerTest.java
@@ -17,14 +17,14 @@
 import com.nimbusds.jwt.JWTClaimsSet;
 import jakarta.json.JsonObject;
 import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
-import org.eclipse.edc.identityhub.spi.model.InputDescriptorMapping;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
-import org.eclipse.edc.identityhub.spi.model.PresentationResponse;
-import org.eclipse.edc.identityhub.spi.model.PresentationSubmission;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.resolution.QueryResult;
 import org.eclipse.edc.identityhub.spi.verification.AccessTokenVerifier;
+import org.eclipse.edc.identitytrust.model.credentialservice.InputDescriptorMapping;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponse;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationSubmission;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.result.Result;
@@ -49,8 +49,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.eclipse.edc.identityhub.junit.testfixtures.VerifiableCredentialTestUtil.buildSignedJwt;
 import static org.eclipse.edc.identityhub.junit.testfixtures.VerifiableCredentialTestUtil.generateEcKey;
-import static org.eclipse.edc.identityhub.spi.model.PresentationQuery.PRESENTATION_QUERY_TYPE_PROPERTY;
 import static org.eclipse.edc.identityhub.spi.resolution.QueryResult.success;
+import static org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery.PRESENTATION_QUERY_TYPE_PROPERTY;
 import static org.eclipse.edc.validator.spi.ValidationResult.failure;
 import static org.eclipse.edc.validator.spi.ValidationResult.success;
 import static org.eclipse.edc.validator.spi.Violation.violation;

diff --git a/...t/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java b/...t/java/org/eclipse/edc/identityservice/api/validation/PresentationQueryValidatorTest.java
@@ -19,11 +19,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.Constraints;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.Field;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.InputDescriptor;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.PresentationDefinition;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.Constraints;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.Field;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.InputDescriptor;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;

diff --git a/...-hub-core/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java b/...-hub-core/src/main/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImpl.java
@@ -15,11 +15,11 @@
 package org.eclipse.edc.identityhub.core;
 
 import org.eclipse.edc.identityhub.spi.ScopeToCriterionTransformer;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
 import org.eclipse.edc.identityhub.spi.resolution.CredentialQueryResolver;
 import org.eclipse.edc.identityhub.spi.resolution.QueryResult;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
 import org.eclipse.edc.identityhub.spi.store.model.VerifiableCredentialResource;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQuery;
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.result.AbstractResult;

diff --git a/...ty-hub-core/src/main/java/org/eclipse/edc/identityhub/core/PresentationGeneratorImpl.java b/...ty-hub-core/src/main/java/org/eclipse/edc/identityhub/core/PresentationGeneratorImpl.java
@@ -18,10 +18,10 @@
 import jakarta.json.JsonObject;
 import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
 import org.eclipse.edc.identityhub.spi.generator.PresentationGenerator;
-import org.eclipse.edc.identityhub.spi.model.PresentationResponse;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.identitytrust.model.CredentialFormat;
 import org.eclipse.edc.identitytrust.model.VerifiableCredentialContainer;
+import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponse;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.jetbrains.annotations.Nullable;

diff --git a/...-core/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java b/...-core/src/test/java/org/eclipse/edc/identityhub/core/CredentialQueryResolverImplTest.java
@@ -16,8 +16,6 @@
 
 
 import org.eclipse.edc.identityhub.defaults.EdcScopeToCriterionTransformer;
-import org.eclipse.edc.identityhub.spi.model.PresentationQuery;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.identityhub.spi.resolution.QueryFailure;
 import org.eclipse.edc.identityhub.spi.store.CredentialStore;
 import org.eclipse.edc.identityhub.spi.store.model.VerifiableCredentialResource;
@@ -26,6 +24,8 @@
 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.credentialservice.PresentationQuery;
+import org.eclipse.edc.identitytrust.model.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.spi.result.StoreResult;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;

diff --git a/...ub-core/src/test/java/org/eclipse/edc/identityhub/core/PresentationGeneratorImplTest.java b/...ub-core/src/test/java/org/eclipse/edc/identityhub/core/PresentationGeneratorImplTest.java
@@ -18,12 +18,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonObject;
 import org.eclipse.edc.identityhub.spi.generator.PresentationCreatorRegistry;
-import org.eclipse.edc.identityhub.spi.model.presentationdefinition.PresentationDefinition;
 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.presentationdefinition.PresentationDefinition;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.junit.jupiter.api.Test;

diff --git a/core/identity-hub-transform/build.gradle.kts b/core/identity-hub-transform/build.gradle.kts
diff --git a/.../java/org/eclipse/edc/identityhub/transform/JsonObjectToPresentationQueryTransformer.java b/.../java/org/eclipse/edc/identityhub/transform/JsonObjectToPresentationQueryTransformer.java