Fix some quality flaws

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
index 7b8297ea062e3517d14e3141d0e0295107f10fb4..ced596ed9dd6832774efdd7d2144699f42fa5f3e 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
@@ -61,15 +61,18 @@ public class ExclusionFilters implements BatchComponent {
   }
 
   public boolean accept(InputFile inputFile, InputFile.Type type) {
-    PathPattern[] inclusionPatterns = null;
-    PathPattern[] exclusionPatterns = null;
+    PathPattern[] inclusionPatterns;
+    PathPattern[] exclusionPatterns;
     if (InputFile.Type.MAIN == type) {
       inclusionPatterns = mainInclusions;
       exclusionPatterns = mainExclusions;
     } else if (InputFile.Type.TEST == type) {
       inclusionPatterns = testInclusions;
       exclusionPatterns = testExclusions;
+    } else {
+      throw new IllegalArgumentException("Unknown file type: " + type);
     }
+
     if (inclusionPatterns.length > 0) {
       boolean matchInclusion = false;
       for (PathPattern pattern : inclusionPatterns) {

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
index b4afd35d7d2461652ee15f0c85d665a88c1ff7bc..3d09990018e532c4c718f78ac27039c590bc41a7 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
@@ -110,12 +110,9 @@ public class FileIndexer implements BatchComponent {
     Collection<File> files = FileUtils.listFiles(dirToIndex, FILE_FILTER, DIR_FILTER);
     for (File file : files) {
       DefaultInputFile inputFile = inputFileBuilder.create(file);
-      if (inputFile != null) {
-        if (exclusionFilters.accept(inputFile, type)) {
-          indexFile(inputFileBuilder, fileSystem, status, inputFile, type);
-        }
+      if (inputFile != null && exclusionFilters.accept(inputFile, type))
+        indexFile(inputFileBuilder, fileSystem, status, inputFile, type);
       }
-    }
   }
 
   private void indexFile(InputFileBuilder inputFileBuilder, DefaultModuleFileSystem fs,