refactor: Another small improvement to extension logging.

decentralized-identity · Aug 15, 2023 · c9812e1 · c9812e1
1 parent de2517b
commit c9812e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/uni-resolver-local/src/main/java/uniresolver/local/LocalUniDereferencer.java b/uni-resolver-local/src/main/java/uniresolver/local/LocalUniDereferencer.java
@@ -170,7 +170,7 @@ private <E extends DereferencerExtension> void executeExtensions(Class<E> extens
         String extensionStage = extensionClass.getAnnotation(DereferencerExtension.ExtensionStage.class).value();
 
         List<E> extensions = this.getExtensions().stream().filter(extensionClass::isInstance).map(extensionClass::cast).toList();
-        if (log.isDebugEnabled()) log.debug("For extension stage '" + extensionStage + "' trying the following extensions: " + DereferencerExtension.extensionClassNames(extensions));
+        if (log.isDebugEnabled()) log.debug("EXTENSIONS (" + extensionStage + "), TRYING: {}", DereferencerExtension.extensionClassNames(extensions));
 
         List<DereferencerExtension> skippedExtensions = new ArrayList<>();
         List<DereferencerExtension> inapplicableExtensions = new ArrayList<>();
@@ -192,7 +192,10 @@ private <E extends DereferencerExtension> void executeExtensions(Class<E> extens
             if (log.isDebugEnabled()) log.debug("Executed extension (" + extensionStage + ") " + extension.getClass().getSimpleName() + " with dereference options " + changedDereferenceOptions + " and dereference result " + changedDereferenceResult + " and execution state " + changedExecutionState);
         }
 
-        if (log.isDebugEnabled()) log.debug("Skipped extensions (" + extensionStage + "): {}, inapplicable extensions (" + extensionStage + "): {}", DereferencerExtension.extensionClassNames(skippedExtensions), DereferencerExtension.extensionClassNames(inapplicableExtensions));
+        if (log.isDebugEnabled()) {
+            List<E> executedExtensions = extensions.stream().filter(e -> ! skippedExtensions.contains(e)).filter(e -> ! inapplicableExtensions.contains(e)).toList();
+            log.debug("EXTENSIONS (" + extensionStage + "), EXECUTED: {}, SKIPPED: {}, INAPPLICABLE: {}", DereferencerExtension.extensionClassNames(executedExtensions), DereferencerExtension.extensionClassNames(skippedExtensions), DereferencerExtension.extensionClassNames(inapplicableExtensions));
+        }
     }
 
     /*

diff --git a/uni-resolver-local/src/main/java/uniresolver/local/LocalUniResolver.java b/uni-resolver-local/src/main/java/uniresolver/local/LocalUniResolver.java
@@ -198,7 +198,7 @@ private <E extends ResolverExtension> void executeExtensions(Class<E> extensionC
 		String extensionStage = extensionClass.getAnnotation(ResolverExtension.ExtensionStage.class).value();
 
 		List<E> extensions = this.getExtensions().stream().filter(extensionClass::isInstance).map(extensionClass::cast).toList();
-		if (log.isDebugEnabled()) log.debug("For extension stage '" + extensionStage + "' trying the following extensions: " + ResolverExtension.extensionClassNames(extensions));
+		if (log.isDebugEnabled()) log.debug("EXTENSIONS (" + extensionStage + "), TRYING: {}", ResolverExtension.extensionClassNames(extensions));
 
 		List<ResolverExtension> skippedExtensions = new ArrayList<>();
 		List<ResolverExtension> inapplicableExtensions = new ArrayList<>();
@@ -220,7 +220,10 @@ private <E extends ResolverExtension> void executeExtensions(Class<E> extensionC
 			if (log.isDebugEnabled()) log.debug("Executed extension (" + extensionStage + ") " + extension.getClass().getSimpleName() + " with resolution options " + changedResolutionOptions + " and resolve result " + changedResolveResult + " and execution state " + changedExecutionState);
 		}
 
-		if (log.isDebugEnabled()) log.debug("Skipped extensions (" + extensionStage + "): {}, inapplicable extensions (" + extensionStage + "): {}", ResolverExtension.extensionClassNames(skippedExtensions), ResolverExtension.extensionClassNames(inapplicableExtensions));
+		if (log.isDebugEnabled()) {
+			List<E> executedExtensions = extensions.stream().filter(e -> ! skippedExtensions.contains(e)).filter(e -> ! inapplicableExtensions.contains(e)).toList();
+			log.debug("EXTENSIONS (" + extensionStage + "), EXECUTED: {}, SKIPPED: {}, INAPPLICABLE: {}", ResolverExtension.extensionClassNames(executedExtensions), ResolverExtension.extensionClassNames(skippedExtensions), ResolverExtension.extensionClassNames(inapplicableExtensions));
+		}
 	}
 
 	@Override