Skip to content

Commit 435f8a5

Browse files
committed
chore: Minor reformatting
1 parent 73238c4 commit 435f8a5

File tree

1 file changed

+4
-13
lines changed
  • src/main/java/com/danubetech/verifiablecredentials/validation

1 file changed

+4
-13
lines changed

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,21 @@
1313
public class Validation {
1414

1515
private static void validateTrue(boolean valid) {
16-
1716
if (! valid) throw new RuntimeException();
1817
}
1918

2019
private static void validateUrl(URI uri) {
21-
2220
try {
23-
2421
if (! uri.isAbsolute()) throw new URISyntaxException("Not absolute.", uri.toString());
2522
} catch (URISyntaxException ex) {
26-
2723
throw new RuntimeException(ex.getMessage(), ex);
2824
}
2925
}
3026

3127
private static void validateRun(Runnable runnable, String message) throws IllegalStateException {
32-
3328
try {
34-
3529
runnable.run();
3630
} catch (Exception ex) {
37-
3831
if (ex.getMessage() != null && ! ex.getMessage().isEmpty()) message = message + " (" + ex.getMessage().trim() + ")";
3932
throw new IllegalStateException(message, ex);
4033
}
@@ -75,7 +68,6 @@ public static void validate(VerifiablePresentation verifiablePresentation) throw
7568
validateRun(() -> validateTrue(verifiablePresentation.getVerifiableCredential() != null || verifiablePresentation.getJwtVerifiableCredentialString() != null), "Bad or missing 'verifiableCredential'.");
7669
}
7770

78-
7971
public static void validate(VerifiableCredentialV2 verifiableCredential) throws IllegalStateException {
8072

8173
foundation.identity.jsonld.validation.Validation.validate(verifiableCredential);
@@ -89,7 +81,6 @@ public static void validate(VerifiableCredentialV2 verifiableCredential) throws
8981
validateRun(() -> validateTrue(!verifiableCredential.getTypes().isEmpty()), "Bad or missing 'type'.");
9082
validateRun(() -> validateTrue(verifiableCredential.getTypes().contains(VerifiableCredential.DEFAULT_JSONLD_TYPES[0])), "'type' must contain 'VerifiableCredential': " + verifiableCredential.getTypes());
9183

92-
9384
//Issuer validation
9485
validateIssuer(verifiableCredential);
9586
validateRun(() -> validateTrue(verifiableCredential.getValidFrom() != null), "Bad or missing 'validFrom'.");
@@ -104,13 +95,13 @@ public static void validate(VerifiableCredentialV2 verifiableCredential) throws
10495
private static void validateIssuer(VerifiableCredentialV2 verifiableCredential) throws IllegalStateException {
10596

10697
validateRun(() -> validateTrue(verifiableCredential.getIssuer() != null), "Bad or missing 'issuer'.");
107-
if(verifiableCredential.getIssuer() instanceof String )validateRun(() -> validateUrl(URI.create(verifiableCredential.getIssuer().toString())), "'issuer' must be a valid URI.");
108-
else if(verifiableCredential.getIssuer() instanceof Map<?,?>) validateRun(()-> validateUrl(URI.create(((Map<String,Object>)verifiableCredential.getIssuer()).get("id").toString())), "'issuer' must contain be a valid 'id'.");
109-
else validateRun(()-> validateTrue(false),"'issuer' must be a valid URI or object containing an 'id' property.");
98+
if (verifiableCredential.getIssuer() instanceof String issuerString) validateRun(() -> validateUrl(URI.create(issuerString)), "'issuer' must be a valid URI.");
99+
else if (verifiableCredential.getIssuer() instanceof Map<?,?> issuerMap) validateRun(()-> validateUrl(URI.create(((Map<String,Object>) issuerMap).get("id").toString())), "'issuer' must contain be a valid 'id'.");
100+
else validateRun(() -> validateTrue(false),"'issuer' must be a valid URI or object containing an 'id' property.");
110101
}
111102

112103
private static void validateStatus(VerifiableCredentialV2 verifiableCredential) throws IllegalStateException {
113-
if(verifiableCredential.getCredentialStatus() == null) return;
104+
if (verifiableCredential.getCredentialStatus() == null) return;
114105
verifiableCredential.getCredentialStatusAsList().forEach(Validation::validateCredentialStatus);
115106
}
116107

0 commit comments

Comments
 (0)