Improve support for table headers

Author: ppkarwasz

log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AbstractAsciidocTreeVisitor.java

@@ -155,10 +155,12 @@ public Void visitEndElement(final EndElementTree node, final AsciidocData data)
             case "ul":
             case "li":
             case "table":
-            case "th":
             case "td":
                 data.popNode();
                 break;
+            case "th":
+                data.popNode().setContext(CellImpl.HEADER_CONTEXT);
+                break;
             case "h1":
             case "h2":
             case "h3":
@@ -205,26 +207,17 @@ public Void visitEndElement(final EndElementTree node, final AsciidocData data)
                 final java.util.List<StructuralNode> cells = table.getBlocks();
                 // First index of the row
                 int idx = 0;
-                for (final Row row : table.getHeader()) {
-                    idx += row.getCells().size();
-                }
                 for (final Row row : table.getBody()) {
                     idx += row.getCells().size();
                 }
                 final Row row = new RowImpl();
-                String context = CellImpl.BODY_CONTEXT;
                 for (int i = idx; i < table.getBlocks().size(); i++) {
                     final StructuralNode cell = cells.get(i);
-                    context = cell.getContext();
                     if (cell instanceof Cell) {
                         row.getCells().add((Cell) cell);
                     }
                 }
-                if (CellImpl.HEADER_CONTEXT.equals(context)) {
-                    table.getHeader().add(row);
-                } else {
-                    table.getBody().add(row);
-                }
+                table.getBody().add(row);
                 break;
             case "code":
                 appendSpan(data, CODE_DELIM);

log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AsciidocData.java

@@ -179,7 +179,7 @@ public StructuralNode pushChildNode(final Function<? super StructuralNode, ? ext
         return currentNode = child;
     }
 
-    public void popNode() {
+    public StructuralNode popNode() {
         final StructuralNode currentNode = this.currentNode;
 
         final StructuralNode parent = (StructuralNode) currentNode.getParent();
@@ -190,5 +190,6 @@ public void popNode() {
         newParagraph(parent);
 
         this.currentNode = parent;
+        return currentNode;
     }
 }

log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/CellImpl.java

@@ -37,6 +37,8 @@ public CellImpl(final ContentNode parent) {
     public void formatTo(final StringBuilder buffer) {
         if (getBlocks().size() > 1) {
             buffer.append('a');
+        } else if (HEADER_CONTEXT.equals(getContext())) {
+            buffer.append('h');
         }
         buffer.append("| ");
         getBlocks().forEach(node -> {

log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/internal/TableImpl.java

@@ -26,7 +26,6 @@
 
 public final class TableImpl extends StructuralNodeImpl implements Table {
 
-    private final List<Row> header = new ArrayList<>();
     private final List<Row> body = new ArrayList<>();
 
     public TableImpl(final ContentNode parent) {
@@ -35,17 +34,11 @@ public TableImpl(final ContentNode parent) {
 
     @Override
     public void formatTo(final StringBuilder buffer) {
-        final int colCount = header.isEmpty()
-                ? body.isEmpty() ? 1 : body.get(0).getCells().size()
-                : header.get(0).getCells().size();
+        final int colCount = body.isEmpty() ? 1 : body.get(0).getCells().size();
 
         buffer.append("[cols=\"");
         formatColSpecifier(colCount, buffer);
-        if (!header.isEmpty()) {
-            buffer.append("\",options=\"headers");
-        }
         buffer.append("\"]\n").append("|===\n");
-        getHeader().forEach(row -> formatRow(row, buffer));
         getBody().forEach(row -> formatRow(row, buffer));
         buffer.append("\n|===\n");
     }
@@ -70,11 +63,6 @@ private void formatRow(final Row row, final StringBuilder buffer) {
         });
     }
 
-    @Override
-    public List<Row> getHeader() {
-        return header;
-    }
-
     @Override
     public List<Row> getBody() {
         return body;
@@ -83,6 +71,11 @@ public List<Row> getBody() {
     //
     // All methods below this line are not implemented.
     //
+    @Override
+    public List<Row> getHeader() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<Row> getFooter() {
         throw new UnsupportedOperationException();

log4j-docgen/src/test/resources/expected/processor/JavadocExample.adoc

@@ -88,7 +88,7 @@ Sed varius justo eget congue lacinia.
 
 == First section
 
-[cols="1,1",options="headers"]
+[cols="1,1"]
 |===
 
 h| Key