More liberal detection of DID resolution/derefencing result from driver

Author: peacekeeper

driver-http/src/main/java/uniresolver/driver/http/HttpDriver.java

@@ -173,7 +173,7 @@ public ResolveResult resolve(DID did, Map<String, Object> resolutionOptions) thr
 			}
 
 			if (httpStatusCode != 200 && resolveResult == null) {
-				throw new ResolutionException(ResolutionException.ERROR_INTERNAL_ERROR, "Driver cannot retrieve result for " + did + ": " + httpStatusCode + " " + httpStatusMessage + " (" + httpBodyString + ")");
+				throw new ResolutionException(ResolutionException.ERROR_INTERNAL_ERROR, "Driver cannot retrieve RESOLVE result for " + did + ": " + httpStatusCode + " " + httpStatusMessage + " (" + httpBodyString + ")");
 			}
 
 			if (resolveResult != null && resolveResult.isErrorResult()) {
@@ -308,7 +308,7 @@ public DereferenceResult dereference(DIDURL didUrl, Map<String, Object> derefere
 			}
 
 			if (httpStatusCode != 200 && dereferenceResult == null) {
-				throw new DereferencingException(DereferencingException.ERROR_INTERNAL_ERROR, "Driver cannot retrieve result for " + didUrl + ": " + httpStatusCode + " " + httpStatusMessage + " (" + httpBodyString + ")");
+				throw new DereferencingException(DereferencingException.ERROR_INTERNAL_ERROR, "Driver cannot retrieve DEREFERENCE result for " + didUrl + ": " + httpStatusCode + " " + httpStatusMessage + " (" + httpBodyString + ")");
 			}
 
 			if (dereferenceResult != null && dereferenceResult.isErrorResult()) {

uni-resolver-core/src/main/java/uniresolver/util/HttpBindingClientUtil.java

@@ -297,7 +297,7 @@ public static boolean isResolveResultHttpContent(String httpContentString) {
         boolean isResolveResultHttpContent;
         try {
             Map<String, Object> json = objectMapper.readValue(httpContentString, Map.class);
-            isResolveResultHttpContent = json.containsKey("didDocument") || json.containsKey("didDocumentStream");
+            isResolveResultHttpContent = json.containsKey("didResolutionMetadata") || json.containsKey("didDocumentMetadata") || json.containsKey("didDocument") || json.containsKey("didDocumentStream");
         } catch (JsonProcessingException ex) {
             isResolveResultHttpContent = false;
         }
@@ -309,7 +309,7 @@ public static boolean isDereferenceResultHttpContent(String httpContentString) {
         boolean isDereferenceResultHttpContent;
         try {
             Map<String, Object> json = objectMapper.readValue(httpContentString, Map.class);
-            isDereferenceResultHttpContent = json.containsKey("content") || json.containsKey("contentStream");
+            isDereferenceResultHttpContent = json.containsKey("dereferencingMetadata") || json.containsKey("contentMetadata") || json.containsKey("content") || json.containsKey("contentStream");
         } catch (JsonProcessingException ex) {
             isDereferenceResultHttpContent = false;
         }