Various fixes.

Signed-off-by: Markus Sabadello <[email protected]>

Author: peacekeeper

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

@@ -112,9 +112,12 @@ public LdSignature getLdSignature() {
 	public String getId() {
 
 		Object object = this.jsonLdObject.get(JSONLD_TERM_ID);
+		if (object == null) return null;
+
 		if (object instanceof URI) return ((URI) object).toString();
 		if (object instanceof String) return (String) object;
-		return null;
+
+		throw new IllegalStateException("Invalid object for '" + JSONLD_TERM_ID + "': " + object);
 	}
 
 	public void setId(String id) {
@@ -128,9 +131,12 @@ public void setId(String id) {
 	public String getCredentialSubject() {
 
 		Object object = this.getJsonLdCredentialSubject().get(JSONLD_TERM_ID);
+		if (object == null) return null;
+
 		if (object instanceof URI) return ((URI) object).toString();
 		if (object instanceof String) return (String) object;
-		return null;
+
+		throw new IllegalStateException("Invalid object for '" + JSONLD_TERM_ID + "': " + object);
 	}
 
 	public void setCredentialSubject(String subject) {
@@ -157,9 +163,12 @@ public void setContext(List<String> context) {
 	public List<String> getType() {
 
 		Object object = this.jsonLdObject.get(JSONLD_TERM_TYPE);
+		if (object == null) return null;
+
 		if (object instanceof List) return (List<String>) object;
 		if (object instanceof String) return Collections.singletonList((String) object);
-		return null;
+
+		throw new IllegalStateException("Invalid object for '" + JSONLD_TERM_TYPE + "': " + object);
 	}
 
 	public void setType(List<String> type) {

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiablePresentation.java

@@ -47,6 +47,7 @@ public static JwtVerifiablePresentation fromJwtVerifiableCredential(JwtVerifiabl
 		payload.setJwtId("urn:uuid:" + UUID.randomUUID().toString());
 		payload.setIssuer(jwtVerifiableCredential.getPayload().getSubject());
 		payload.setIssuedAtToNow();
+		payload.setNotBefore(payload.getIssuedAt());
 		payload.setClaim(JWT_CLAIM_VP, verifiablePresentation.getJsonLdObject());
 
 		return new JwtVerifiablePresentation(payload, payloadJwtVerifiableCredential, null);