From e735036877e164243e838e1ca747ce6f2da05a2e Mon Sep 17 00:00:00 2001 From: Mustafa Alsalfiti Date: Mon, 18 Dec 2023 15:06:54 +0100 Subject: [PATCH 1/2] fix: add if statement --- .../verifiable/credential/VerifiableCredentialBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java index 9a663148..708af0ff 100644 --- a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java +++ b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java @@ -174,7 +174,9 @@ public VerifiableCredential build() { map.put(VerifiableCredential.TYPE, types); map.put(VerifiableCredential.ISSUER, issuer.toString()); map.put(VerifiableCredential.ISSUANCE_DATE, formatter.format(issuanceDate)); - map.put(VerifiableCredential.EXPIRATION_DATE, formatter.format(expirationDate)); + if (expirationDate != null) { + map.put(VerifiableCredential.EXPIRATION_DATE, formatter.format(expirationDate)); + } map.put(VerifiableCredential.CREDENTIAL_SUBJECT, credentialSubject); if (proof != null) { map.put(VerifiableCredential.PROOF, proof); From f38816b9fafc1c38d8f612406ae4141b305701d1 Mon Sep 17 00:00:00 2001 From: Mustafa Alsalfiti Date: Mon, 18 Dec 2023 15:07:50 +0100 Subject: [PATCH 2/2] fix: sort --- .../verifiable/credential/VerifiableCredentialBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java index 708af0ff..5577df93 100644 --- a/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java +++ b/src/main/java/org/eclipse/tractusx/ssi/lib/model/verifiable/credential/VerifiableCredentialBuilder.java @@ -173,11 +173,11 @@ public VerifiableCredential build() { map.put(VerifiableCredential.ID, id.toString()); map.put(VerifiableCredential.TYPE, types); map.put(VerifiableCredential.ISSUER, issuer.toString()); + map.put(VerifiableCredential.CREDENTIAL_SUBJECT, credentialSubject); map.put(VerifiableCredential.ISSUANCE_DATE, formatter.format(issuanceDate)); if (expirationDate != null) { map.put(VerifiableCredential.EXPIRATION_DATE, formatter.format(expirationDate)); } - map.put(VerifiableCredential.CREDENTIAL_SUBJECT, credentialSubject); if (proof != null) { map.put(VerifiableCredential.PROOF, proof); }