From e4382992a998d0631c2d9f9c9c9b9d39ecbf9a91 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Thu, 6 Feb 2025 12:22:45 +0100 Subject: [PATCH] chore: re-use existing DataModelVersion (#554) --- .../issuer/issuance/issuance.process.md | 8 ++--- .../main/resources/identity-api-version.json | 2 +- .../resources/issuer-admin-api-version.json | 2 +- .../AttestationPipelineImplTest.java | 4 ++- spi/issuance-credentials-spi/build.gradle.kts | 1 + .../model/CredentialDefinition.java | 31 +++++++++---------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/developer/architecture/issuer/issuance/issuance.process.md b/docs/developer/architecture/issuer/issuance/issuance.process.md index c080ce713..3704206cf 100644 --- a/docs/developer/architecture/issuer/issuance/issuance.process.md +++ b/docs/developer/architecture/issuer/issuance/issuance.process.md @@ -144,18 +144,16 @@ This is deserialized to: ```java public class CredentialDefinition { - public enum DataModelType {VCDM_1_1, VCDM_2_0} - private String credentialType; private String schema; private String format; private long validity; - private DataModelType dataModel = DataModelType.VCDM_1_1; + private DataModelVersion dataModel = DataModelVersion.V_1_1; private List attestations = new ArrayList<>(); private List rules = new ArrayList<>(); - private List mappings = new ArrayList<>(); + private final List mappings = new ArrayList<>(); } ``` @@ -343,7 +341,7 @@ public class IssuanceProcess { SUBMITTED, APPROVED, DELIVERED, ERRORED } - private State state = State.SUBMITTED; + private final State state = State.SUBMITTED; private long stateTimestamp; private int retries; private int errorCode; diff --git a/extensions/api/identity-api/api-configuration/src/main/resources/identity-api-version.json b/extensions/api/identity-api/api-configuration/src/main/resources/identity-api-version.json index 04b770a91..7c5883d96 100644 --- a/extensions/api/identity-api/api-configuration/src/main/resources/identity-api-version.json +++ b/extensions/api/identity-api/api-configuration/src/main/resources/identity-api-version.json @@ -2,7 +2,7 @@ { "version": "1.0.0-alpha", "urlPath": "/v1alpha", - "lastUpdated": "2025-01-31T12:00:00Z", + "lastUpdated": "2025-02-06T12:00:00Z", "maturity": null } ] diff --git a/extensions/api/issuer-admin-api/issuer-admin-api-configuration/src/main/resources/issuer-admin-api-version.json b/extensions/api/issuer-admin-api/issuer-admin-api-configuration/src/main/resources/issuer-admin-api-version.json index f7544652b..4960433c7 100644 --- a/extensions/api/issuer-admin-api/issuer-admin-api-configuration/src/main/resources/issuer-admin-api-version.json +++ b/extensions/api/issuer-admin-api/issuer-admin-api-configuration/src/main/resources/issuer-admin-api-version.json @@ -2,7 +2,7 @@ { "version": "1.0.0-alpha", "urlPath": "/v1alpha", - "lastUpdated": "2025-02-03T10:00:00Z", + "lastUpdated": "2025-02-06T10:00:00Z", "maturity": null } ] diff --git a/extensions/issuance/issuance-credentials/src/test/java/org/eclipse/edc/identityhub/issuance/credentials/attestation/AttestationPipelineImplTest.java b/extensions/issuance/issuance-credentials/src/test/java/org/eclipse/edc/identityhub/issuance/credentials/attestation/AttestationPipelineImplTest.java index c31e06445..361db52ca 100644 --- a/extensions/issuance/issuance-credentials/src/test/java/org/eclipse/edc/identityhub/issuance/credentials/attestation/AttestationPipelineImplTest.java +++ b/extensions/issuance/issuance-credentials/src/test/java/org/eclipse/edc/identityhub/issuance/credentials/attestation/AttestationPipelineImplTest.java @@ -21,6 +21,8 @@ import org.eclipse.edc.identityhub.spi.issuance.credentials.model.AttestationDefinition; import org.junit.jupiter.api.Test; +import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -85,7 +87,7 @@ void verify_failFast() { pipeline.registerFactory("testType1", sourceFactory); - var results = pipeline.evaluate(Set.of("a123", "a456"), new DefaultAttestationContext("123", emptyMap())); + var results = pipeline.evaluate(new LinkedHashSet<>(List.of("a123", "a456")), new DefaultAttestationContext("123", emptyMap())); assertThat(results.failed()).isTrue(); verify(store).resolveDefinition("a123"); diff --git a/spi/issuance-credentials-spi/build.gradle.kts b/spi/issuance-credentials-spi/build.gradle.kts index 5fc47d452..2088e55f6 100644 --- a/spi/issuance-credentials-spi/build.gradle.kts +++ b/spi/issuance-credentials-spi/build.gradle.kts @@ -21,6 +21,7 @@ plugins { dependencies { api(libs.edc.spi.core) api(libs.edc.spi.validator) + api(libs.edc.spi.vc) testImplementation(libs.edc.lib.json) diff --git a/spi/issuance-credentials-spi/src/main/java/org/eclipse/edc/identityhub/spi/issuance/credentials/model/CredentialDefinition.java b/spi/issuance-credentials-spi/src/main/java/org/eclipse/edc/identityhub/spi/issuance/credentials/model/CredentialDefinition.java index 711eddcc1..35d27cf8c 100644 --- a/spi/issuance-credentials-spi/src/main/java/org/eclipse/edc/identityhub/spi/issuance/credentials/model/CredentialDefinition.java +++ b/spi/issuance-credentials-spi/src/main/java/org/eclipse/edc/identityhub/spi/issuance/credentials/model/CredentialDefinition.java @@ -14,6 +14,8 @@ package org.eclipse.edc.identityhub.spi.issuance.credentials.model; +import org.eclipse.edc.iam.verifiablecredentials.spi.model.DataModelVersion; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -24,23 +26,23 @@ * Defines credential type that can be issued, its schema, and requirements for issuance. */ public class CredentialDefinition { - public enum DataModelType { VCDM_1_1, VCDM_2_0 } + private final List attestations = new ArrayList<>(); + private final List rules = new ArrayList<>(); + private final List mappings = new ArrayList<>(); private String credentialType; private String schema; private long validity; + private DataModelVersion dataModel = DataModelVersion.V_1_1; - private DataModelType dataModel = DataModelType.VCDM_1_1; - - private List attestations = new ArrayList<>(); - private List rules = new ArrayList<>(); - private List mappings = new ArrayList<>(); + private CredentialDefinition() { + } public String getCredentialType() { return credentialType; } - public DataModelType getDataModel() { + public DataModelVersion getDataModel() { return dataModel; } @@ -64,11 +66,12 @@ public List getMappings() { return mappings; } - private CredentialDefinition() { - } - public static final class Builder { - private CredentialDefinition definition; + private final CredentialDefinition definition; + + private Builder() { + definition = new CredentialDefinition(); + } public static Builder newInstance() { return new Builder(); @@ -89,7 +92,7 @@ public Builder validity(long validity) { return this; } - public Builder dataModel(DataModelType dataModel) { + public Builder dataModel(DataModelVersion dataModel) { this.definition.dataModel = dataModel; return this; } @@ -130,10 +133,6 @@ public CredentialDefinition build() { return definition; } - private Builder() { - definition = new CredentialDefinition(); - } - } }