refactor: Remove unnecessary metadata from exception.

peacekeeper · peacekeeper · commit 0e623d47b7a8 · 2021-11-27T16:22:43.000+01:00
diff --git a/uni-resolver-core/src/main/java/uniresolver/ResolutionException.java b/uni-resolver-core/src/main/java/uniresolver/ResolutionException.java
@@ -8,7 +8,6 @@
 public class ResolutionException extends Exception {
 
 	private String error = null;
-	private Map<String, Object> didResolutionMetadata = null;
 
 	private ResolveRepresentationResult resolveRepresentationResult;
 
@@ -17,39 +16,19 @@ public ResolutionException(String error, String message) {
 		this.error = error;
 	}
 
-	public ResolutionException(String error, String message, Map<String, Object> didResolutionMetadata) {
-		super(message);
-		this.error = error;
-		this.didResolutionMetadata = didResolutionMetadata;
-	}
-
 	public ResolutionException(String error, String message, Throwable ex) {
 		super(message, ex);
 		this.error = error;
 	}
 
-	public ResolutionException(String error, String message, Map<String, Object> didResolutionMetadata, Throwable ex) {
-		super(message, ex);
-		this.error = error;
-		this.didResolutionMetadata = didResolutionMetadata;
-	}
-
 	public ResolutionException(String message) {
 		this(ResolveResult.ERROR_INTERNALERROR, message);
 	}
 
-	public ResolutionException(String message, Map<String, Object> didResolutionMetadata) {
-		this(ResolveResult.ERROR_INTERNALERROR, message, didResolutionMetadata);
-	}
-
 	public ResolutionException(String message, Throwable ex) {
 		this(ResolveResult.ERROR_INTERNALERROR, message, ex);
 	}
 
-	public ResolutionException(String message, Map<String, Object> didResolutionMetadata, Throwable ex) {
-		this(ResolveResult.ERROR_INTERNALERROR, message, didResolutionMetadata, ex);
-	}
-
 	public ResolutionException(ResolveRepresentationResult resolveRepresentationResult) {
 		this(resolveRepresentationResult.getError(), resolveRepresentationResult.getErrorMessage());
 		if (! resolveRepresentationResult.isErrorResult()) throw new IllegalArgumentException("No error result: " + resolveRepresentationResult);
@@ -68,14 +47,6 @@ public void setError(String error) {
 		this.error = error;
 	}
 
-	public Map<String, Object> getDidResolutionMetadata() {
-		return didResolutionMetadata;
-	}
-
-	public void setDidResolutionMetadata(Map<String, Object> didResolutionMetadata) {
-		this.didResolutionMetadata = didResolutionMetadata;
-	}
-
 	public ResolveRepresentationResult getResolveRepresentationResult() {
 		return resolveRepresentationResult;
 	}
diff --git a/uni-resolver-core/src/main/java/uniresolver/result/ResolveRepresentationResult.java b/uni-resolver-core/src/main/java/uniresolver/result/ResolveRepresentationResult.java
@@ -50,9 +50,8 @@ public static ResolveRepresentationResult build() {
 		return new ResolveRepresentationResult(new LinkedHashMap<>(), new byte[0], new LinkedHashMap<>());
 	}
 
-	public static ResolveRepresentationResult makeErrorResult(String error, String errorMessage, Map<String, Object> didResolutionMetadata, String contentType) {
+	public static ResolveRepresentationResult makeErrorResult(String error, String errorMessage, String contentType) {
 		ResolveRepresentationResult resolveRepresentationResult = ResolveRepresentationResult.build();
-		if (didResolutionMetadata != null) resolveRepresentationResult.getDidResolutionMetadata().putAll(didResolutionMetadata);
 		resolveRepresentationResult.setError(error == null ? ERROR_INTERNALERROR : error);
 		if (errorMessage != null) resolveRepresentationResult.setErrorMessage(errorMessage);
 		resolveRepresentationResult.setContentType(contentType);
@@ -65,7 +64,7 @@ public static ResolveRepresentationResult makeErrorResult(ResolutionException ex
 		if (ex.getResolveRepresentationResult() != null && contentType.equals(ex.getResolveRepresentationResult().getContentType())) {
 			return ex.getResolveRepresentationResult();
 		}
-		return makeErrorResult(ex.getError(), ex.getMessage(), ex.getDidResolutionMetadata(), contentType);
+		return makeErrorResult(ex.getError(), ex.getMessage(), contentType);
 	}
 
 	/*
diff --git a/uni-resolver-local/src/main/java/uniresolver/local/LocalUniResolver.java b/uni-resolver-local/src/main/java/uniresolver/local/LocalUniResolver.java
@@ -140,7 +140,7 @@ private ResolveResult resolveOrResolveRepresentation(String didString, Map<Strin
 
 		if (! resolveResult.isComplete()) {
 			if (log.isInfoEnabled()) log.info("Resolve result is incomplete: " + resolveResult);
-			throw new ResolutionException(ResolveResult.ERROR_NOTFOUND, "No resolve result for " + didString, resolveResult.getDidResolutionMetadata());
+			throw new ResolutionException(ResolveResult.ERROR_NOTFOUND, "No resolve result for " + didString);
 		}
 
 		// done

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,8 @@ public static ResolveRepresentationResult build() {`
`50`	`50`	`return new ResolveRepresentationResult(new LinkedHashMap<>(), new byte[0], new LinkedHashMap<>());`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static ResolveRepresentationResult makeErrorResult(String error, String errorMessage, Map<String, Object> didResolutionMetadata, String contentType) {`
	`53`	`+ public static ResolveRepresentationResult makeErrorResult(String error, String errorMessage, String contentType) {`
`54`	`54`	`ResolveRepresentationResult resolveRepresentationResult = ResolveRepresentationResult.build();`
`55`		`- if (didResolutionMetadata != null) resolveRepresentationResult.getDidResolutionMetadata().putAll(didResolutionMetadata);`
`56`	`55`	`resolveRepresentationResult.setError(error == null ? ERROR_INTERNALERROR : error);`
`57`	`56`	`if (errorMessage != null) resolveRepresentationResult.setErrorMessage(errorMessage);`
`58`	`57`	`resolveRepresentationResult.setContentType(contentType);`
`@@ -65,7 +64,7 @@ public static ResolveRepresentationResult makeErrorResult(ResolutionException ex`
`65`	`64`	`if (ex.getResolveRepresentationResult() != null && contentType.equals(ex.getResolveRepresentationResult().getContentType())) {`
`66`	`65`	`return ex.getResolveRepresentationResult();`
`67`	`66`	`}`
`68`		`- return makeErrorResult(ex.getError(), ex.getMessage(), ex.getDidResolutionMetadata(), contentType);`
	`67`	`+ return makeErrorResult(ex.getError(), ex.getMessage(), contentType);`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private ResolveResult resolveOrResolveRepresentation(String didString, Map<Strin`
`140`	`140`
`141`	`141`	`if (! resolveResult.isComplete()) {`
`142`	`142`	`if (log.isInfoEnabled()) log.info("Resolve result is incomplete: " + resolveResult);`
`143`		`- throw new ResolutionException(ResolveResult.ERROR_NOTFOUND, "No resolve result for " + didString, resolveResult.getDidResolutionMetadata());`
	`143`	`+ throw new ResolutionException(ResolveResult.ERROR_NOTFOUND, "No resolve result for " + didString);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`// done`