Merge remote-tracking branch 'origin/feat/velocity-network-credential-did-resolution' into feat/velocity-network-credential-did-resolution

Author: sloops77

inspector-clr/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.1edtech</groupId>
 		<artifactId>vc-public-validator</artifactId>
-		<version>1.3.5</version>
+		<version>1.3.6</version>
 	</parent>
 	<artifactId>inspector-clr</artifactId>
 	<dependencies>

inspector-clr/src/main/java/org/oneedtech/inspect/clr/CLR20Inspector.java

@@ -169,9 +169,11 @@ public Report run(Resource resource) {
 			}
 
 			//embedded endorsements
-			EndorsementInspector endorsementInspector = new EndorsementInspector.Builder()
-				.inject(DID_RESOLUTION_SERVICE_URL, this.didResolutionUrl)
-				.build();
+			EndorsementInspector.Builder endorsementInspectorBuilder = new EndorsementInspector.Builder();
+			if (didResolutionUrl != null) {
+				endorsementInspectorBuilder = endorsementInspectorBuilder.inject(DID_RESOLUTION_SERVICE_URL, didResolutionUrl);
+			}
+			EndorsementInspector endorsementInspector = endorsementInspectorBuilder.build();
 
 			List<JsonNode> endorsements = asNodeList(clr.getJson(), "$..endorsement", jsonPath);
 			for(JsonNode node : endorsements) {
@@ -193,9 +195,11 @@ public Report run(Resource resource) {
 			//embedded subject credentials
 			String path = "$.credentialSubject.verifiableCredential";
 			List<JsonNode> vcs = asNodeList(clr.getJson(), path, jsonPath);
-			OB30Inspector obInspector = new OB30Inspector.Builder()
-				.inject(DID_RESOLUTION_SERVICE_URL, this.didResolutionUrl)
-				.build();
+			OB30Inspector.Builder obInspectorBuilder = new OB30Inspector.Builder();
+			if (didResolutionUrl != null) {
+				obInspectorBuilder = obInspectorBuilder.inject(DID_RESOLUTION_SERVICE_URL, this.didResolutionUrl);
+			}
+			OB30Inspector obInspector = obInspectorBuilder.build();
 
 			for (int i = 0; i < vcs.size(); i++) {
 				JsonNode node = vcs.get(i);

inspector-vc-web/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.1edtech</groupId>
         <artifactId>vc-public-validator</artifactId>
-		<version>1.3.5</version>
+		<version>1.3.6</version>
 	</parent>
 	<artifactId>inspector-vc-web</artifactId>
 	<properties>

inspector-vc/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.1edtech</groupId>
 		<artifactId>vc-public-validator</artifactId>
-		<version>1.3.5</version>
+		<version>1.3.6</version>
 	</parent>
 	<artifactId>inspector-vc</artifactId>
 

inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB30Inspector.java

@@ -234,7 +234,11 @@ public Report run(Resource resource, Map<String, GeneratedObject> parentObjects)
 			}
 
 			//embedded endorsements
-			EndorsementInspector endorsementInspector = new EndorsementInspector.Builder().inject(DID_RESOLUTION_SERVICE_URL, didResolutionUrl).build();
+			EndorsementInspector.Builder endorsementInspectorBuilder = new EndorsementInspector.Builder();
+			if (didResolutionUrl != null) {
+				endorsementInspectorBuilder = endorsementInspectorBuilder.inject(DID_RESOLUTION_SERVICE_URL, didResolutionUrl);
+			}
+			EndorsementInspector endorsementInspector = endorsementInspectorBuilder.build();
 
 			List<JsonNode> endorsements = asNodeList(ob.getJson(), "$..endorsement", jsonPath);
 			for(JsonNode node : endorsements) {

inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/did/SimpleDidResolver.java

@@ -35,7 +35,9 @@ public class SimpleDidResolver implements DidResolver {
 
   public SimpleDidResolver(String uniResolverUrl, VelocityNetworkDidResolver velocityNetworkDidResolver) {
     this.uniResolver = new ClientUniResolver();
-    this.uniResolver.setResolveUri(uniResolverUrl);
+    if (uniResolverUrl != null && !uniResolverUrl.isEmpty()) {
+      this.uniResolver.setResolveUri(uniResolverUrl);
+    }
     this.velocityNetworkDidResolver = velocityNetworkDidResolver;
   }
 

pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>org.1edtech</groupId>
   <artifactId>vc-public-validator</artifactId>
-  <version>1.3.5</version>
+  <version>1.3.6</version>
   <name>vc-public-validator</name>
   <packaging>pom</packaging>
   <developers>