Move filters and handlers into their own modules

Torsten Krause · Torsten Krause · commit 98ae8c996028 · 2020-01-13T23:30:48.000+01:00
diff --git a/module/handler/audit/.gitignore b/module/handler/audit/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
diff --git a/module/handler/audit/pom.xml b/module/handler/audit/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>handler-audit</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Markdom - Handler - Audit</name>
+
+	<parent>
+		<groupId>io.markdom</groupId>
+		<artifactId>handler</artifactId>
+		<version>0.0.4-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+
+	</dependencies>
+
+</project>
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/ConsumingNodeKindMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/ConsumingNodeKindMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodekind;
 
 import java.util.function.Consumer;
 
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/GatheringNodeKindMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/GatheringNodeKindMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodekind;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/IdleNodeKindMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/IdleNodeKindMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodekind;
 
 import io.markdom.common.MarkdomNodeKind;
 
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/NodeKindMarkdomAudit.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/NodeKindMarkdomAudit.java
@@ -1,10 +1,11 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodekind;
 
 import java.util.Optional;
 
 import io.markdom.common.MarkdomEmphasisLevel;
 import io.markdom.common.MarkdomHeadingLevel;
 import io.markdom.common.MarkdomNodeKind;
+import io.markdom.handler.AbstractMarkdomAudit;
 import io.markdom.util.ObjectHelper;
 
 public final class NodeKindMarkdomAudit extends AbstractMarkdomAudit {
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/NodeKindMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodekind/NodeKindMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodekind;
 
 import io.markdom.common.MarkdomNodeKind;
 
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/ConsumingNodeTypeMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/ConsumingNodeTypeMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodetype;
 
 import java.util.function.Consumer;
 
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/GatheringNodeTypeMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/GatheringNodeTypeMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodetype;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/IdleNodeTypeMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/IdleNodeTypeMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodetype;
 
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/NodeTypeMarkdomAudit.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/NodeTypeMarkdomAudit.java
@@ -1,11 +1,12 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodetype;
 
 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.AbstractMarkdomAudit;
 import io.markdom.util.ObjectHelper;
 
 public final class NodeTypeMarkdomAudit extends AbstractMarkdomAudit {
diff --git a/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/NodeTypeMarkdomAuditHandler.java b/module/handler/audit/src/main/java/io/markdom/handler/audit/nodetype/NodeTypeMarkdomAuditHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.audit.nodetype;
 
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
diff --git a/module/handler/filter/.gitignore b/module/handler/filter/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
diff --git a/module/handler/filter/pom.xml b/module/handler/filter/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>handler-filter</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Markdom - Handler - Filter</name>
+
+	<parent>
+		<groupId>io.markdom</groupId>
+		<artifactId>handler</artifactId>
+		<version>0.0.4-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+
+	</dependencies>
+
+</project>
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/BlacklistNodeKindMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/BlacklistNodeKindMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodekind;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/IdleNodeKindMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/IdleNodeKindMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodekind;
 
 import io.markdom.common.MarkdomNodeKind;
 
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/NodeKindMarkdomFilter.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/NodeKindMarkdomFilter.java
@@ -1,10 +1,11 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodekind;
 
 import java.util.Optional;
 
 import io.markdom.common.MarkdomEmphasisLevel;
 import io.markdom.common.MarkdomHeadingLevel;
 import io.markdom.common.MarkdomNodeKind;
+import io.markdom.handler.AbstractMarkdomFilter;
 import io.markdom.util.ObjectHelper;
 
 public final class NodeKindMarkdomFilter extends AbstractMarkdomFilter {
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/NodeKindMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/NodeKindMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodekind;
 
 import io.markdom.common.MarkdomNodeKind;
 
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/WhitelistNodeKindMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodekind/WhitelistNodeKindMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodekind;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/BlacklistNodeTypeMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/BlacklistNodeTypeMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodetype;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/IdleNodeTypeMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/IdleNodeTypeMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodetype;
 
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/NodeTypeMarkdomFilter.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/NodeTypeMarkdomFilter.java
@@ -1,11 +1,12 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodetype;
 
 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 {
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/NodeTypeMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/NodeTypeMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodetype;
 
 import io.markdom.common.MarkdomBlockType;
 import io.markdom.common.MarkdomContentType;
diff --git a/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/WhitelistNodeTypeMarkdomFilterHandler.java b/module/handler/filter/src/main/java/io/markdom/handler/filter/nodetype/WhitelistNodeTypeMarkdomFilterHandler.java
@@ -1,4 +1,4 @@
-package io.markdom.handler;
+package io.markdom.handler.filter.nodetype;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/module/handler/pom.xml b/module/handler/pom.xml
@@ -15,7 +15,9 @@
 	</parent>
 
 	<modules>
+		<module>audit</module>
 		<module>commonmark-atlassian</module>
+		<module>filter</module>
 		<module>html-cleaner</module>
 		<module>html-jsoup</module>
 		<module>html-w3c</module>
diff --git a/package/full/pom.xml b/package/full/pom.xml
@@ -22,11 +22,21 @@
 			<artifactId>core</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.markdom</groupId>
+			<artifactId>handler-audit</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.markdom</groupId>
 			<artifactId>handler-commonmark-atlassian</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.markdom</groupId>
+			<artifactId>handler-filter</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.markdom</groupId>
 			<artifactId>handler-html-cleaner</artifactId>
diff --git a/package/suite/pom.xml b/package/suite/pom.xml
@@ -22,11 +22,21 @@
 			<artifactId>core</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.markdom</groupId>
+			<artifactId>handler-audit</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.markdom</groupId>
 			<artifactId>handler-commonmark-atlassian</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.markdom</groupId>
+			<artifactId>handler-filter</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.markdom</groupId>
 			<artifactId>handler-html-jsoup</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
 
 			<dependency>
 				<groupId>io.markdom</groupId>
-				<artifactId>model-basic</artifactId>
+				<artifactId>handler-audit</artifactId>
 				<version>0.0.4-SNAPSHOT</version>
 			</dependency>
 
@@ -79,6 +79,12 @@
 				<version>0.0.4-SNAPSHOT</version>
 			</dependency>
 
+			<dependency>
+				<groupId>io.markdom</groupId>
+				<artifactId>handler-filter</artifactId>
+				<version>0.0.4-SNAPSHOT</version>
+			</dependency>
+
 			<dependency>
 				<groupId>io.markdom</groupId>
 				<artifactId>handler-html-cleaner</artifactId>
@@ -139,6 +145,12 @@
 				<version>0.0.4-SNAPSHOT</version>
 			</dependency>
 
+			<dependency>
+				<groupId>io.markdom</groupId>
+				<artifactId>model-basic</artifactId>
+				<version>0.0.4-SNAPSHOT</version>
+			</dependency>
+
 			<dependency>
 				<groupId>io.markdom</groupId>
 				<artifactId>test</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.markdom.handler;`
	`1`	`+package io.markdom.handler.audit.nodekind;`
`2`	`2`
`3`	`3`	`import java.util.function.Consumer;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.markdom.handler;`
	`1`	`+package io.markdom.handler.audit.nodetype;`
`2`	`2`
`3`	`3`	`import java.util.function.Consumer;`
`4`	`4`