Split node type filters into block type and content type filters

Author: Torsten Krause

module/handler/filter/src/main/java/io/markdom/handler/filter/blocktype/BlacklistBlockTypeMarkdomFilterHandler.java

@@ -0,0 +1,22 @@
+package io.markdom.handler.filter.blocktype;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import io.markdom.common.MarkdomBlockType;
+import io.markdom.util.ObjectHelper;
+
+public final class BlacklistBlockTypeMarkdomFilterHandler implements BlockTypeMarkdomFilterHandler {
+
+	private final Set<MarkdomBlockType> blockTypes;
+
+	public BlacklistBlockTypeMarkdomFilterHandler(Set<MarkdomBlockType> blockTypes) {
+		this.blockTypes = EnumSet.copyOf(ObjectHelper.notNull("set of block types", blockTypes));
+	}
+
+	@Override
+	public boolean testBlockType(MarkdomBlockType type) {
+		return blockTypes.contains(type);
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/NodeTypeMarkdomFilter.java renamed to module/handler/filter/src/main/java/io/markdom/handler/filter/blocktype/BlockTypeMarkdomFilter.java

@@ -1,19 +1,17 @@
-package io.markdom.handler.filter.nodetype;
+package io.markdom.handler.filter.blocktype;
 
 import java.util.Optional;
 
 import io.markdom.common.MarkdomBlockType;
-import io.markdom.common.MarkdomContentType;
-import io.markdom.common.MarkdomEmphasisLevel;
 import io.markdom.common.MarkdomHeadingLevel;
 import io.markdom.handler.AbstractMarkdomFilter;
 import io.markdom.util.ObjectHelper;
 
-public final class NodeTypeMarkdomFilter extends AbstractMarkdomFilter {
+public final class BlockTypeMarkdomFilter extends AbstractMarkdomFilter {
 
-	private final NodeTypeMarkdomFilterHandler handler;
+	private final BlockTypeMarkdomFilterHandler handler;
 
-	public NodeTypeMarkdomFilter(NodeTypeMarkdomFilterHandler handler) {
+	public BlockTypeMarkdomFilter(BlockTypeMarkdomFilterHandler handler) {
 		this.handler = ObjectHelper.notNull("handler", handler);
 	}
 
@@ -57,34 +55,4 @@ public boolean testUnorderedListBlock() {
 		return handler.testBlockType(MarkdomBlockType.UNORDERED_LIST);
 	}
 
-	@Override
-	public boolean testCodeContent(String code) {
-		return handler.testContentType(MarkdomContentType.CODE);
-	}
-
-	@Override
-	public boolean testEmphasisContent(MarkdomEmphasisLevel level) {
-		return handler.testContentType(MarkdomContentType.EMPHASIS);
-	}
-
-	@Override
-	public boolean testImageContent(String uri, Optional<String> title, Optional<String> alternative) {
-		return handler.testContentType(MarkdomContentType.IMAGE);
-	}
-
-	@Override
-	public boolean testLineBreakContent(Boolean hard) {
-		return handler.testContentType(MarkdomContentType.LINE_BREAK);
-	}
-
-	@Override
-	public boolean testLinkContent(String uri, Optional<String> title) {
-		return handler.testContentType(MarkdomContentType.LINK);
-	}
-
-	@Override
-	public boolean testTextContent(String text) {
-		return handler.testContentType(MarkdomContentType.TEXT);
-	}
-
 }

module/handler/filter/src/main/java/io/markdom/handler/filter/blocktype/BlockTypeMarkdomFilterHandler.java

@@ -0,0 +1,9 @@
+package io.markdom.handler.filter.blocktype;
+
+import io.markdom.common.MarkdomBlockType;
+
+public interface BlockTypeMarkdomFilterHandler {
+
+	public boolean testBlockType(MarkdomBlockType type);
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/blocktype/IdleBlockTypeMarkdomFilterHandler.java

@@ -0,0 +1,12 @@
+package io.markdom.handler.filter.blocktype;
+
+import io.markdom.common.MarkdomBlockType;
+
+public final class IdleBlockTypeMarkdomFilterHandler implements BlockTypeMarkdomFilterHandler {
+
+	@Override
+	public boolean testBlockType(MarkdomBlockType type) {
+		return false;
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/blocktype/WhitelistBlockTypeMarkdomFilterHandler.java

@@ -0,0 +1,22 @@
+package io.markdom.handler.filter.blocktype;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import io.markdom.common.MarkdomBlockType;
+import io.markdom.util.ObjectHelper;
+
+public final class WhitelistBlockTypeMarkdomFilterHandler implements BlockTypeMarkdomFilterHandler {
+
+	private final Set<MarkdomBlockType> blockTypes;
+
+	public WhitelistBlockTypeMarkdomFilterHandler(Set<MarkdomBlockType> blockTypes) {
+		this.blockTypes = EnumSet.copyOf(ObjectHelper.notNull("set of block types", blockTypes));
+	}
+
+	@Override
+	public boolean testBlockType(MarkdomBlockType type) {
+		return !blockTypes.contains(type);
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/contenttype/BlacklistContentTypeMarkdomFilterHandler.java

@@ -0,0 +1,22 @@
+package io.markdom.handler.filter.contenttype;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import io.markdom.common.MarkdomContentType;
+import io.markdom.util.ObjectHelper;
+
+public final class BlacklistContentTypeMarkdomFilterHandler implements ContentTypeMarkdomFilterHandler {
+
+	private final Set<MarkdomContentType> contentTypes;
+
+	public BlacklistContentTypeMarkdomFilterHandler(Set<MarkdomContentType> contentTypes) {
+		this.contentTypes = EnumSet.copyOf(ObjectHelper.notNull("set of content types", contentTypes));
+	}
+
+	@Override
+	public boolean testContentType(MarkdomContentType type) {
+		return contentTypes.contains(type);
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/contenttype/ContentTypeMarkdomFilter.java

@@ -0,0 +1,48 @@
+package io.markdom.handler.filter.contenttype;
+
+import java.util.Optional;
+
+import io.markdom.common.MarkdomContentType;
+import io.markdom.common.MarkdomEmphasisLevel;
+import io.markdom.handler.AbstractMarkdomFilter;
+import io.markdom.util.ObjectHelper;
+
+public final class ContentTypeMarkdomFilter extends AbstractMarkdomFilter {
+
+	private final ContentTypeMarkdomFilterHandler handler;
+
+	public ContentTypeMarkdomFilter(ContentTypeMarkdomFilterHandler handler) {
+		this.handler = ObjectHelper.notNull("handler", handler);
+	}
+
+	@Override
+	public boolean testCodeContent(String code) {
+		return handler.testContentType(MarkdomContentType.CODE);
+	}
+
+	@Override
+	public boolean testEmphasisContent(MarkdomEmphasisLevel level) {
+		return handler.testContentType(MarkdomContentType.EMPHASIS);
+	}
+
+	@Override
+	public boolean testImageContent(String uri, Optional<String> title, Optional<String> alternative) {
+		return handler.testContentType(MarkdomContentType.IMAGE);
+	}
+
+	@Override
+	public boolean testLineBreakContent(Boolean hard) {
+		return handler.testContentType(MarkdomContentType.LINE_BREAK);
+	}
+
+	@Override
+	public boolean testLinkContent(String uri, Optional<String> title) {
+		return handler.testContentType(MarkdomContentType.LINK);
+	}
+
+	@Override
+	public boolean testTextContent(String text) {
+		return handler.testContentType(MarkdomContentType.TEXT);
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/contenttype/ContentTypeMarkdomFilterHandler.java

@@ -0,0 +1,9 @@
+package io.markdom.handler.filter.contenttype;
+
+import io.markdom.common.MarkdomContentType;
+
+public interface ContentTypeMarkdomFilterHandler {
+
+	public boolean testContentType(MarkdomContentType type);
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/contenttype/IdleContentTypeMarkdomFilterHandler.java

@@ -0,0 +1,12 @@
+package io.markdom.handler.filter.contenttype;
+
+import io.markdom.common.MarkdomContentType;
+
+public final class IdleContentTypeMarkdomFilterHandler implements ContentTypeMarkdomFilterHandler {
+
+	@Override
+	public boolean testContentType(MarkdomContentType type) {
+		return false;
+	}
+
+}

module/handler/filter/src/main/java/io/markdom/handler/filter/contenttype/WhitelistContentTypeMarkdomFilterHandler.java

@@ -0,0 +1,22 @@
+package io.markdom.handler.filter.contenttype;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import io.markdom.common.MarkdomContentType;
+import io.markdom.util.ObjectHelper;
+
+public final class WhitelistContentTypeMarkdomFilterHandler implements ContentTypeMarkdomFilterHandler {
+
+	private final Set<MarkdomContentType> contentTypes;
+
+	public WhitelistContentTypeMarkdomFilterHandler(Set<MarkdomContentType> contentTypes) {
+		this.contentTypes = EnumSet.copyOf(ObjectHelper.notNull("set of content types", contentTypes));
+	}
+
+	@Override
+	public boolean testContentType(MarkdomContentType type) {
+		return !contentTypes.contains(type);
+	}
+
+}