fix: Handle issuer and issuer object

Author: azuzi

src/main/java/com/danubetech/verifiablecredentials/VerifiableCredentialV2.java

@@ -2,6 +2,10 @@
 
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.danubetech.verifiablecredentials.credentialstatus.CredentialStatus;
+import com.danubetech.verifiablecredentials.extensions.CredentialSchema;
+import com.danubetech.verifiablecredentials.extensions.Evidence;
+import com.danubetech.verifiablecredentials.extensions.RefreshService;
+import com.danubetech.verifiablecredentials.extensions.TermsOfUse;
 import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialContexts;
 import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -14,6 +18,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class VerifiableCredentialV2 extends JsonLDObject {
 
@@ -46,6 +51,13 @@ public static class Builder<B extends Builder<B>> extends JsonLDObject.Builder<B
 		private String description;
 		private LdProof ldProof;
 
+		//extensions
+
+		private List<CredentialSchema> credentialSchema;
+		private Set<Evidence> evidence;
+		private TermsOfUse termsOfUse;
+		private RefreshService refreshService;
+
 		public Builder(VerifiableCredentialV2 jsonLdObject) {
 			super(jsonLdObject);
 			this.forceContextsArray(true);
@@ -69,6 +81,12 @@ public VerifiableCredentialV2 build() {
 			if(this.description != null) JsonLDUtils.jsonLdAdd(this.jsonLdObject, VerifiableCredentialKeywords.JSONLD_TERM_NAME, this.description);
 			if (this.ldProof != null) this.ldProof.addToJsonLDObject(this.jsonLdObject);
 
+			//add extensions
+			if (this.credentialSchema != null) JsonLDUtils.jsonLdAddAsJsonArray(this.jsonLdObject,VerifiableCredentialKeywords.JSONLD_TERM_CREDENTIALSCHEMA, credentialSchema);
+			if (this.termsOfUse != null) this.termsOfUse.addToJsonLDObject(this.jsonLdObject);
+			if (this.evidence != null && !this.evidence.isEmpty()) JsonLDUtils.jsonLdAdd(this.jsonLdObject, VerifiableCredentialKeywords.JSONLD_TERM_EVIDENCE, this.evidence);
+			if (this.refreshService != null) this.refreshService.addToJsonLDObject(this.jsonLdObject);
+
 			return (VerifiableCredentialV2) this.jsonLdObject;
 		}
 
@@ -77,6 +95,11 @@ public B issuer(URI issuer) {
 			return (B) this;
 		}
 
+		public B issuer(Map<String,Object> issuer) {
+			this.issuer = issuer;
+			return (B) this;
+		}
+
 		public B validFrom(Date validFrom) {
 			this.validFrom = validFrom;
 			return (B) this;
@@ -116,6 +139,25 @@ public B description(String description) {
 			this.description = description;
 			return (B) this;
 		}
+
+		public B evidence(Set<Evidence> evidence) {
+			this.evidence = evidence;
+			return (B) this;
+		}
+		public B credentialSchema(List<CredentialSchema> credentialSchema) {
+			this.credentialSchema = credentialSchema;
+			return (B) this;
+		}
+
+		public B termsOfUse(TermsOfUse termsOfUse) {
+			this.termsOfUse = termsOfUse;
+			return (B) this;
+		}
+
+		public B refreshService(RefreshService refreshService) {
+			this.refreshService = refreshService;
+			return (B) this;
+		}
 	}
 
 	public static Builder<? extends Builder<?>> builder() {
@@ -157,7 +199,14 @@ public static void removeFromJsonLdObject(JsonLDObject jsonLdObject) {
 	 */
 
 	public Object getIssuer() {
-		return JsonLDUtils.stringToUri(JsonLDUtils.jsonLdGetStringOrObjectId(this.getJsonObject(), VerifiableCredentialKeywords.JSONLD_TERM_ISSUER));
+		return JsonLDUtils.jsonLdGetJsonValue(this.getJsonObject(), VerifiableCredentialKeywords.JSONLD_TERM_ISSUER);
+	}
+
+	public URI getIssuerUri() {
+
+		Object issuer = JsonLDUtils.jsonLdGetJsonValue(this.getJsonObject(), VerifiableCredentialKeywords.JSONLD_TERM_ISSUER);
+
+		return (issuer instanceof String) ? URI.create(issuer.toString()) : URI.create((((Map<String,Object>)issuer).get(VerifiableCredentialKeywords.JSONLD_TERM_ISSUER)).toString());
 	}
 
 	public Date getValidFrom() {
@@ -190,5 +239,21 @@ public String getDescription(){
 		return JsonLDUtils.jsonLdGetString(this.getJsonObject(), VerifiableCredentialKeywords.JSONLD_TERM_DESCRIPTION);
 	}
 
+	public Set<Evidence> getEvidence() {
+		return (Set<Evidence>) JsonLDUtils.jsonLdGetJsonValue(this.getJsonObject(),VerifiableCredentialKeywords.JSONLD_TERM_EVIDENCE);
+	}
+
+	public List<CredentialSchema> getCredentialSchema() {
+		return (List<CredentialSchema>) JsonLDUtils.jsonLdGetJsonValue(this.getJsonObject(), VerifiableCredentialKeywords.JSONLD_TERM_CREDENTIALSCHEMA);
+	}
+
+	public TermsOfUse getTermsOfUse() {
+		return TermsOfUse.getFromJsonLDObject(this);
+	}
+
+	public RefreshService getRefreshService() {
+		return RefreshService.getFromJsonLDObject(this);
+	}
+
 
 }