Skip to content

Commit 37df896

Browse files
robinstrobinst
authored
Merge pull request #425 from miasma/clean-ups
Clean ups
2 parents c1f255d + d4c7668 commit 37df896

36 files changed

Lines changed: 100 additions & 304 deletions

File tree

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import org.commonmark.ext.gfm.alerts.internal.AlertMarkdownNodeRenderer;
77
import org.commonmark.parser.Parser;
88
import org.commonmark.renderer.NodeRenderer;
9-
import org.commonmark.renderer.html.HtmlNodeRendererContext;
10-
import org.commonmark.renderer.html.HtmlNodeRendererFactory;
119
import org.commonmark.renderer.html.HtmlRenderer;
1210
import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
1311
import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
@@ -55,12 +53,7 @@ public void extend(Parser.Builder parserBuilder) {
5553

5654
@Override
5755
public void extend(HtmlRenderer.Builder rendererBuilder) {
58-
rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
59-
@Override
60-
public NodeRenderer create(HtmlNodeRendererContext context) {
61-
return new AlertHtmlNodeRenderer(context, customTypes);
62-
}
63-
});
56+
rendererBuilder.nodeRendererFactory(context -> new AlertHtmlNodeRenderer(context, customTypes));
6457
}
6558

6659
@Override

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
import org.commonmark.ext.gfm.strikethrough.internal.StrikethroughTextContentNodeRenderer;
88
import org.commonmark.parser.Parser;
99
import org.commonmark.renderer.NodeRenderer;
10-
import org.commonmark.renderer.html.HtmlNodeRendererContext;
11-
import org.commonmark.renderer.html.HtmlNodeRendererFactory;
1210
import org.commonmark.renderer.html.HtmlRenderer;
1311
import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
1412
import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
1513
import org.commonmark.renderer.markdown.MarkdownRenderer;
16-
import org.commonmark.renderer.text.TextContentNodeRendererContext;
17-
import org.commonmark.renderer.text.TextContentNodeRendererFactory;
1814
import org.commonmark.renderer.text.TextContentRenderer;
1915

2016
import java.util.Set;
@@ -77,22 +73,12 @@ public void extend(Parser.Builder parserBuilder) {
7773

7874
@Override
7975
public void extend(HtmlRenderer.Builder rendererBuilder) {
80-
rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
81-
@Override
82-
public NodeRenderer create(HtmlNodeRendererContext context) {
83-
return new StrikethroughHtmlNodeRenderer(context);
84-
}
85-
});
76+
rendererBuilder.nodeRendererFactory(StrikethroughHtmlNodeRenderer::new);
8677
}
8778

8879
@Override
8980
public void extend(TextContentRenderer.Builder rendererBuilder) {
90-
rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
91-
@Override
92-
public NodeRenderer create(TextContentNodeRendererContext context) {
93-
return new StrikethroughTextContentNodeRenderer(context);
94-
}
95-
});
81+
rendererBuilder.nodeRendererFactory(StrikethroughTextContentNodeRenderer::new);
9682
}
9783

9884
@Override

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
import org.commonmark.ext.gfm.tables.internal.TableTextContentNodeRenderer;
88
import org.commonmark.parser.Parser;
99
import org.commonmark.renderer.NodeRenderer;
10-
import org.commonmark.renderer.html.HtmlNodeRendererContext;
11-
import org.commonmark.renderer.html.HtmlNodeRendererFactory;
1210
import org.commonmark.renderer.html.HtmlRenderer;
1311
import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
1412
import org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
1513
import org.commonmark.renderer.markdown.MarkdownRenderer;
16-
import org.commonmark.renderer.text.TextContentNodeRendererContext;
17-
import org.commonmark.renderer.text.TextContentNodeRendererFactory;
1814
import org.commonmark.renderer.text.TextContentRenderer;
1915

