Fix duplication code (sonar hints)

diff --git a/pf4j/src/main/java/org/pf4j/util/io/AndPathFilter.java b/pf4j/src/main/java/org/pf4j/util/io/AndPathFilter.java
index 74f72d2164eeeac258c2734ea1d96b0f2989218e..25ef905959379865a2eb940fce404a895aa2840f 100644 (file)
--- a/pf4j/src/main/java/org/pf4j/util/io/AndPathFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/io/AndPathFilter.java
@@ -16,9 +16,6 @@
 package org.pf4j.util.io;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -28,39 +25,18 @@ import java.util.List;
  *
  * @author Decebal Suiu
  */
-public class AndPathFilter implements PathFilter {
-
-    /** The list of path filters. */
-    private List<PathFilter> pathFilters;
+public class AndPathFilter extends CompoundPathFilter {
 
     public AndPathFilter() {
-        this(new ArrayList<>());
+        super();
     }
 
     public AndPathFilter(PathFilter... pathFilters) {
-        this(Arrays.asList(pathFilters));
+        super(pathFilters);
     }
 
     public AndPathFilter(List<PathFilter> pathFilters) {
-        this.pathFilters = new ArrayList<>(pathFilters);
-    }
-
-    public AndPathFilter addPathFilter(PathFilter fileFilter) {
-        pathFilters.add(fileFilter);
-
-        return this;
-    }
-
-    public List<PathFilter> getPathFilters() {
-        return Collections.unmodifiableList(pathFilters);
-    }
-
-    public boolean removePathFilter(PathFilter pathFilter) {
-        return pathFilters.remove(pathFilter);
-    }
-
-    public void setPathFilters(List<PathFilter> pathFilters) {
-        this.pathFilters = new ArrayList<>(pathFilters);
+        super(pathFilters);
     }
 
     @Override

diff --git a/pf4j/src/main/java/org/pf4j/util/io/CompoundPathFilter.java b/pf4j/src/main/java/org/pf4j/util/io/CompoundPathFilter.java
new file mode 100644 (file)
index 0000000..c7dfbbd
--- /dev/null
+++ b/pf4j/src/main/java/org/pf4j/util/io/CompoundPathFilter.java
@@ -0,0 +1,46 @@
+package org.pf4j.util.io;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Decebal Suiu
+ */
+public abstract class CompoundPathFilter implements PathFilter {
+
+    /** The list of path filters. */
+    protected List<PathFilter> pathFilters;
+
+    public CompoundPathFilter() {
+        this(new ArrayList<>());
+    }
+
+    public CompoundPathFilter(PathFilter... pathFilters) {
+        this(Arrays.asList(pathFilters));
+    }
+
+    public CompoundPathFilter(List<PathFilter> pathFilters) {
+        this.pathFilters = new ArrayList<>(pathFilters);
+    }
+
+    public CompoundPathFilter addPathFilter(PathFilter fileFilter) {
+        pathFilters.add(fileFilter);
+
+        return this;
+    }
+
+    public List<PathFilter> getPathFilters() {
+        return Collections.unmodifiableList(pathFilters);
+    }
+
+    public boolean removePathFilter(PathFilter pathFilter) {
+        return pathFilters.remove(pathFilter);
+    }
+
+    public void setPathFilters(List<PathFilter> pathFilters) {
+        this.pathFilters = new ArrayList<>(pathFilters);
+    }
+
+}

diff --git a/pf4j/src/main/java/org/pf4j/util/io/OrPathFilter.java b/pf4j/src/main/java/org/pf4j/util/io/OrPathFilter.java
index 52462af9ee1567cb8f64b92104a9f1f353c617f0..b02088a36af79ea853d47d903c1bcd87391e9a61 100644 (file)
--- a/pf4j/src/main/java/org/pf4j/util/io/OrPathFilter.java
+++ b/pf4j/src/main/java/org/pf4j/util/io/OrPathFilter.java
@@ -16,9 +16,6 @@
 package org.pf4j.util.io;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -28,39 +25,18 @@ import java.util.List;
  *
  * @author Decebal Suiu
  */
-public class OrPathFilter implements PathFilter {
-
-    /** The list of io filters. */
-    private List<PathFilter> pathFilters;
+public class OrPathFilter extends CompoundPathFilter {
 
     public OrPathFilter() {
-        this(new ArrayList<>());
+        super();
     }
 
     public OrPathFilter(PathFilter... pathFilters) {
-        this(Arrays.asList(pathFilters));
+        super(pathFilters);
     }
 
     public OrPathFilter(List<PathFilter> pathFilters) {
-        this.pathFilters = new ArrayList<>(pathFilters);
-    }
-
-    public OrPathFilter addPathFilter(PathFilter pathFilter) {
-        pathFilters.add(pathFilter);
-
-        return this;
-    }
-
-    public List<PathFilter> getPathFilters() {
-        return Collections.unmodifiableList(pathFilters);
-    }
-
-    public boolean removePathFilter(PathFilter pathFilter) {
-        return pathFilters.remove(pathFilter);
-    }
-
-    public void setPathFilters(List<PathFilter> pathFilters) {
-        this.pathFilters = new ArrayList<>(pathFilters);
+        super(pathFilters);
     }
 
     @Override