Rename filter and audit delegates to unify naming conventions

Torsten Krause · Torsten Krause · commit f1ccc7ae1115 · 2020-01-12T18:06:50.000+01:00
diff --git a/module/core/src/main/java/io/markdom/handler/AbstractTypeMarkdomAuditHandler.java b/module/core/src/main/java/io/markdom/handler/AbstractTypeMarkdomAuditHandler.java
@@ -3,7 +3,7 @@
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
 
-public abstract class AbstractTypeMarkdomAuditDelegate implements TypeMarkdomAuditDelegate {
+public abstract class AbstractTypeMarkdomAuditHandler implements TypeMarkdomAuditHandler {
 
 	@Override
 	public void onBlockType(MarkdomBlockType type) {
diff --git a/module/core/src/main/java/io/markdom/handler/AbstractTypeMarkdomFilterHandler.java b/module/core/src/main/java/io/markdom/handler/AbstractTypeMarkdomFilterHandler.java
@@ -3,7 +3,7 @@
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
 
-public abstract class AbstractTypeMarkdomFilterDelegate implements TypeMarkdomFilterDelegate {
+public abstract class AbstractTypeMarkdomFilterHandler implements TypeMarkdomFilterHandler {
 
 	@Override
 	public boolean testBlockType(MarkdomBlockType type) {
diff --git a/module/core/src/main/java/io/markdom/handler/BlacklistTypeMarkdomFilterHandler.java b/module/core/src/main/java/io/markdom/handler/BlacklistTypeMarkdomFilterHandler.java
@@ -7,13 +7,13 @@
 import io.markdom.common.MarkdomContentType;
 import io.markdom.util.ObjectHelper;
 
-public final class BlacklistTypeMarkdomFilterDelegate implements TypeMarkdomFilterDelegate {
+public final class BlacklistTypeMarkdomFilterHandler implements TypeMarkdomFilterHandler {
 
 	private final Set<MarkdomBlockType> blockTypes;
 
 	private final Set<MarkdomContentType> contentTypes;
 
-	public BlacklistTypeMarkdomFilterDelegate(Set<MarkdomBlockType> blockTypes, Set<MarkdomContentType> contentTypes) {
+	public BlacklistTypeMarkdomFilterHandler(Set<MarkdomBlockType> blockTypes, Set<MarkdomContentType> contentTypes) {
 		this.blockTypes = EnumSet.copyOf(ObjectHelper.notNull("set of block types", blockTypes));
 		this.contentTypes = EnumSet.copyOf(ObjectHelper.notNull("set of content types", contentTypes));
 	}
diff --git a/module/core/src/main/java/io/markdom/handler/ConsumingTypeMarkdomAuditHandler.java b/module/core/src/main/java/io/markdom/handler/ConsumingTypeMarkdomAuditHandler.java
@@ -6,13 +6,13 @@
 import io.markdom.common.MarkdomContentType;
 import io.markdom.util.ObjectHelper;
 
-public final class ConsumingTypeMarkdomAuditDelegate implements TypeMarkdomAuditDelegate {
+public final class ConsumingTypeMarkdomAuditHandler implements TypeMarkdomAuditHandler {
 
 	private final Consumer<MarkdomBlockType> blockTypesConsumer;
 
 	private final Consumer<MarkdomContentType> contentTypeConsumer;
 
-	public ConsumingTypeMarkdomAuditDelegate(Consumer<MarkdomBlockType> blockTypesConsumer,
+	public ConsumingTypeMarkdomAuditHandler(Consumer<MarkdomBlockType> blockTypesConsumer,
 			Consumer<MarkdomContentType> contentTypeConsumer) {
 		this.blockTypesConsumer = ObjectHelper.notNull("block type consumer", blockTypesConsumer);
 		this.contentTypeConsumer = ObjectHelper.notNull("content type consumer", contentTypeConsumer);
diff --git a/module/core/src/main/java/io/markdom/handler/GatheringTypeMarkdomAuditHandler.java b/module/core/src/main/java/io/markdom/handler/GatheringTypeMarkdomAuditHandler.java
@@ -6,7 +6,7 @@
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
 
-public final class GatheringTypeMarkdomAuditDelegate implements TypeMarkdomAuditDelegate {
+public final class GatheringTypeMarkdomAuditHandler implements TypeMarkdomAuditHandler {
 
 	private final Set<MarkdomBlockType> blockTypes = EnumSet.noneOf(MarkdomBlockType.class);
 
diff --git a/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomAuditDelegate.java b/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomAuditDelegate.java
diff --git a/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomAuditHandler.java b/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomAuditHandler.java
@@ -0,0 +1,5 @@
+package io.markdom.handler;
+
+public final class IdleTypeMarkdomAuditHandler extends AbstractTypeMarkdomAuditHandler {
+
+}
diff --git a/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomFilterDelegate.java b/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomFilterDelegate.java
diff --git a/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomFilterHandler.java b/module/core/src/main/java/io/markdom/handler/IdleTypeMarkdomFilterHandler.java
@@ -0,0 +1,5 @@
+package io.markdom.handler;
+
+public abstract class IdleTypeMarkdomFilterHandler extends AbstractTypeMarkdomFilterHandler {
+
+}
diff --git a/module/core/src/main/java/io/markdom/handler/TypeMarkdomAudit.java b/module/core/src/main/java/io/markdom/handler/TypeMarkdomAudit.java
@@ -10,80 +10,80 @@
 
 public final class TypeMarkdomAudit implements MarkdomAudit {
 
-	private final TypeMarkdomAuditDelegate delegate;
+	private final TypeMarkdomAuditHandler handler;
 
-	public TypeMarkdomAudit(TypeMarkdomAuditDelegate delegate) {
-		this.delegate = ObjectHelper.notNull("delegate", delegate);
+	public TypeMarkdomAudit(TypeMarkdomAuditHandler handler) {
+		this.handler = ObjectHelper.notNull("handler", handler);
 	}
 
 	@Override
 	public void onCodeBlock(String code, Optional<String> hint) {
-		delegate.onBlockType(MarkdomBlockType.CODE);
+		handler.onBlockType(MarkdomBlockType.CODE);
 	}
 
 	@Override
 	public void onCommentBlock() {
-		delegate.onBlockType(MarkdomBlockType.COMMENT);
+		handler.onBlockType(MarkdomBlockType.COMMENT);
 	}
 
 	@Override
 	public void onDivisionBlock() {
-		delegate.onBlockType(MarkdomBlockType.DIVISION);
+		handler.onBlockType(MarkdomBlockType.DIVISION);
 	}
 
 	@Override
 	public void onHeadingBlock(MarkdomHeadingLevel level) {
-		delegate.onBlockType(MarkdomBlockType.HEADING);
+		handler.onBlockType(MarkdomBlockType.HEADING);
 	}
 
 	@Override
 	public void onOrderedListBlock(Integer startIndex) {
-		delegate.onBlockType(MarkdomBlockType.ORDERED_LIST);
+		handler.onBlockType(MarkdomBlockType.ORDERED_LIST);
 	}
 
 	@Override
 	public void onParagraphBlock() {
-		delegate.onBlockType(MarkdomBlockType.PARAGRAPH);
+		handler.onBlockType(MarkdomBlockType.PARAGRAPH);
 	}
 
 	@Override
 	public void onQuoteBlock() {
-		delegate.onBlockType(MarkdomBlockType.QUOTE);
+		handler.onBlockType(MarkdomBlockType.QUOTE);
 	}
 
 	@Override
 	public void onUnorderedListBlock() {
-		delegate.onBlockType(MarkdomBlockType.UNORDERED_LIST);
+		handler.onBlockType(MarkdomBlockType.UNORDERED_LIST);
 	}
 
 	@Override
 	public void onCodeContent(String code) {
-		delegate.onContentType(MarkdomContentType.CODE);
+		handler.onContentType(MarkdomContentType.CODE);
 	}
 
 	@Override
 	public void onEmphasisContent(MarkdomEmphasisLevel level) {
-		delegate.onContentType(MarkdomContentType.EMPHASIS);
+		handler.onContentType(MarkdomContentType.EMPHASIS);
 	}
 
 	@Override
 	public void onImageContent(String uri, Optional<String> title, Optional<String> alternative) {
-		delegate.onContentType(MarkdomContentType.IMAGE);
+		handler.onContentType(MarkdomContentType.IMAGE);
 	}
 
 	@Override
 	public void onLineBreakContent(Boolean hard) {
-		delegate.onContentType(MarkdomContentType.LINE_BREAK);
+		handler.onContentType(MarkdomContentType.LINE_BREAK);
 	}
 
 	@Override
 	public void onLinkContent(String uri, Optional<String> title) {
-		delegate.onContentType(MarkdomContentType.LINK);
+		handler.onContentType(MarkdomContentType.LINK);
 	}
 
 	@Override
 	public void onTextContent(String text) {
-		delegate.onContentType(MarkdomContentType.TEXT);
+		handler.onContentType(MarkdomContentType.TEXT);
 	}
 
 }
diff --git a/module/core/src/main/java/io/markdom/handler/TypeMarkdomAuditHandler.java b/module/core/src/main/java/io/markdom/handler/TypeMarkdomAuditHandler.java
@@ -3,7 +3,7 @@
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
 
-public interface TypeMarkdomAuditDelegate {
+public interface TypeMarkdomAuditHandler {
 
 	public void onBlockType(MarkdomBlockType type);
 
diff --git a/module/core/src/main/java/io/markdom/handler/TypeMarkdomFilter.java b/module/core/src/main/java/io/markdom/handler/TypeMarkdomFilter.java
@@ -10,80 +10,80 @@
 
 public final class TypeMarkdomFilter implements MarkdomFilter {
 
-	private final TypeMarkdomFilterDelegate delegate;
+	private final TypeMarkdomFilterHandler handler;
 
-	public TypeMarkdomFilter(TypeMarkdomFilterDelegate delegate) {
-		this.delegate = ObjectHelper.notNull("delegate", delegate);
+	public TypeMarkdomFilter(TypeMarkdomFilterHandler handler) {
+		this.handler = ObjectHelper.notNull("handler", handler);
 	}
 
 	@Override
 	public boolean testCodeBlock(String code, Optional<String> hint) {
-		return delegate.testBlockType(MarkdomBlockType.CODE);
+		return handler.testBlockType(MarkdomBlockType.CODE);
 	}
 
 	@Override
 	public boolean testCommentBlock() {
-		return delegate.testBlockType(MarkdomBlockType.COMMENT);
+		return handler.testBlockType(MarkdomBlockType.COMMENT);
 	}
 
 	@Override
 	public boolean testDivisionBlock() {
-		return delegate.testBlockType(MarkdomBlockType.DIVISION);
+		return handler.testBlockType(MarkdomBlockType.DIVISION);
 	}
 
 	@Override
 	public boolean testHeadingBlock(MarkdomHeadingLevel level) {
-		return delegate.testBlockType(MarkdomBlockType.HEADING);
+		return handler.testBlockType(MarkdomBlockType.HEADING);
 	}
 
 	@Override
 	public boolean testOrderedListBlock(Integer startIndex) {
-		return delegate.testBlockType(MarkdomBlockType.ORDERED_LIST);
+		return handler.testBlockType(MarkdomBlockType.ORDERED_LIST);
 	}
 
 	@Override
 	public boolean testParagraphBlock() {
-		return delegate.testBlockType(MarkdomBlockType.PARAGRAPH);
+		return handler.testBlockType(MarkdomBlockType.PARAGRAPH);
 	}
 
 	@Override
 	public boolean testQuoteBlock() {
-		return delegate.testBlockType(MarkdomBlockType.QUOTE);
+		return handler.testBlockType(MarkdomBlockType.QUOTE);
 	}
 
 	@Override
 	public boolean testUnorderedListBlock() {
-		return delegate.testBlockType(MarkdomBlockType.UNORDERED_LIST);
+		return handler.testBlockType(MarkdomBlockType.UNORDERED_LIST);
 	}
 
 	@Override
 	public boolean testCodeContent(String code) {
-		return delegate.testContentType(MarkdomContentType.CODE);
+		return handler.testContentType(MarkdomContentType.CODE);
 	}
 
 	@Override
 	public boolean testEmphasisContent(MarkdomEmphasisLevel level) {
-		return delegate.testContentType(MarkdomContentType.EMPHASIS);
+		return handler.testContentType(MarkdomContentType.EMPHASIS);
 	}
 
 	@Override
 	public boolean testImageContent(String uri, Optional<String> title, Optional<String> alternative) {
-		return delegate.testContentType(MarkdomContentType.IMAGE);
+		return handler.testContentType(MarkdomContentType.IMAGE);
 	}
 
 	@Override
 	public boolean testLineBreakContent(Boolean hard) {
-		return delegate.testContentType(MarkdomContentType.LINE_BREAK);
+		return handler.testContentType(MarkdomContentType.LINE_BREAK);
 	}
 
 	@Override
 	public boolean testLinkContent(String uri, Optional<String> title) {
-		return delegate.testContentType(MarkdomContentType.LINK);
+		return handler.testContentType(MarkdomContentType.LINK);
 	}
 
 	@Override
 	public boolean testTextContent(String text) {
-		return delegate.testContentType(MarkdomContentType.TEXT);
+		return handler.testContentType(MarkdomContentType.TEXT);
 	}
 
 }
diff --git a/module/core/src/main/java/io/markdom/handler/TypeMarkdomFilterHandler.java b/module/core/src/main/java/io/markdom/handler/TypeMarkdomFilterHandler.java
@@ -3,7 +3,7 @@
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
 
-public interface TypeMarkdomFilterDelegate {
+public interface TypeMarkdomFilterHandler {
 
 	public boolean testBlockType(MarkdomBlockType type);
 
diff --git a/module/core/src/main/java/io/markdom/handler/WhitelistTypeMarkdomFilterHandler.java b/module/core/src/main/java/io/markdom/handler/WhitelistTypeMarkdomFilterHandler.java
@@ -7,13 +7,13 @@
 import io.markdom.common.MarkdomContentType;
 import io.markdom.util.ObjectHelper;
 
-public final class WhitelistTypeMarkdomFilterDelegate implements TypeMarkdomFilterDelegate {
+public final class WhitelistTypeMarkdomFilterHandler implements TypeMarkdomFilterHandler {
 
 	private final Set<MarkdomBlockType> blockTypes;
 
 	private final Set<MarkdomContentType> contentTypes;
 
-	public WhitelistTypeMarkdomFilterDelegate(Set<MarkdomBlockType> blockTypes, Set<MarkdomContentType> contentTypes) {
+	public WhitelistTypeMarkdomFilterHandler(Set<MarkdomBlockType> blockTypes, Set<MarkdomContentType> contentTypes) {
 		this.blockTypes = EnumSet.copyOf(ObjectHelper.notNull("set of block types", blockTypes));
 		this.contentTypes = EnumSet.copyOf(ObjectHelper.notNull("set of content types", contentTypes));
 	}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package io.markdom.handler;
++
 +public final class IdleTypeMarkdomAuditHandler extends AbstractTypeMarkdomAuditHandler {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -10,80 +10,80 @@`
`10`	`10`
`11`	`11`	`public final class TypeMarkdomAudit implements MarkdomAudit {`
`12`	`12`
`13`		`- private final TypeMarkdomAuditDelegate delegate;`
	`13`	`+ private final TypeMarkdomAuditHandler handler;`
`14`	`14`
`15`		`- public TypeMarkdomAudit(TypeMarkdomAuditDelegate delegate) {`
`16`		`- this.delegate = ObjectHelper.notNull("delegate", delegate);`
	`15`	`+ public TypeMarkdomAudit(TypeMarkdomAuditHandler handler) {`
	`16`	`+ this.handler = ObjectHelper.notNull("handler", handler);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`public void onCodeBlock(String code, Optional<String> hint) {`
`21`		`- delegate.onBlockType(MarkdomBlockType.CODE);`
	`21`	`+ handler.onBlockType(MarkdomBlockType.CODE);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public void onCommentBlock() {`
`26`		`- delegate.onBlockType(MarkdomBlockType.COMMENT);`
	`26`	`+ handler.onBlockType(MarkdomBlockType.COMMENT);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void onDivisionBlock() {`
`31`		`- delegate.onBlockType(MarkdomBlockType.DIVISION);`
	`31`	`+ handler.onBlockType(MarkdomBlockType.DIVISION);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public void onHeadingBlock(MarkdomHeadingLevel level) {`
`36`		`- delegate.onBlockType(MarkdomBlockType.HEADING);`
	`36`	`+ handler.onBlockType(MarkdomBlockType.HEADING);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public void onOrderedListBlock(Integer startIndex) {`
`41`		`- delegate.onBlockType(MarkdomBlockType.ORDERED_LIST);`
	`41`	`+ handler.onBlockType(MarkdomBlockType.ORDERED_LIST);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`public void onParagraphBlock() {`
`46`		`- delegate.onBlockType(MarkdomBlockType.PARAGRAPH);`
	`46`	`+ handler.onBlockType(MarkdomBlockType.PARAGRAPH);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`	`50`	`public void onQuoteBlock() {`
`51`		`- delegate.onBlockType(MarkdomBlockType.QUOTE);`
	`51`	`+ handler.onBlockType(MarkdomBlockType.QUOTE);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public void onUnorderedListBlock() {`
`56`		`- delegate.onBlockType(MarkdomBlockType.UNORDERED_LIST);`
	`56`	`+ handler.onBlockType(MarkdomBlockType.UNORDERED_LIST);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public void onCodeContent(String code) {`
`61`		`- delegate.onContentType(MarkdomContentType.CODE);`
	`61`	`+ handler.onContentType(MarkdomContentType.CODE);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`	`65`	`public void onEmphasisContent(MarkdomEmphasisLevel level) {`
`66`		`- delegate.onContentType(MarkdomContentType.EMPHASIS);`
	`66`	`+ handler.onContentType(MarkdomContentType.EMPHASIS);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`
`70`	`70`	`public void onImageContent(String uri, Optional<String> title, Optional<String> alternative) {`
`71`		`- delegate.onContentType(MarkdomContentType.IMAGE);`
	`71`	`+ handler.onContentType(MarkdomContentType.IMAGE);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`	`75`	`public void onLineBreakContent(Boolean hard) {`
`76`		`- delegate.onContentType(MarkdomContentType.LINE_BREAK);`
	`76`	`+ handler.onContentType(MarkdomContentType.LINE_BREAK);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Override`
`80`	`80`	`public void onLinkContent(String uri, Optional<String> title) {`
`81`		`- delegate.onContentType(MarkdomContentType.LINK);`
	`81`	`+ handler.onContentType(MarkdomContentType.LINK);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`	`85`	`public void onTextContent(String text) {`
`86`		`- delegate.onContentType(MarkdomContentType.TEXT);`
	`86`	`+ handler.onContentType(MarkdomContentType.TEXT);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`}`