Integrate new Finder to honor which files to be analyzed

Author: filipesperandio

bin/codeclimate-sonar

@@ -12,5 +12,6 @@ java \
   -Djava.awt.headless=true  \
   -Dsonarlint.home="${BUILD_DIR}"  \
   -Dproject.home="${CODE_DIR}"  \
+  -Dconfig="/config.json"  \
   -Dorg.freemarker.loggerLibrary=none  \
   cc.App --src "**/*.java" $@

src/main/java/cc/Config.java

@@ -5,15 +5,22 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.stream.JsonReader;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class Config {
-    List<String> includePaths;
+    public List<String> includePaths = Arrays.asList("");
 
-    public static Config from(String file) throws FileNotFoundException {
-        return gson().fromJson(new JsonReader(new FileReader(file)), Config.class);
+    public static Config from(String file) {
+        try {
+            return gson().fromJson(new JsonReader(new FileReader(file)), Config.class);
+        } catch (Exception e) {
+            return new Config();
+        }
     }
 
     private static Gson gson() {

src/main/java/cc/files/FileCollector.java renamed to src/main/java/cc/files/Collector.java

@@ -1,8 +1,5 @@
 package cc.files;
 
-import cc.CustomInputFileFinder;
-import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile;
-
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -12,13 +9,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class FileCollector extends SimpleFileVisitor<Path> {
-    final FileMatcher fileMatcher;
+public class Collector extends SimpleFileVisitor<Path> {
+    final Matcher matcher;
     final List<Path> files;
     final Path baseDir;
 
-    public FileCollector(Path baseDir, FileMatcher fileMatcher) {
-        this.fileMatcher = fileMatcher;
+    public Collector(Path baseDir, Matcher matcher) {
+        this.matcher = matcher;
         this.baseDir = baseDir;
         this.files = new ArrayList<>();
     }
@@ -29,7 +26,7 @@ public List<Path> getFiles() {
 
     @Override
     public FileVisitResult visitFile(final Path file, BasicFileAttributes attrs) throws IOException {
-        boolean valid = fileMatcher.validatePath(baseDir, file);
+        boolean valid = matcher.validatePath(baseDir, file);
         if (valid) {
             files.add(file);
         }

src/main/java/cc/CustomInputFileFinder.java renamed to src/main/java/cc/files/Finder.java

@@ -1,7 +1,5 @@
-package cc;
+package cc.files;
 
-import cc.files.FileCollector;
-import cc.files.FileMatcher;
 import org.sonarlint.cli.InputFileFinder;
 import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile;
 
@@ -13,44 +11,45 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class CustomInputFileFinder extends InputFileFinder {
+import static java.nio.file.Files.isDirectory;
+
+public class Finder extends InputFileFinder {
     final List<String> includedPaths;
     final Charset charset;
-    final FileMatcher fileMatcher;
-
+    final Matcher matcher;
 
-    public CustomInputFileFinder(String srcGlobPattern, String testsGlobPattern, String excludeGlobPattern, Charset charset) {
-        this(new ArrayList<>(), srcGlobPattern, testsGlobPattern, excludeGlobPattern, charset);
-    }
-
-    public CustomInputFileFinder(List<String> includedPaths, String srcGlobPattern, String testsGlobPattern, String excludeGlobPattern, Charset charset) {
+    public Finder(List<String> includedPaths, String srcGlobPattern, String testsGlobPattern, String excludeGlobPattern, Charset charset) {
         super(srcGlobPattern, testsGlobPattern, excludeGlobPattern, charset);
         this.includedPaths = includedPaths;
         this.charset = charset;
-        this.fileMatcher = new FileMatcher(srcGlobPattern, testsGlobPattern, excludeGlobPattern, charset);
+        this.matcher = new Matcher(srcGlobPattern, testsGlobPattern, excludeGlobPattern, charset);
     }
 
     @Override
     public List<ClientInputFile> collect(Path baseDir) throws IOException {
+        return findPaths(baseDir).stream()
+                .map(p -> toClientInputFile(baseDir, p))
+                .filter(f -> f != null)
+                .collect(Collectors.toList());
+    }
+
+    List<Path> findPaths(Path baseDir) throws IOException {
         List<Path> paths = new ArrayList<>();
         for (String path : includedPaths) {
             Path resolvedPath = baseDir.resolve(path);
-            if (path.endsWith("/")) {
+            if (isDirectory(resolvedPath)) {
                 paths.addAll(collectDir(baseDir, resolvedPath));
             } else {
                 paths.add(resolvedPath);
             }
         }
-        return paths.stream()
-                .map(p -> toFile(baseDir, p))
-                .filter(f -> f != null)
-                .collect(Collectors.toList());
+        return paths;
     }
 
-    ClientInputFile toFile(Path baseDir, Path path) {
-        boolean valid = fileMatcher.validatePath(baseDir, path);
+    ClientInputFile toClientInputFile(Path baseDir, Path path) {
+        boolean valid = matcher.validatePath(baseDir, path);
         if (valid) {
-            return createInputFile(path, fileMatcher.isTest(baseDir, path));
+            return createInputFile(path, matcher.isTest(baseDir, path));
         }
         return null;
     }
@@ -60,8 +59,8 @@ ClientInputFile createInputFile(Path resolvedPath, boolean test) {
     }
 
     List<Path> collectDir(Path baseDir, Path dir) throws IOException {
-        FileCollector collector = new FileCollector(baseDir, fileMatcher);
+        Collector collector = new Collector(baseDir, matcher);
         Files.walkFileTree(dir, collector);
         return collector.getFiles();
     }
-}
+}

src/main/java/cc/files/FileMatcher.java renamed to src/main/java/cc/files/Matcher.java

@@ -1,14 +1,11 @@
 package cc.files;
 
-import org.sonarlint.cli.InputFileFinder;
-import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile;
-
 import java.nio.charset.Charset;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 
-public class FileMatcher {
+public class Matcher {
     private static final String GLOB_PREFIX = "glob:";
     public static PathMatcher ACCEPT_ALL = p -> true;
     public static PathMatcher REFUSE_ALL = p -> false;
@@ -18,14 +15,14 @@ public class FileMatcher {
     final PathMatcher excludeMatcher;
     final Charset charset;
 
-    public FileMatcher(PathMatcher srcMatcher, PathMatcher testsMatcher, PathMatcher excludeMatcher, Charset charset) {
+    public Matcher(PathMatcher srcMatcher, PathMatcher testsMatcher, PathMatcher excludeMatcher, Charset charset) {
         this.srcMatcher = srcMatcher;
         this.testsMatcher = testsMatcher;
         this.excludeMatcher = excludeMatcher;
         this.charset = charset;
     }
 
-    public FileMatcher(String srcGlobPattern, String testsGlobPattern, String excludeGlobPattern, Charset charset) {
+    public Matcher(String srcGlobPattern, String testsGlobPattern, String excludeGlobPattern, Charset charset) {
         this(create(srcGlobPattern, ACCEPT_ALL), create(testsGlobPattern, REFUSE_ALL), create(excludeGlobPattern, REFUSE_ALL), charset);
     }
 

src/main/java/org/sonarlint/cli/CustomMain.java

@@ -19,6 +19,8 @@
  */
 package org.sonarlint.cli;
 
+import cc.Config;
+import cc.files.Finder;
 import cc.JsonReport;
 import org.sonarlint.cli.analysis.SonarLintFactory;
 import org.sonarlint.cli.config.ConfigurationReader;
@@ -70,7 +72,8 @@ public static void execute(String[] args, System2 system) {
             return;
         }
 
-        InputFileFinder fileFinder = new InputFileFinder(parsedOpts.src(), parsedOpts.tests(), parsedOpts.exclusions(), charset);
+        Config config = Config.from(system.getProperty("config"));
+        InputFileFinder fileFinder = new Finder(config.includePaths, parsedOpts.src(), parsedOpts.tests(), parsedOpts.exclusions(), charset);
         ReportFactory reportFactory = new CustomReportFactory(charset);
         ConfigurationReader reader = new ConfigurationReader();
         SonarLintFactory sonarLintFactory = new SonarLintFactory(reader);
@@ -98,4 +101,4 @@ public List<Reporter> createReporters(Path basePath) {
             return Arrays.asList(new JsonReport());
         }
     }
-}
+}

src/test/java/cc/ConfigTest.java

@@ -12,4 +12,10 @@ public void include_paths() throws Exception {
         Config config = Config.from("fixtures/multiple_paths/config.json");
         assertThat(config.includePaths).containsOnly("Main.java", "src/included/");
     }
+
+    @Test
+    public void default_config_path_include_base_dir() throws Exception {
+        Config config = new Config();
+        assertThat(config.includePaths).containsOnly("");
+    }
 }

src/test/java/cc/CustomInputFileFinderTest.java renamed to src/test/java/cc/files/FinderTest.java

@@ -1,4 +1,4 @@
-package cc;
+package cc.files;
 
 import org.junit.Test;
 import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile;
@@ -12,11 +12,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class CustomInputFileFinderTest {
+public class FinderTest {
 
     @Test
     public void find_files_in_directory() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("src/included/"), null, null, null, Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("src/included/"), null, null, null, Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
         List<String> paths = files.stream().map(ClientInputFile::getPath).collect(Collectors.toList());
@@ -29,7 +29,7 @@ public void find_files_in_directory() throws Exception {
 
     @Test
     public void find_specified_files() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("config.json", "Main.java"), null, null, null, Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("config.json", "Main.java"), null, null, null, Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
         List<String> paths = files.stream().map(ClientInputFile::getPath).collect(Collectors.toList());
@@ -42,7 +42,7 @@ public void find_specified_files() throws Exception {
 
     @Test
     public void find_from_multiple_locations() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("config.json", "src/included/java/"), null, null, null, Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("config.json", "src/included/java/"), null, null, null, Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
         List<String> paths = files.stream().map(ClientInputFile::getPath).collect(Collectors.toList());
@@ -56,7 +56,7 @@ public void find_from_multiple_locations() throws Exception {
 
     @Test
     public void keep_exclude_pattern_behaviour_on_directories() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("config.json", "src/included/java/"), null, null, "**/HasNoIssue.*", Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("config.json", "src/included/java/"), null, null, "**/HasNoIssue.*", Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
         List<String> paths = files.stream().map(ClientInputFile::getPath).collect(Collectors.toList());
@@ -69,7 +69,7 @@ public void keep_exclude_pattern_behaviour_on_directories() throws Exception {
 
     @Test
     public void keep_exclude_pattern_behaviour_on_files() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("config.json", "src/included/java/"), null, null, "**/*.json", Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("config.json", "src/included/java/"), null, null, "**/*.json", Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
         List<String> paths = files.stream().map(ClientInputFile::getPath).collect(Collectors.toList());
@@ -82,7 +82,7 @@ public void keep_exclude_pattern_behaviour_on_files() throws Exception {
 
     @Test
     public void differentiate_src_and_test() throws Exception {
-        CustomInputFileFinder finder = new CustomInputFileFinder(Arrays.asList("src/included/", "src/test/"), "src/**", "**/test/**", null, Charset.defaultCharset());
+        Finder finder = new Finder(Arrays.asList("src/included/", "src/test/"), "src/**", "**/test/**", null, Charset.defaultCharset());
 
         List<ClientInputFile> files = finder.collect(Paths.get("fixtures/multiple_paths"));
 
@@ -94,6 +94,4 @@ public void differentiate_src_and_test() throws Exception {
                 "fixtures/multiple_paths/src/test/java/Test.java"
         );
     }
-
-
 }

src/test/java/integration/ConfigurationOptionsTest.java

@@ -37,11 +37,23 @@ public void setUp() throws Exception {
 
     @Test
     public void limit_path_included_within_analysis() throws Exception {
-        App.execute(new String[]{}, system);
+        App.execute(new String[]{"-Dconfig=fixtures/multiple_paths/config.json"}, system);
 
         String output = stdout.toString();
         assertThat(output).contains("issue", "fixtures/multiple_paths/src/included/java/pkg1/HasIssue.java");
         assertThat(output).doesNotContain("fixtures/multiple_paths/src/excluded/java/pkg1/HasIssue.java");
     }
 
+    @Test
+    public void include_all_files_by_default() throws Exception {
+        App.execute(new String[]{}, system);
+
+        String output = stdout.toString();
+        assertThat(output).contains(
+                "issue",
+                "fixtures/multiple_paths/src/included/java/pkg1/HasIssue.java",
+                "fixtures/multiple_paths/src/excluded/java/pkg1/HasIssue.java"
+        );
+    }
+
 }

src/test/java/integration/SanityCheckTest.java

@@ -48,8 +48,7 @@ public void executeJavaLibFixture() throws Exception {
 
         Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_lib");
 
-        assertThat(process.exitCode).isEqualTo(0);
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>." + process.stdout);
         assertThat(process.stdout).contains(expectedOutput);
+        assertThat(process.exitCode).isEqualTo(0);
     }
 }