2016
import java.util.Set;
@@ -49,22 +45,12 @@ public void extend(Parser.Builder parserBuilder) {
4945

5046
@Override
5147
public void extend(HtmlRenderer.Builder rendererBuilder) {
52-
rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
53-
@Override
54-
public NodeRenderer create(HtmlNodeRendererContext context) {
55-
return new TableHtmlNodeRenderer(context);
56-
}
57-
});
48+
rendererBuilder.nodeRendererFactory(TableHtmlNodeRenderer::new);
5849
}
5950

6051
@Override
6152
public void extend(TextContentRenderer.Builder rendererBuilder) {
62-
rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
63-
@Override
64-
public NodeRenderer create(TextContentNodeRendererContext context) {
65-
return new TableTextContentNodeRenderer(context);
66-
}
67-
});
53+
rendererBuilder.nodeRendererFactory(TableTextContentNodeRenderer::new);
6854
}
6955

7056
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public static class Factory extends AbstractBlockParserFactory {
274274
@Override
275275
public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
276276
List<SourceLine> paragraphLines = matchedBlockParser.getParagraphLines().getLines();
277-
if (paragraphLines.size() >= 1 && Characters.find('|', paragraphLines.get(paragraphLines.size() - 1).getContent(), 0) != -1) {
277+
if (!paragraphLines.isEmpty() && Characters.find('|', paragraphLines.get(paragraphLines.size() - 1).getContent(), 0) != -1) {
278278
SourceLine line = state.getLine();
279279
SourceLine separatorLine = line.substring(state.getIndex(), line.getContent().length());
280280
List<TableCellInfo> columns = parseSeparator(separatorLine.getContent());

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

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import org.commonmark.node.*;
55
import org.commonmark.parser.IncludeSourceSpans;
66
import org.commonmark.parser.Parser;
7-
import org.commonmark.renderer.html.AttributeProvider;
8-
import org.commonmark.renderer.html.AttributeProviderContext;
97
import org.commonmark.renderer.html.AttributeProviderFactory;
108
import org.commonmark.renderer.html.HtmlRenderer;
119
import org.commonmark.testutil.RenderingTestCase;
1210
import org.junit.jupiter.api.Test;
1311

1412
import java.util.List;
15-
import java.util.Map;
1613
import java.util.Set;
1714

1815
import static org.assertj.core.api.Assertions.assertThat;
@@ -718,25 +715,17 @@ public void interruptsParagraph() {
718715

719716
@Test
720717
public void attributeProviderIsApplied() {
721-
AttributeProviderFactory factory = new AttributeProviderFactory() {
722-
@Override
723-
public AttributeProvider create(AttributeProviderContext context) {
724-
return new AttributeProvider() {
725-
@Override
726-
public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
727-
if (node instanceof TableBlock) {
728-
attributes.put("test", "block");
729-
} else if (node instanceof TableHead) {
730-
attributes.put("test", "head");
731-
} else if (node instanceof TableBody) {
732-
attributes.put("test", "body");
733-
} else if (node instanceof TableRow) {
734-
attributes.put("test", "row");
735-
} else if (node instanceof TableCell) {
736-
attributes.put("test", "cell");
737-
}
738-
}
739-
};
718+
AttributeProviderFactory factory = context -> (node, tagName, attributes) -> {
719+
if (node instanceof TableBlock) {
720+
attributes.put("test", "block");
721+
} else if (node instanceof TableHead) {
722+
attributes.put("test", "head");
723+
} else if (node instanceof TableBody) {
724+
attributes.put("test", "body");
725+
} else if (node instanceof TableRow) {
726+
attributes.put("test", "row");
727+
} else if (node instanceof TableCell) {
728+
attributes.put("test", "cell");
740729
}
741730
};
742731
HtmlRenderer renderer = HtmlRenderer.builder()
@@ -762,17 +751,9 @@ public void setAttributes(Node node, String tagName, Map<String, String> attribu
762751

763752
@Test
764753
public void columnWidthIsRecorded() {
765-
AttributeProviderFactory factory = new AttributeProviderFactory() {
766-
@Override
767-
public AttributeProvider create(AttributeProviderContext context) {
768-
return new AttributeProvider() {
769-
@Override
770-
public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
771-
if (node instanceof TableCell && "th".equals(tagName)) {
772-
attributes.put("width", ((TableCell) node).getWidth() + "em");
773-
}
774-
}
775-
};
754+
AttributeProviderFactory factory = context -> (node, tagName, attributes) -> {
755+
if (node instanceof TableCell && "th".equals(tagName)) {
756+
attributes.put("width", ((TableCell) node).getWidth() + "em");
776757
}
777758
};
778759
HtmlRenderer renderer = HtmlRenderer.builder()

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import org.commonmark.Extension;
44
import org.commonmark.ext.heading.anchor.internal.HeadingIdAttributeProvider;
5-
import org.commonmark.renderer.html.AttributeProvider;
6-
import org.commonmark.renderer.html.AttributeProviderContext;
7-
import org.commonmark.renderer.html.AttributeProviderFactory;
85
import org.commonmark.renderer.html.HtmlRenderer;
96

107
/**
@@ -55,12 +52,7 @@ public static Builder builder() {
5552

5653
@Override
5754
public void extend(HtmlRenderer.Builder rendererBuilder) {
58-
rendererBuilder.attributeProviderFactory(new AttributeProviderFactory() {
59-
@Override
60-
public AttributeProvider create(AttributeProviderContext context) {
61-
return HeadingIdAttributeProvider.create(defaultId, idPrefix, idSuffix);
62-
}
63-
});
55+
rendererBuilder.attributeProviderFactory(context -> HeadingIdAttributeProvider.create(defaultId, idPrefix, idSuffix));
6456
}
6557

6658
public static class Builder {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static Builder builder() {
6666
public String generateId(String text) {
6767
String normalizedIdentity = text != null ? normalizeText(text) : defaultIdentifier;
6868

69-
if (normalizedIdentity.length() == 0) {
69+
if (normalizedIdentity.isEmpty()) {
7070
normalizedIdentity = defaultIdentifier;
7171
}
7272

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import org.commonmark.ext.image.attributes.internal.ImageAttributesAttributeProvider;
55
import org.commonmark.ext.image.attributes.internal.ImageAttributesDelimiterProcessor;
66
import org.commonmark.parser.Parser;
7-
import org.commonmark.renderer.html.AttributeProvider;
8-
import org.commonmark.renderer.html.AttributeProviderContext;
9-
import org.commonmark.renderer.html.AttributeProviderFactory;
107
import org.commonmark.renderer.html.HtmlRenderer;
118

129
/**
@@ -35,11 +32,6 @@ public void extend(Parser.Builder parserBuilder) {
3532

3633
@Override
3734
public void extend(HtmlRenderer.Builder rendererBuilder) {
38-
rendererBuilder.attributeProviderFactory(new AttributeProviderFactory() {
39-
@Override
40-
public AttributeProvider create(AttributeProviderContext context) {
41-
return ImageAttributesAttributeProvider.create();
42-
}
43-
});
35+
rendererBuilder.attributeProviderFactory(context -> ImageAttributesAttributeProvider.create());
4436
}
4537
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ public void setAttributes(Node node, String tagName, final Map<String, String> a
2626
public void visit(CustomNode node) {
2727
if (node instanceof ImageAttributes) {
2828
ImageAttributes imageAttributes = (ImageAttributes) node;
29-
for (Map.Entry<String, String> entry : imageAttributes.getAttributes().entrySet()) {
30-
attributes.put(entry.getKey(), entry.getValue());
31-
}
29+
attributes.putAll(imageAttributes.getAttributes());
3230
// Now that we have used the image attributes we remove the node.
3331
imageAttributes.unlink();
3432
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
7575
node.unlink();
7676
}
7777

78-
if (attributesMap.size() > 0) {
78+
if (!attributesMap.isEmpty()) {
7979
ImageAttributes imageAttributes = new ImageAttributes(attributesMap);
8080

8181
// The new node is added as a child of the image node to which the attributes apply.

0 commit comments

Comments
 (0)