revert directory stream to original and keep sensors consistent

Author: bcolvin

objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/fauxpas/FauxPasSensor.java

@@ -43,20 +43,6 @@ public FauxPasSensor(SensorContext context) {
         this.context = context;
     }
 
-    private void parseReportIn(final String baseDir, final FauxPasReportParser parser) {
-        DirectoryScanner scanner = new DirectoryScanner();
-        scanner.setIncludes(new String[]{reportPath()});
-        scanner.setBasedir(baseDir);
-        scanner.setCaseSensitive(false);
-        scanner.scan();
-        String[] files = scanner.getIncludedFiles();
-
-        for (String filename : files) {
-            LOGGER.info("Processing FauxPas report {}", filename);
-            parser.parseReport(new File(filename));
-        }
-    }
-
     private String reportPath() {
         return context.config()
             .get(REPORT_PATH_KEY)
@@ -73,9 +59,17 @@ public void describe(SensorDescriptor descriptor) {
 
     @Override
     public void execute(SensorContext context) {
-        final String projectBaseDir = context.fileSystem().baseDir().getAbsolutePath();
-
         FauxPasReportParser parser = new FauxPasReportParser(context);
-        parseReportIn(projectBaseDir, parser);
+        DirectoryScanner scanner = new DirectoryScanner();
+        scanner.setIncludes(new String[]{reportPath()});
+        scanner.setBasedir(context.fileSystem().baseDir().getAbsolutePath());
+        scanner.setCaseSensitive(false);
+        scanner.scan();
+        String[] files = scanner.getIncludedFiles();
+
+        for (String filename : files) {
+            LOGGER.info("Processing FauxPas report {}", filename);
+            parser.parseReport(new File(filename));
+        }
     }
 }

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/surefire/SurefireSensor.java

@@ -26,10 +26,6 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 public class SurefireSensor implements Sensor {
     private static final Logger LOGGER = LoggerFactory.getLogger(SurefireSensor.class);
@@ -59,20 +55,16 @@ public void describe(SensorDescriptor descriptor) {
     @Override
     public void execute(SensorContext context) {
         SurefireReportParser surefireParser = new SurefireReportParser(context);
-        String reportFileName = context.fileSystem().baseDir().getAbsolutePath() + "/"+ reportPath();
+        String reportFileName = context.fileSystem().baseDir().getAbsolutePath()  + File.separator +  reportPath();
         File reportsDir = new File(reportFileName);
 
         if (!reportsDir.isDirectory()) {
             LOGGER.warn("JUnit report directory not found at {}", reportsDir);
             return;
         }
-        try {
-            for (Path p : Files.newDirectoryStream(Paths.get(reportsDir.toURI()), name -> (name.startsWith("TEST") && name.endsWith(".xml")) || name.endsWith(".junit"))) {
-                LOGGER.info("Processing Surefire report {}", p.getFileName());
-                surefireParser.parseReport(p.toFile());
-            }
-        } catch (IOException ex){
-            LOGGER.error( "Error while finding test files.", ex);
+        for (File file : reportsDir.listFiles((file,name) -> (name.startsWith("TEST") && name.endsWith(".xml")) || name.endsWith(".junit"))){
+            LOGGER.info("Processing Surefire report {}", file.getName());
+            surefireParser.parseReport(file);
         }
         surefireParser.save();
     }