Skip to content

Commit 6f87625

Browse files
peacekeeperpeacekeeper
committed
Reduced dependency on javax.json.
Signed-off-by: Markus Sabadello <[email protected]>
1 parent e1803b8 commit 6f87625

File tree

16 files changed

+71
-123
lines changed

16 files changed

+71
-123
lines changed

‎src/main/java/com/danubetech/verifiablecredentials/CredentialSubject.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,9 @@
66
import foundation.identity.jsonld.JsonLDKeywords;
77
import foundation.identity.jsonld.JsonLDObject;
88
import foundation.identity.jsonld.JsonLDUtils;
9-
import info.weboftrust.ldsignatures.LdProof;
10-
import info.weboftrust.ldsignatures.jsonld.LDSecurityContexts;
11-
import info.weboftrust.ldsignatures.jsonld.LDSecurityKeywords;
129

13-
import javax.json.JsonObject;
14-
import javax.json.JsonValue;
1510
import java.io.Reader;
1611
import java.net.URI;
17-
import java.util.HashMap;
1812
import java.util.LinkedHashMap;
1913
import java.util.Map;
2014

@@ -28,7 +22,7 @@ private CredentialSubject() {
2822
super(VerifiableCredentialContexts.DOCUMENT_LOADER);
2923
}
3024

