From e27a21553608c7b71e981f087425533b968b00f1 Mon Sep 17 00:00:00 2001
From: Joseph Verron <joseph@verron.pro>
Date: Sun, 22 Sep 2024 22:54:08 +0800
Subject: [PATCH] Refactor exception resolver initialization

Removed the dependency on logger tracing for computing ExceptionResolver. Simplified method calls to static methods of ExceptionResolvers, ensuring consistent behavior regardless of logging settings. This should improve readability and maintainability of the configuration code.
---
 .../core/DocxStamperConfiguration.java         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/src/main/java/pro/verron/officestamper/core/DocxStamperConfiguration.java b/engine/src/main/java/pro/verron/officestamper/core/DocxStamperConfiguration.java
index a3249ef7..eccf2572 100644
--- a/engine/src/main/java/pro/verron/officestamper/core/DocxStamperConfiguration.java
+++ b/engine/src/main/java/pro/verron/officestamper/core/DocxStamperConfiguration.java
@@ -39,7 +39,7 @@ public class DocxStamperConfiguration
     private boolean replaceUnresolvedExpressions = false;
     private String unresolvedExpressionsDefaultValue = null;
     private SpelParserConfiguration spelParserConfiguration = new SpelParserConfiguration();
-    private ExceptionResolver exceptionResolver = computeExceptionResolver(logger.isTraceEnabled());
+    private ExceptionResolver exceptionResolver = computeExceptionResolver();
 
     /**
      * Creates a new configuration with default values.
@@ -102,14 +102,14 @@ public boolean isFailOnUnresolvedExpression() {
     @Deprecated(since = "2.5", forRemoval = true) @Override
     public DocxStamperConfiguration setFailOnUnresolvedExpression(boolean failOnUnresolvedExpression) {
         this.failOnUnresolvedExpression = failOnUnresolvedExpression;
-        this.exceptionResolver = computeExceptionResolver(logger.isTraceEnabled());
+        this.exceptionResolver = computeExceptionResolver();
         return this;
     }
 
-    private ExceptionResolver computeExceptionResolver(boolean tracing) {
-        if (failOnUnresolvedExpression) return new ExceptionResolvers.ThrowingResolver(tracing);
-        if (replaceWithDefaultOnError()) return new ExceptionResolvers.DefaultingResolver(replacementDefault(), tracing);
-        return new ExceptionResolvers.PassingResolver(tracing);
+    private ExceptionResolver computeExceptionResolver() {
+        if (failOnUnresolvedExpression) return ExceptionResolvers.throwing();
+        if (replaceWithDefaultOnError()) return ExceptionResolvers.defaulting(replacementDefault());
+        return ExceptionResolvers.passing();
     }
 
     private boolean replaceWithDefaultOnError() {
@@ -161,7 +161,7 @@ private String replacementDefault() {
     @Deprecated(since = "2.5", forRemoval = true) @Override
     public DocxStamperConfiguration unresolvedExpressionsDefaultValue(String unresolvedExpressionsDefaultValue) {
         this.unresolvedExpressionsDefaultValue = unresolvedExpressionsDefaultValue;
-        this.exceptionResolver = computeExceptionResolver(logger.isTraceEnabled());
+        this.exceptionResolver = computeExceptionResolver();
         return this;
     }
 
@@ -176,7 +176,7 @@ public DocxStamperConfiguration unresolvedExpressionsDefaultValue(String unresol
     @Deprecated(since = "2.5", forRemoval = true) @Override
     public DocxStamperConfiguration replaceUnresolvedExpressions(boolean replaceUnresolvedExpressions) {
         this.replaceUnresolvedExpressions = replaceUnresolvedExpressions;
-        this.exceptionResolver = computeExceptionResolver(logger.isTraceEnabled());
+        this.exceptionResolver = computeExceptionResolver();
         return this;
     }
 
@@ -192,7 +192,7 @@ public DocxStamperConfiguration replaceUnresolvedExpressions(boolean replaceUnre
     @Deprecated(since = "2.5", forRemoval = true) @Override
     public DocxStamperConfiguration leaveEmptyOnExpressionError(boolean leaveEmpty) {
         this.leaveEmptyOnExpressionError = leaveEmpty;
-        this.exceptionResolver = computeExceptionResolver(logger.isTraceEnabled());
+        this.exceptionResolver = computeExceptionResolver();
         return this;
     }