refactor: remove DocumentWalker and integrate docx4j TraversalUtil

Use docx4j TraversalUtil and ClassFinder to replace expressions in paragraphs. This change simplifies the codebase by removing redundant classes and leveraging library utilities.
verronpro · Nov 4, 2024 · c3f2179 · c3f2179
1 parent ff0d1af
commit c3f2179
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 268 deletions.
diff --git a/engine/src/main/java/pro/verron/officestamper/core/BaseDocumentWalker.java b/engine/src/main/java/pro/verron/officestamper/core/BaseDocumentWalker.java
diff --git a/engine/src/main/java/pro/verron/officestamper/core/DocumentWalker.java b/engine/src/main/java/pro/verron/officestamper/core/DocumentWalker.java
diff --git a/...va/pro/verron/officestamper/preset/processors/repeat/ParagraphResolverDocumentWalker.java b/...va/pro/verron/officestamper/preset/processors/repeat/ParagraphResolverDocumentWalker.java
diff --git a/engine/src/main/java/pro/verron/officestamper/preset/processors/repeat/RepeatProcessor.java b/engine/src/main/java/pro/verron/officestamper/preset/processors/repeat/RepeatProcessor.java
@@ -1,13 +1,17 @@
 package pro.verron.officestamper.preset.processors.repeat;
 
+import org.docx4j.TraversalUtil;
 import org.docx4j.XmlUtils;
+import org.docx4j.finders.ClassFinder;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.wml.Comments;
+import org.docx4j.wml.P;
 import org.docx4j.wml.Tbl;
 import org.docx4j.wml.Tr;
 import org.springframework.lang.Nullable;
 import pro.verron.officestamper.api.*;
 import pro.verron.officestamper.core.CommentUtil;
+import pro.verron.officestamper.core.StandardParagraph;
 import pro.verron.officestamper.preset.CommentProcessorFactory;
 
 import java.math.BigInteger;
@@ -82,10 +86,14 @@ private void repeatRows(DocxPart source) {
                     Comments.Comment comment = requireNonNull(commentWrapper.getComment());
                     BigInteger commentId = comment.getId();
                     CommentUtil.deleteCommentFromElements(rowClone.getContent(), commentId);
-                    new ParagraphResolverDocumentWalker(source,
-                            rowClone,
-                            expressionContext,
-                            this.placeholderReplacer).walk();
+                    var classFinder = new ClassFinder(P.class);
+                    TraversalUtil.visit(rowClone, classFinder);
+                    var objects = classFinder.results;
+                    for (Object object : objects) {
+                        P result = (P) object;
+                        StandardParagraph paragraph = StandardParagraph.from(source, result);
+                        placeholderReplacer.resolveExpressionsForParagraph(source, paragraph, expressionContext);
+                    }
                     changes.add(rowClone);
                 }
             }
@@ -102,8 +110,8 @@ private void repeatRows(DocxPart source) {
     /** {@inheritDoc} */
     @Override public void repeatTableRow(@Nullable List<Object> objects) {
         var tr = this.getParagraph()
-                      .parent(Tr.class)
-                      .orElseThrow(OfficeStamperException.throwing("This paragraph is not in a table row."));
+                     .parent(Tr.class)
+                     .orElseThrow(OfficeStamperException.throwing("This paragraph is not in a table row."));
         tableRowsToRepeat.put(tr, objects);
         tableRowsCommentsToRemove.put(tr, getCurrentCommentWrapper());
     }