filterClasspathElements -> filterClasspathElementsByURL (#468)

lukehutch · lukehutch · commit 7df619741df0 · 2020-08-26T11:12:02.000-06:00
diff --git a/src/main/java/io/github/classgraph/ClassGraph.java b/src/main/java/io/github/classgraph/ClassGraph.java
@@ -524,7 +524,7 @@ public ClassGraph filterClasspathElements(final ClasspathElementFilter classpath
      *            should be scanned, and false if not.
      * @return this (for method chaining).
      */
-    public ClassGraph filterClasspathElements(final ClasspathElementURLFilter classpathElementURLFilter) {
+    public ClassGraph filterClasspathElementsByURL(final ClasspathElementURLFilter classpathElementURLFilter) {
         scanSpec.filterClasspathElements(classpathElementURLFilter);
         return this;
     }
diff --git a/src/main/java/nonapi/io/github/classgraph/classpath/ClasspathOrder.java b/src/main/java/nonapi/io/github/classgraph/classpath/ClasspathOrder.java
@@ -317,7 +317,7 @@ public boolean addClasspathEntry(final Object pathElement, final ClassLoader cla
                                             : new URL(pathElement.toString());
         } catch (final MalformedURLException e1) {
             if (log != null) {
-                log.log("Cannot convert from URI to URL: " + pathElementStr);
+                log.log("Cannot convert to URL: " + pathElement);
             }
             pathElementURL = null;
         }
diff --git a/src/main/java/nonapi/io/github/classgraph/scanspec/ScanSpec.java b/src/main/java/nonapi/io/github/classgraph/scanspec/ScanSpec.java
@@ -307,33 +307,23 @@ public void addClasspathOverride(final Object overrideClasspathElement) {
     }
 
     /**
-     * Add a classpath element filter. The provided {@link ClasspathElementFilter} should return true if the path
-     * string passed to it is a path you want to scan.
+     * Add a classpath element filter. The provided {@link ClasspathElementFilter} or
+     * {@link ClasspathElementURLFilter} should return true if the path string or {@link URL} passed to it is a path
+     * that should be scanned.
      * 
-     * @param classpathElementFilter
+     * @param filterLambda
      *            The classpath element filter to apply to all discovered classpath elements, to decide which should
      *            be scanned.
      */
-    public void filterClasspathElements(final ClasspathElementFilter classpathElementFilter) {
-        if (this.classpathElementFilters == null) {
-            this.classpathElementFilters = new ArrayList<>(2);
+    public void filterClasspathElements(final Object filterLambda) {
+        if (!(filterLambda instanceof ClasspathElementFilter
+                || filterLambda instanceof ClasspathElementURLFilter)) {
+            throw new IllegalArgumentException();
         }
-        this.classpathElementFilters.add(classpathElementFilter);
-    }
-
-    /**
-     * Add a classpath element URL filter. The provided {@link ClasspathElementURLFilter} should return true if the
-     * URL passed to it is one you want to scan.
-     * 
-     * @param classpathElementURLFilter
-     *            The classpath element URL filter to apply to all discovered classpath elements, to decide which
-     *            should be scanned.
-     */
-    public void filterClasspathElements(final ClasspathElementURLFilter classpathElementURLFilter) {
         if (this.classpathElementFilters == null) {
             this.classpathElementFilters = new ArrayList<>(2);
         }
-        this.classpathElementFilters.add(classpathElementURLFilter);
+        this.classpathElementFilters.add(filterLambda);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ public ClassGraph filterClasspathElements(final ClasspathElementFilter classpath`
`524`	`524`	`* should be scanned, and false if not.`
`525`	`525`	`* @return this (for method chaining).`
`526`	`526`	`*/`
`527`		`- public ClassGraph filterClasspathElements(final ClasspathElementURLFilter classpathElementURLFilter) {`
	`527`	`+ public ClassGraph filterClasspathElementsByURL(final ClasspathElementURLFilter classpathElementURLFilter) {`
`528`	`528`	`scanSpec.filterClasspathElements(classpathElementURLFilter);`
`529`	`529`	`return this;`
`530`	`530`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public boolean addClasspathEntry(final Object pathElement, final ClassLoader cla`
`317`	`317`	`: new URL(pathElement.toString());`
`318`	`318`	`} catch (final MalformedURLException e1) {`
`319`	`319`	`if (log != null) {`
`320`		`- log.log("Cannot convert from URI to URL: " + pathElementStr);`
	`320`	`+ log.log("Cannot convert to URL: " + pathElement);`
`321`	`321`	`}`
`322`	`322`	`pathElementURL = null;`
`323`	`323`	`}`