feat: Convenience object for pure JWT applications.

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

Author: peacekeeper

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

@@ -25,21 +25,17 @@
 import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PrivateKeySigner;
 import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PublicKeyVerifier;
 
-abstract class JwtObject <T> {
+public class JwtObject {
 
 	private final JWTClaimsSet payload;
-	private final T payloadObject;
-
 	private JWSObject jwsObject;
 	private String compactSerialization;
 
-	protected JwtObject(JWTClaimsSet payload, T payloadObject, JWSObject jwsObject, String compactSerialization) {
+	public JwtObject(JWTClaimsSet payload, JWSObject jwsObject, String compactSerialization) {
 
 		if (payload == null) throw new NullPointerException();
-		if (payloadObject == null) throw new NullPointerException();
 
 		this.payload = payload;
-		this.payloadObject = payloadObject;
 		this.jwsObject = jwsObject;
 		this.compactSerialization = compactSerialization;
 	}
@@ -183,11 +179,6 @@ public JWTClaimsSet getPayload() {
 		return this.payload;
 	}
 
-	public T getPayloadObject() {
-
-		return this.payloadObject;
-	}
-
 	public JWSObject getJwsObject() {
 
 		return this.jwsObject;

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

@@ -14,7 +14,7 @@
 
 import net.minidev.json.JSONObject;
 
-public class JwtVerifiableCredential extends JwtObject<VerifiableCredential> {
+public class JwtVerifiableCredential extends JwtWrappingObject<VerifiableCredential> {
 
 	public static final String JWT_CLAIM_VC = "vc";
 

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

@@ -8,7 +8,7 @@
 import com.nimbusds.jose.JWSObject;
 import com.nimbusds.jwt.JWTClaimsSet;
 
-public class JwtVerifiablePresentation extends JwtObject<JwtVerifiableCredential> {
+public class JwtVerifiablePresentation extends JwtWrappingObject<JwtVerifiableCredential> {
 
 	public static final String JWT_CLAIM_VP = "vp";
 

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

@@ -0,0 +1,27 @@
+package com.danubetech.verifiablecredentials.jwt;
+
+import com.nimbusds.jose.JWSObject;
+import com.nimbusds.jwt.JWTClaimsSet;
+
+public abstract class JwtWrappingObject <T> extends JwtObject {
+
+	private final T payloadObject;
+
+	protected JwtWrappingObject(JWTClaimsSet payload, T payloadObject, JWSObject jwsObject, String compactSerialization) {
+
+		super(payload, jwsObject, compactSerialization);
+
+		if (payloadObject == null) throw new NullPointerException();
+		
+		this.payloadObject = payloadObject;
+	}
+
+	/*
+	 * Getters
+	 */
+
+	public T getPayloadObject() {
+
+		return this.payloadObject;
+	}
+}