31-
public CredentialSubject(JsonObject jsonObject) {
25+
public CredentialSubject(Map<String, Object> jsonObject) {
3226
super(VerifiableCredentialContexts.DOCUMENT_LOADER, jsonObject);
3327
}
3428

@@ -38,7 +32,7 @@ public CredentialSubject(JsonObject jsonObject) {
3832

3933
public static class Builder extends JsonLDObject.Builder<Builder, CredentialSubject> {
4034

41-
private Map<String, JsonValue> claims;
35+
private Map<String, Object> claims;
4236

4337
public Builder(CredentialSubject jsonLDObject) {
4438
super(jsonLDObject);
@@ -50,12 +44,12 @@ public CredentialSubject build() {
5044
super.build();
5145

5246
// add JSON-LD properties
53-
if (this.claims != null) JsonLDUtils.jsonLdAddAllJsonValueMap(this.jsonLDObject, this.claims);
47+
if (this.claims != null) JsonLDUtils.jsonLdAddAll(this.jsonLDObject, this.claims);
5448

5549
return this.jsonLDObject;
5650
}
5751

58-
public Builder claims(Map<String, JsonValue> claims) {
52+
public Builder claims(Map<String, Object> claims) {
5953
this.claims = claims;
6054
return this;
6155
}
@@ -93,8 +87,8 @@ public static void removeFromJsonLdObject(JsonLDObject jsonLdObject) {
9387
* Getters
9488
*/
9589

96-
public Map<String, JsonValue> getClaims() {
97-
Map<String, JsonValue> claims = new LinkedHashMap<>(JsonLDUtils.jsonLdGetAsJsonValueMap(this.getJsonObject()));
90+
public Map<String, Object> getClaims() {
91+
Map<String, Object> claims = new LinkedHashMap<>(this.getJsonObject());
9892
claims.remove(JsonLDKeywords.JSONLD_TERM_ID);
9993
return claims;
10094
}

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.danubetech.verifiablecredentials;
22

3-
import java.io.Reader;
4-
import java.net.URI;
5-
import java.util.Date;
6-
73
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialContexts;
84
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
95
import foundation.identity.jsonld.JsonLDObject;
106
import foundation.identity.jsonld.JsonLDUtils;
117
import info.weboftrust.ldsignatures.LdProof;
128

13-
import javax.json.JsonObject;
9+
import java.io.Reader;
10+
import java.net.URI;
11+
import java.util.Date;
12+
import java.util.Map;
1413

1514
public class VerifiableCredential extends JsonLDObject {
1615

@@ -22,7 +21,7 @@ private VerifiableCredential() {
2221
super(VerifiableCredentialContexts.DOCUMENT_LOADER);
2322
}
2423

25-
public VerifiableCredential(JsonObject jsonObject) {
24+
public VerifiableCredential(Map<String, Object> jsonObject) {
2625
super(VerifiableCredentialContexts.DOCUMENT_LOADER, jsonObject);
2726
}
2827

@@ -48,9 +47,9 @@ public VerifiableCredential build() {
4847
super.build();
4948

5049
// add JSON-LD properties
51-
if (this.issuer != null) JsonLDUtils.jsonLdAddString(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_ISSUER, JsonLDUtils.uriToString(this.issuer));
52-
if (this.issuanceDate != null) JsonLDUtils.jsonLdAddString(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_ISSUANCEDATE, JsonLDUtils.dateToString(this.issuanceDate));
53-
if (this.expirationDate != null) JsonLDUtils.jsonLdAddString(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_EXPIRATIONDATE, JsonLDUtils.dateToString(this.expirationDate));
50+
if (this.issuer != null) JsonLDUtils.jsonLdAdd(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_ISSUER, JsonLDUtils.uriToString(this.issuer));
51+
if (this.issuanceDate != null) JsonLDUtils.jsonLdAdd(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_ISSUANCEDATE, JsonLDUtils.dateToString(this.issuanceDate));
52+
if (this.expirationDate != null) JsonLDUtils.jsonLdAdd(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_EXPIRATIONDATE, JsonLDUtils.dateToString(this.expirationDate));
5453
if (this.credentialSubject != null) this.credentialSubject.addToJsonLDObject(this.jsonLDObject);
5554
if (this.ldProof != null) this.ldProof.addToJsonLDObject(this.jsonLDObject);
5655

‎src/main/java/com/danubetech/verifiablecredentials/VerifiablePresentation.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.danubetech.verifiablecredentials;
22

3-
import java.io.Reader;
4-
import java.net.URI;
5-
63
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialContexts;
74
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
8-
import com.danubetech.verifiablecredentials.validation.Validation;
9-
105
import foundation.identity.jsonld.JsonLDObject;
116
import info.weboftrust.ldsignatures.LdProof;
127

13-
import javax.json.JsonObject;
8+
import java.io.Reader;
9+
import java.net.URI;
10+
import java.util.Map;
1411

1512
public class VerifiablePresentation extends JsonLDObject {
1613

@@ -22,7 +19,7 @@ private VerifiablePresentation() {
2219
super(VerifiableCredentialContexts.DOCUMENT_LOADER);
2320
}
2421

25-
public VerifiablePresentation(JsonObject jsonObject) {
22+
public VerifiablePresentation(Map<String, Object> jsonObject) {
2623
super(VerifiableCredentialContexts.DOCUMENT_LOADER, jsonObject);
2724
}
2825

‎src/main/java/com/danubetech/verifiablecredentials/credentialstatus/RevocationQuery2020Status.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import foundation.identity.jsonld.JsonLDObject;
77
import foundation.identity.jsonld.JsonLDUtils;
88

9-
import javax.json.JsonObject;
109
import java.io.Reader;
1110
import java.net.URI;
11+
import java.util.Map;
1212

1313
public class RevocationQuery2020Status extends JsonLDObject {
1414

@@ -20,7 +20,7 @@ private RevocationQuery2020Status() {
2020
super(VerifiableCredentialContexts.DOCUMENT_LOADER);
2121
}
2222

23-
public RevocationQuery2020Status(JsonObject jsonObject) {
23+
public RevocationQuery2020Status(Map<String, Object> jsonObject) {
2424
super(VerifiableCredentialContexts.DOCUMENT_LOADER, jsonObject);
2525
}
2626

@@ -43,8 +43,8 @@ public RevocationQuery2020Status build() {
4343
super.build();
4444

4545
// add JSON-LD properties
46-
if (this.credentialReference != null) JsonLDUtils.jsonLdAddString(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_CREDENTIALREFERENCE, this.credentialReference);
47-
if (this.revocationService != null) JsonLDUtils.jsonLdAddString(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_REVOCATIONSERVICE, this.revocationService);
46+
if (this.credentialReference != null) JsonLDUtils.jsonLdAdd(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_CREDENTIALREFERENCE, this.credentialReference);
47+
if (this.revocationService != null) JsonLDUtils.jsonLdAdd(this.jsonLDObject, VerifiableCredentialKeywords.JSONLD_TERM_REVOCATIONSERVICE, this.revocationService);
4848

4949
return this.jsonLDObject;
5050
}

‎src/main/java/com/danubetech/verifiablecredentials/jsonld/VerifiableCredentialContexts.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.apicatalog.jsonld.http.media.MediaType;
66
import com.apicatalog.jsonld.loader.DocumentLoader;
77
import foundation.identity.jsonld.ConfigurableDocumentLoader;
8-
import foundation.identity.jsonld.JsonLDObject;
98
import info.weboftrust.ldsignatures.jsonld.LDSecurityContexts;
109

1110
import java.net.URI;

‎src/main/java/com/danubetech/verifiablecredentials/jwt/FromJwtConverter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.danubetech.verifiablecredentials.VerifiablePresentation;
66
import com.nimbusds.jwt.JWTClaimsSet;
77

8-
import java.io.IOException;
98
import java.net.URI;
109
import java.util.Date;
1110

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

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
package com.danubetech.verifiablecredentials.jwt;
22

3-
import java.security.interfaces.RSAPrivateKey;
4-
import java.security.interfaces.RSAPublicKey;
5-
import java.util.Map;
6-
3+
import com.nimbusds.jose.*;
74
import com.nimbusds.jose.util.JSONObjectUtils;
8-
import org.bitcoinj.core.ECKey;
9-
10-
import com.nimbusds.jose.JOSEException;
11-
import com.nimbusds.jose.JWSAlgorithm;
12-
import com.nimbusds.jose.JWSHeader;
13-
import com.nimbusds.jose.JWSObject;
14-
import com.nimbusds.jose.JWSSigner;
15-
import com.nimbusds.jose.JWSVerifier;
16-
import com.nimbusds.jose.Payload;
175
import com.nimbusds.jwt.JWTClaimsSet;
18-
196
import info.weboftrust.ldsignatures.crypto.ByteSigner;
207
import info.weboftrust.ldsignatures.crypto.ByteVerifier;
218
import info.weboftrust.ldsignatures.crypto.adapter.JWSSignerAdapter;
229
import info.weboftrust.ldsignatures.crypto.adapter.JWSVerifierAdapter;
23-
import info.weboftrust.ldsignatures.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
24-
import info.weboftrust.ldsignatures.crypto.impl.Ed25519_EdDSA_PublicKeyVerifier;
25-
import info.weboftrust.ldsignatures.crypto.impl.RSA_RS256_PrivateKeySigner;
26-
import info.weboftrust.ldsignatures.crypto.impl.RSA_RS256_PublicKeyVerifier;
27-
import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PrivateKeySigner;
28-
import info.weboftrust.ldsignatures.crypto.impl.secp256k1_ES256K_PublicKeyVerifier;
10+
import info.weboftrust.ldsignatures.crypto.impl.*;
11+
import org.bitcoinj.core.ECKey;
12+
13+
import java.security.interfaces.RSAPrivateKey;
14+
import java.security.interfaces.RSAPublicKey;
15+
import java.util.Map;
2916

3017
public class JwtObject {
3118

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.danubetech.verifiablecredentials.jwt;
22

3-
import java.io.IOException;
4-
import java.util.Date;
5-
import java.util.UUID;
6-
73
import com.danubetech.verifiablecredentials.VerifiablePresentation;
84
import com.nimbusds.jose.JWSObject;
95
import com.nimbusds.jwt.JWTClaimsSet;
106

7+
import java.io.IOException;
8+
import java.util.Date;
9+
import java.util.UUID;
10+
1111
public class JwtVerifiablePresentation extends JwtWrappingObject<JwtVerifiableCredential> {
1212

1313
private JwtVerifiablePresentation(JWTClaimsSet payload, JwtVerifiableCredential payloadObject, JWSObject jwsObject, String compactSerialization) {

‎src/main/java/com/danubetech/verifiablecredentials/jwt/ToJwtConverter.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,16 @@
33
import com.danubetech.verifiablecredentials.CredentialSubject;
44
import com.danubetech.verifiablecredentials.VerifiableCredential;
55
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
6-
import com.fasterxml.jackson.core.JsonFactory;
76
import com.fasterxml.jackson.core.JsonParseException;
8-
import com.fasterxml.jackson.core.JsonParser;
9-
import com.fasterxml.jackson.core.ObjectCodec;
107
import com.fasterxml.jackson.databind.ObjectMapper;
11-
import com.nimbusds.jose.util.JSONObjectUtils;
128
import com.nimbusds.jwt.JWTClaimsSet;
139
import foundation.identity.jsonld.JsonLDKeywords;
1410
import foundation.identity.jsonld.JsonLDUtils;
1511

1612
import java.io.IOException;
17-
import java.io.StringReader;
1813
import java.net.URI;
19-
import java.text.ParseException;
20-
import java.util.Collections;
2114
import java.util.Date;
2215
import java.util.Map;
23-
import java.util.SortedMap;
2416

2517
public class ToJwtConverter {
2618

‎src/main/java/com/danubetech/verifiablecredentials/validation/Validation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.danubetech.verifiablecredentials.VerifiableCredential;
44
import com.danubetech.verifiablecredentials.VerifiablePresentation;
5-
import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialContexts;
65

76
import java.net.URI;
87
import java.net.URISyntaxException;

0 commit comments

Comments
 (0)