(logging-log4j-tools) branch main updated: Remove remaining `StringBuilderFormattable` occurences

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git


The following commit(s) were added to refs/heads/main by this push:
     new 687d476  Remove remaining `StringBuilderFormattable` occurences
687d476 is described below

commit 687d4769af8008ef188cadccd53c0e2bf15d4865
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Fri Feb 9 14:12:24 2024 +0100

    Remove remaining `StringBuilderFormattable` occurences
---
 .../log4j/docgen/processor/internal/StructuralNodeImpl.java      | 7 +------
 .../logging/log4j/docgen/processor/internal/TableImpl.java       | 9 +--------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git 
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/StructuralNodeImpl.java
 
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/StructuralNodeImpl.java
index b0639ca..65f3e66 100644
--- 
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/StructuralNodeImpl.java
+++ 
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/StructuralNodeImpl.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.docgen.processor.internal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.logging.log4j.util.StringBuilderFormattable;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.ast.Cursor;
 import org.asciidoctor.ast.StructuralNode;
@@ -92,11 +91,7 @@ public abstract class StructuralNodeImpl extends 
ContentNodeImpl implements Stru
             } else {
                 first = false;
             }
-            if (node instanceof final StringBuilderFormattable formattable) {
-                formattable.formatTo(buffer);
-            } else {
-                buffer.append(node.convert());
-            }
+            formatNode(node, buffer);
         }
     }
 
diff --git 
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/TableImpl.java
 
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/TableImpl.java
index aaebada..cb4454a 100644
--- 
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/TableImpl.java
+++ 
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/TableImpl.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.docgen.processor.internal;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.logging.log4j.util.StringBuilderFormattable;
 import org.asciidoctor.ast.Column;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.ast.Row;
@@ -54,13 +53,7 @@ public final class TableImpl extends StructuralNodeImpl 
implements Table {
 
     private static void formatRow(final Row row, final StringBuilder buffer) {
         buffer.append('\n');
-        row.getCells().forEach(cell -> {
-            if (cell instanceof final StringBuilderFormattable formattable) {
-                formattable.formatTo(buffer);
-            } else {
-                buffer.append(cell.convert());
-            }
-        });
+        formatNodeCollection(row.getCells(), "", buffer);
     }
 
     @Override