Clean ups

commonmark-ext-gfm-alerts/src/main/java/org/commonmark/ext/gfm/alerts/AlertsExtension.java

@@ -6,8 +6,6 @@
 import org.commonmark.ext.gfm.alerts.internal.AlertMarkdownNodeRenderer;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
@@ -55,12 +53,7 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(HtmlNodeRendererContext context) {
-                return new AlertHtmlNodeRenderer(context, customTypes);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(context -> new AlertHtmlNodeRenderer(context, customTypes));
     }
 
     @Override

commonmark-ext-gfm-strikethrough/src/main/java/org/commonmark/ext/gfm/strikethrough/StrikethroughExtension.java

@@ -7,14 +7,10 @@
 import org.commonmark.ext.gfm.strikethrough.internal.StrikethroughTextContentNodeRenderer;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
 import org.commonmark.renderer.markdown.MarkdownRenderer;
-import org.commonmark.renderer.text.TextContentNodeRendererContext;
-import org.commonmark.renderer.text.TextContentNodeRendererFactory;
 import org.commonmark.renderer.text.TextContentRenderer;
 
 import java.util.Set;
@@ -77,22 +73,12 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(HtmlNodeRendererContext context) {
-                return new StrikethroughHtmlNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(StrikethroughHtmlNodeRenderer::new);
     }
 
     @Override
     public void extend(TextContentRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(TextContentNodeRendererContext context) {
-                return new StrikethroughTextContentNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(StrikethroughTextContentNodeRenderer::new);
     }
 
     @Override

commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/TablesExtension.java

@@ -7,14 +7,10 @@
 import org.commonmark.ext.gfm.tables.internal.TableTextContentNodeRenderer;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
 import org.commonmark.renderer.markdown.MarkdownRenderer;
-import org.commonmark.renderer.text.TextContentNodeRendererContext;
-import org.commonmark.renderer.text.TextContentNodeRendererFactory;
 import org.commonmark.renderer.text.TextContentRenderer;
 
 import java.util.Set;
@@ -49,22 +45,12 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(HtmlNodeRendererContext context) {
-                return new TableHtmlNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(TableHtmlNodeRenderer::new);
     }
 
     @Override
     public void extend(TextContentRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(TextContentNodeRendererContext context) {
-                return new TableTextContentNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(TableTextContentNodeRenderer::new);
     }
 
     @Override

commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java

@@ -274,7 +274,7 @@ public static class Factory extends AbstractBlockParserFactory {
         @Override
         public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
             List<SourceLine> paragraphLines = matchedBlockParser.getParagraphLines().getLines();
-            if (paragraphLines.size() >= 1 && Characters.find('|', paragraphLines.get(paragraphLines.size() - 1).getContent(), 0) != -1) {
+            if (!paragraphLines.isEmpty() && Characters.find('|', paragraphLines.get(paragraphLines.size() - 1).getContent(), 0) != -1) {
                 SourceLine line = state.getLine();
                 SourceLine separatorLine = line.substring(state.getIndex(), line.getContent().length());
                 List<TableCellInfo> columns = parseSeparator(separatorLine.getContent());

commonmark-ext-gfm-tables/src/test/java/org/commonmark/ext/gfm/tables/TablesTest.java

@@ -4,15 +4,12 @@
 import org.commonmark.node.*;
 import org.commonmark.parser.IncludeSourceSpans;
 import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.AttributeProvider;
-import org.commonmark.renderer.html.AttributeProviderContext;
 import org.commonmark.renderer.html.AttributeProviderFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.commonmark.testutil.RenderingTestCase;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -718,25 +715,17 @@ public void interruptsParagraph() {
 
     @Test
     public void attributeProviderIsApplied() {
-        AttributeProviderFactory factory = new AttributeProviderFactory() {
-            @Override
-            public AttributeProvider create(AttributeProviderContext context) {
-                return new AttributeProvider() {
-                    @Override
-                    public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
-                        if (node instanceof TableBlock) {
-                            attributes.put("test", "block");
-                        } else if (node instanceof TableHead) {
-                            attributes.put("test", "head");
-                        } else if (node instanceof TableBody) {
-                            attributes.put("test", "body");
-                        } else if (node instanceof TableRow) {
-                            attributes.put("test", "row");
-                        } else if (node instanceof TableCell) {
-                            attributes.put("test", "cell");
-                        }
-                    }
-                };
+        AttributeProviderFactory factory = context -> (node, tagName, attributes) -> {
+            if (node instanceof TableBlock) {
+                attributes.put("test", "block");
+            } else if (node instanceof TableHead) {
+                attributes.put("test", "head");
+            } else if (node instanceof TableBody) {
+                attributes.put("test", "body");
+            } else if (node instanceof TableRow) {
+                attributes.put("test", "row");
+            } else if (node instanceof TableCell) {
+                attributes.put("test", "cell");
             }
         };
         HtmlRenderer renderer = HtmlRenderer.builder()
@@ -762,17 +751,9 @@ public void setAttributes(Node node, String tagName, Map<String, String> attribu
 
     @Test
     public void columnWidthIsRecorded() {
-        AttributeProviderFactory factory = new AttributeProviderFactory() {
-            @Override
-            public AttributeProvider create(AttributeProviderContext context) {
-                return new AttributeProvider() {
-                    @Override
-                    public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
-                        if (node instanceof TableCell && "th".equals(tagName)) {
-                            attributes.put("width", ((TableCell) node).getWidth() + "em");
-                        }
-                    }
-                };
+        AttributeProviderFactory factory = context -> (node, tagName, attributes) -> {
+            if (node instanceof TableCell && "th".equals(tagName)) {
+                attributes.put("width", ((TableCell) node).getWidth() + "em");
             }
         };
         HtmlRenderer renderer = HtmlRenderer.builder()

commonmark-ext-heading-anchor/src/main/java/org/commonmark/ext/heading/anchor/HeadingAnchorExtension.java

@@ -2,9 +2,6 @@
 
 import org.commonmark.Extension;
 import org.commonmark.ext.heading.anchor.internal.HeadingIdAttributeProvider;
-import org.commonmark.renderer.html.AttributeProvider;
-import org.commonmark.renderer.html.AttributeProviderContext;
-import org.commonmark.renderer.html.AttributeProviderFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 
 /**
@@ -55,12 +52,7 @@ public static Builder builder() {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.attributeProviderFactory(new AttributeProviderFactory() {
-            @Override
-            public AttributeProvider create(AttributeProviderContext context) {
-                return HeadingIdAttributeProvider.create(defaultId, idPrefix, idSuffix);
-            }
-        });
+        rendererBuilder.attributeProviderFactory(context -> HeadingIdAttributeProvider.create(defaultId, idPrefix, idSuffix));
     }
 
     public static class Builder {

commonmark-ext-heading-anchor/src/main/java/org/commonmark/ext/heading/anchor/IdGenerator.java

@@ -66,7 +66,7 @@ public static Builder builder() {
     public String generateId(String text) {
         String normalizedIdentity = text != null ? normalizeText(text) : defaultIdentifier;
 
-        if (normalizedIdentity.length() == 0) {
+        if (normalizedIdentity.isEmpty()) {
             normalizedIdentity = defaultIdentifier;
         }
 

commonmark-ext-image-attributes/src/main/java/org/commonmark/ext/image/attributes/ImageAttributesExtension.java

@@ -4,9 +4,6 @@
 import org.commonmark.ext.image.attributes.internal.ImageAttributesAttributeProvider;
 import org.commonmark.ext.image.attributes.internal.ImageAttributesDelimiterProcessor;
 import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.AttributeProvider;
-import org.commonmark.renderer.html.AttributeProviderContext;
-import org.commonmark.renderer.html.AttributeProviderFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 
 /**
@@ -35,11 +32,6 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.attributeProviderFactory(new AttributeProviderFactory() {
-            @Override
-            public AttributeProvider create(AttributeProviderContext context) {
-                return ImageAttributesAttributeProvider.create();
-            }
-        });
+        rendererBuilder.attributeProviderFactory(context -> ImageAttributesAttributeProvider.create());
     }
 }

commonmark-ext-image-attributes/src/main/java/org/commonmark/ext/image/attributes/internal/ImageAttributesAttributeProvider.java

@@ -26,9 +26,7 @@ public void setAttributes(Node node, String tagName, final Map<String, String> a
                 public void visit(CustomNode node) {
                     if (node instanceof ImageAttributes) {
                         ImageAttributes imageAttributes = (ImageAttributes) node;
-                        for (Map.Entry<String, String> entry : imageAttributes.getAttributes().entrySet()) {
-                            attributes.put(entry.getKey(), entry.getValue());
-                        }
+                        attributes.putAll(imageAttributes.getAttributes());
                         // Now that we have used the image attributes we remove the node.
                         imageAttributes.unlink();
                     }

commonmark-ext-image-attributes/src/main/java/org/commonmark/ext/image/attributes/internal/ImageAttributesDelimiterProcessor.java

@@ -75,7 +75,7 @@ public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
             node.unlink();
         }
 
-        if (attributesMap.size() > 0) {
+        if (!attributesMap.isEmpty()) {
             ImageAttributes imageAttributes = new ImageAttributes(attributesMap);
 
             // The new node is added as a child of the image node to which the attributes apply.

commonmark-ext-ins/src/main/java/org/commonmark/ext/ins/InsExtension.java

@@ -7,14 +7,10 @@
 import org.commonmark.ext.ins.internal.InsTextContentNodeRenderer;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
 import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
 import org.commonmark.renderer.markdown.MarkdownRenderer;
-import org.commonmark.renderer.text.TextContentNodeRendererContext;
-import org.commonmark.renderer.text.TextContentNodeRendererFactory;
 import org.commonmark.renderer.text.TextContentRenderer;
 
 import java.util.Set;
@@ -46,22 +42,12 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(HtmlNodeRendererContext context) {
-                return new InsHtmlNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(InsHtmlNodeRenderer::new);
     }
 
     @Override
     public void extend(TextContentRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(TextContentNodeRendererContext context) {
-                return new InsTextContentNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(InsTextContentNodeRenderer::new);
     }
 
     @Override

commonmark-ext-task-list-items/src/main/java/org/commonmark/ext/task/list/items/TaskListItemsExtension.java

@@ -4,9 +4,6 @@
 import org.commonmark.ext.task.list.items.internal.TaskListItemHtmlNodeRenderer;
 import org.commonmark.ext.task.list.items.internal.TaskListItemPostProcessor;
 import org.commonmark.parser.Parser;
-import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 
 /**
@@ -35,11 +32,6 @@ public void extend(Parser.Builder parserBuilder) {
 
     @Override
     public void extend(HtmlRenderer.Builder rendererBuilder) {
-        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
-            @Override
-            public NodeRenderer create(HtmlNodeRendererContext context) {
-                return new TaskListItemHtmlNodeRenderer(context);
-            }
-        });
+        rendererBuilder.nodeRendererFactory(TaskListItemHtmlNodeRenderer::new);
     }
 }

commonmark-ext-yaml-front-matter/src/main/java/org/commonmark/ext/front/matter/internal/YamlFrontMatterBlockParser.java

@@ -4,8 +4,6 @@
 import org.commonmark.ext.front.matter.YamlFrontMatterNode;
 import org.commonmark.node.Block;
 import org.commonmark.node.Document;
-import org.commonmark.parser.InlineParser;
-import org.commonmark.parser.SourceLine;
 import org.commonmark.parser.block.*;
 
 import java.util.ArrayList;
@@ -37,10 +35,6 @@ public Block getBlock() {
         return block;
     }
 
-    @Override
-    public void addLine(SourceLine line) {
-    }
-
     @Override
     public BlockContinue tryContinue(ParserState parserState) {
         final CharSequence line = parserState.getLine().getContent();
@@ -91,10 +85,6 @@ public BlockContinue tryContinue(ParserState parserState) {
         }
     }
 
-    @Override
-    public void parseInlines(InlineParser inlineParser) {
-    }
-
     private static String parseString(String s) {
         // Limited parsing of https://yaml.org/spec/1.2.2/#73-flow-scalar-styles
         // We assume input is well-formed and otherwise treat it as a plain string. In a real

commonmark-ext-yaml-front-matter/src/test/java/org/commonmark/ext/front/matter/YamlFrontMatterTest.java

@@ -322,8 +322,7 @@ private Map<String, List<String>> getFrontMatter(String input) {
         Node document = PARSER.parse(input);
         document.accept(visitor);
 
-        Map<String, List<String>> data = visitor.getData();
-        return data;
+        return visitor.getData();
     }
 
     // Custom node for tests

commonmark-integration-test/src/test/java/org/commonmark/integration/MarkdownRendererIntegrationTest.java

@@ -1,19 +1,9 @@
 package org.commonmark.integration;
 
-import org.commonmark.Extension;
-import org.commonmark.ext.autolink.AutolinkExtension;
-import org.commonmark.ext.front.matter.YamlFrontMatterExtension;
-import org.commonmark.ext.gfm.strikethrough.StrikethroughExtension;
-import org.commonmark.ext.gfm.tables.TablesExtension;
-import org.commonmark.ext.image.attributes.ImageAttributesExtension;
-import org.commonmark.ext.ins.InsExtension;
-import org.commonmark.ext.task.list.items.TaskListItemsExtension;
 import org.commonmark.parser.Parser;
 import org.commonmark.renderer.markdown.MarkdownRenderer;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MarkdownRendererIntegrationTest {

commonmark-integration-test/src/test/java/org/commonmark/integration/SourceSpanIntegrationTest.java

@@ -2,7 +2,6 @@
 
 import org.commonmark.parser.IncludeSourceSpans;
 import org.commonmark.parser.Parser;
-import org.commonmark.testutil.example.Example;
 
 /**
  * Spec and all extensions, with source spans enabled.