From d59cb7b87931604570b1be0eaec445eae9020e0b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 11 Mar 2018 08:39:20 +0000
Subject: [PATCH] builder: use FastClasspathScanner for Java 8 too

---
 builder/pom.xml                               |  6 -----
 .../builder/DefaultPackageScanner.java        | 27 ++-----------------
 .../builder/DefaultPackageScannerTest.java    | 15 +++--------
 3 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index 73d39c3..18f07d5 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -31,7 +31,6 @@
         <map-builder.version>1.0.0</map-builder.version>
         <mockito.version>2.13.0</mockito.version>
         <assertj.version>3.9.0</assertj.version>
-        <conditional.version>0.3.0</conditional.version>
         <fast-classpath-scanner.version>2.18.1</fast-classpath-scanner.version>
 
         <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
@@ -60,11 +59,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.kemitix</groupId>
-            <artifactId>conditional</artifactId>
-            <version>${conditional.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.github.lukehutch</groupId>
             <artifactId>fast-classpath-scanner</artifactId>
diff --git a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScanner.java b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScanner.java
index 795271a..0628f4d 100644
--- a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScanner.java
+++ b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScanner.java
@@ -21,14 +21,9 @@
 
 package net.kemitix.checkstyle.ruleset.builder;
 
-import com.google.common.reflect.ClassPath;
 import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
-import lombok.RequiredArgsConstructor;
-import net.kemitix.conditional.Value;
 import org.springframework.stereotype.Service;
 
-import java.net.URLClassLoader;
-import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 /**
@@ -37,30 +32,12 @@ import java.util.stream.Stream;
  * @author Paul Campbell (pcampbell@kemitix.net).
  */
 @Service
-@RequiredArgsConstructor
 public class DefaultPackageScanner implements PackageScanner {
 
-    private final ClassPath classPath;
-
     @Override
     public final Stream<String> apply(final RuleSource ruleSource) {
-        return Value.<Stream<String>>where(isJava8())
-                .then(scanPackageByClassPath(ruleSource.getBasePackage()))
-                .otherwise(scanPackageByModulePath(ruleSource.getBasePackage()));
-    }
-
-    private boolean isJava8() {
-        return getClass().getClassLoader() instanceof URLClassLoader;
-    }
-
-    private Supplier<Stream<String>> scanPackageByClassPath(final String basePackage) {
-        return () -> classPath.getTopLevelClassesRecursive(basePackage)
-                .stream()
-                .map(ClassPath.ClassInfo::getName);
-    }
-
-    private Supplier<Stream<String>> scanPackageByModulePath(final String basePackage) {
-        return () -> new FastClasspathScanner(basePackage)
+        final String basePackage = ruleSource.getBasePackage();
+        return new FastClasspathScanner(basePackage)
                 .scan()
                 .getNamesOfAllStandardClasses()
                 .stream()
diff --git a/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScannerTest.java b/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScannerTest.java
index 240d12c..92ca00b 100644
--- a/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScannerTest.java
+++ b/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScannerTest.java
@@ -1,10 +1,7 @@
 package net.kemitix.checkstyle.ruleset.builder;
 
-import com.google.common.reflect.ClassPath;
-import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,16 +13,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class DefaultPackageScannerTest {
 
-    private PackageScanner scanner;
-
-    @Before
-    public void setUp() throws Exception {
-        final ClassPath classPath = ClassPath.from(getClass().getClassLoader());
-        scanner = new DefaultPackageScanner(classPath);
-    }
+    private PackageScanner scanner = new DefaultPackageScanner();
 
     @Test
-    public void canScanCheckstylePackage() throws IOException {
+    public void canScanCheckstylePackage() {
         //when
         final Stream<String> result = scanner.apply(RuleSource.CHECKSTYLE);
         //then
@@ -34,7 +25,7 @@ public class DefaultPackageScannerTest {
     }
 
     @Test
-    public void canScanSevntuPackage() throws IOException {
+    public void canScanSevntuPackage() {
         //when
         final Stream<String> result = scanner.apply(RuleSource.SEVNTU);
         //then