Fixed some cobertura parser

Author: bcolvin

objclang/src/main/java/com/backelite/sonarqube/objectivec/lang/core/ObjectiveC.java

@@ -18,7 +18,6 @@
 package com.backelite.sonarqube.objectivec.lang.core;
 
 import com.backelite.sonarqube.objectivec.ObjectiveCConstants;
-import org.apache.commons.lang.StringUtils;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.resources.AbstractLanguage;
 
@@ -37,15 +36,15 @@ public ObjectiveC(Configuration config) {
     public String[] getFileSuffixes() {
         String[] suffixes = filterEmptyStrings(config.getStringArray(ObjectiveCConstants.FILE_SUFFIXES));
         if (suffixes.length == 0) {
-            suffixes = StringUtils.split(ObjectiveCConstants.FILE_SUFFIXES, ",");
+            suffixes = ObjectiveCConstants.FILE_SUFFIXES.split( ",");
         }
         return suffixes;
     }
 
     private String[] filterEmptyStrings(String[] stringArray) {
         List<String> nonEmptyStrings = new ArrayList<>();
         for (String string : stringArray) {
-            if (StringUtils.isNotBlank(string.trim())) {
+            if (string.trim().length() > 0) {
                 nonEmptyStrings.add(string.trim());
             }
         }

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/complexity/LizardReportParser.java

@@ -51,18 +51,19 @@ public class LizardReportParser {
     private static final String CYCLOMATIC_COMPLEXITY_LABEL = "CCN";
     private static final String FUNCTION_COUNT_LABEL = "Functions";
     private final SensorContext context;
+    private final DocumentBuilderFactory dbfactory;
     private int lineCountIndex;
     private int cyclomaticComplexityIndex;
     private int functionCountIndex;
 
     public LizardReportParser(final SensorContext context) {
         this.context = context;
+        this.dbfactory = DocumentBuilderFactory.newInstance();
     }
 
     public void parseReport(final File xmlFile) {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         try {
-            DocumentBuilder builder = factory.newDocumentBuilder();
+            DocumentBuilder builder = dbfactory.newDocumentBuilder();
             Document document = builder.parse(xmlFile);
             parseFile(document);
         } catch (final FileNotFoundException e) {

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/coverage/CoberturaReportParser.java

@@ -19,6 +19,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.coverage.NewCoverage;
@@ -31,14 +32,16 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 public final class CoberturaReportParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(CoberturaReportParser.class);
     private static final String PACKAGES = "packages";
     private static final String CLASSES = "class";
     private static final String FILE = "filename";
-    private static final String LINES = "lines";
+    private static final String LINE = "line";
     private static final String NUMBER = "number";
     private static final String HITS = "hits";
     private static final String BRANCH = "branch";
@@ -84,14 +87,15 @@ private void collectClassMeasures(NodeList nodeList) {
             if (node.getNodeType() == Node.ELEMENT_NODE) {
                 Element element = (Element) node;
                 String filePath = element.getAttribute(FILE);
-                NodeList nl = element.getElementsByTagName(LINES);
+                NodeList nl = element.getElementsByTagName(LINE);
                 collectFileData(filePath, nl);
             }
         }
     }
 
     private void collectFileData(String filePath, NodeList nodeList) {
         InputFile resource = getFile(filePath);
+        LOGGER.info("Collect file data: {}",resource.toString());
         if (resource != null) {
             boolean lineAdded = false;
             NewCoverage coverage = context.newCoverage();
@@ -130,9 +134,11 @@ private void addCoverageConditions(NewCoverage coverage, int line, String text)
     }
 
     private InputFile getFile(String filePath) {
-        String path = context.fileSystem().baseDir().getAbsolutePath() + File.separator + filePath;
-        InputFile file = context.fileSystem().inputFile(context.fileSystem().predicates().hasAbsolutePath(path));
-        return file != null && file.isFile() ? file : null;
+        FilePredicate fp = context.fileSystem().predicates().hasPath(filePath);
+        if(context.fileSystem().hasFiles(fp))
+            return context.fileSystem().inputFile(fp);
+        LOGGER.warn("Can't find file {}",filePath);
+        return null;
     }
 
 }

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/coverage/CoberturaSensor.java

@@ -20,6 +20,7 @@
 import com.backelite.sonarqube.commons.Constants;
 import com.backelite.sonarqube.objectivec.lang.core.ObjectiveC;
 import com.backelite.sonarqube.swift.lang.core.Swift;
+import org.apache.tools.ant.DirectoryScanner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.InputFile;
@@ -28,8 +29,6 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.*;
 
 public class CoberturaSensor implements Sensor {
     private static final Logger LOGGER = LoggerFactory.getLogger(CoberturaSensor.class);
@@ -58,15 +57,16 @@ public void describe(SensorDescriptor descriptor) {
     @Override
     public void execute(SensorContext context) {
         CoberturaReportParser parser = new CoberturaReportParser(context);
-        String path = reportPath();
-        String dirPath = context.fileSystem().baseDir().getAbsolutePath() + File.separator + path.substring(0,path.lastIndexOf(File.separator)+1);
-        PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher("regex:"+path.replaceAll("\\*","\\\\w+"));
-        try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(Paths.get(dirPath), pathMatcher::matches)) {
-            for(Path p : dirStream){
-                parser.parseReport(p.toFile());
-            }
-        } catch (IOException ex){
-            LOGGER.error( "Error while finding test files.", ex);
+        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 report report {}", filename);
+            parser.parseReport(new File(filename));
         }
     }
 }

swiftlang/src/main/java/com/backelite/sonarqube/swift/SwiftSquidSensor.java

@@ -78,7 +78,7 @@ private SwiftConfiguration createConfiguration() {
     private void save(Collection<SourceCode> squidSourceFiles) {
         for (SourceCode squidSourceFile : squidSourceFiles) {
             SourceFile squidFile = (SourceFile) squidSourceFile;
-            String relativePath = pathResolver.relativePath(context.fileSystem().baseDir(), new java.io.File(squidFile.getKey()));
+            String relativePath = pathResolver.relativePath(context.fileSystem().baseDir(), new File(squidFile.getKey()));
             InputFile inputFile = context.fileSystem().inputFile(context.fileSystem().predicates().hasRelativePath(relativePath));
 
             saveMeasures(inputFile, squidFile);

swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/SwiftProfile.java

@@ -39,8 +39,7 @@ public class SwiftProfile implements BuiltInQualityProfilesDefinition {
     private final SwiftLintProfileImporter swiftLintProfileImporter;
     private final TailorProfileImporter tailorProfileImporter;
 
-    public SwiftProfile(final SwiftLintProfileImporter swiftLintProfileImporter,
-                        final TailorProfileImporter tailorProfileImporter) {
+    public SwiftProfile(final SwiftLintProfileImporter swiftLintProfileImporter, final TailorProfileImporter tailorProfileImporter) {
         this.swiftLintProfileImporter = swiftLintProfileImporter;
         this.tailorProfileImporter = tailorProfileImporter;
     }

swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintProfile.java

@@ -48,7 +48,6 @@ public void define(Context context) {
         LOGGER.info("Creating SwiftLint Profile");
         NewBuiltInQualityProfile nbiqp = context.createBuiltInQualityProfile(SwiftLintRulesDefinition.REPOSITORY_KEY, Swift.KEY);
 
-
         try(Reader config = new InputStreamReader(getClass().getResourceAsStream(SwiftLintProfile.PROFILE_PATH))) {
             RulesProfile ocLintRulesProfile = profileImporter.importProfile(config, ValidationMessages.create());
             for (ActiveRule rule : ocLintRulesProfile.getActiveRules()) {

swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintProfileImporter.java

@@ -28,16 +28,15 @@
 import java.io.Reader;
 
 public class SwiftLintProfileImporter extends ProfileImporter {
-
-    private static final String UNABLE_TO_LOAD_DEFAULT_PROFILE = "Unable to load default SwiftLint profile";
     private static final Logger LOGGER = LoggerFactory.getLogger(SwiftLintProfileImporter.class);
+    private static final String UNABLE_TO_LOAD_DEFAULT_PROFILE = "Unable to load default SwiftLint profile";
 
     private final XMLProfileParser profileParser;
 
     public SwiftLintProfileImporter(final XMLProfileParser xmlProfileParser) {
         super(SwiftLintRulesDefinition.REPOSITORY_KEY, SwiftLintRulesDefinition.REPOSITORY_KEY);
         setSupportedLanguages(Swift.KEY);
-        profileParser = xmlProfileParser;
+        this.profileParser = xmlProfileParser;
     }
 
     @Override

swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintReportParser.java

@@ -17,7 +17,6 @@
  */
 package com.backelite.sonarqube.swift.issues.swiftlint;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.FilePredicate;
@@ -28,11 +27,12 @@
 import org.sonar.api.rule.RuleKey;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 public class SwiftLintReportParser {
-
     private static final Logger LOGGER = LoggerFactory.getLogger(SwiftLintReportParser.class);
 
     private final SensorContext context;
@@ -42,21 +42,9 @@ public SwiftLintReportParser(final SensorContext context) {
     }
 
     public void parseReport(File reportFile) {
-        try {
+        try (Stream<String> lines = Files.lines(reportFile.toPath())) {
             // Read and parse report
-            FileReader fr = new FileReader(reportFile);
-
-            BufferedReader br = new BufferedReader(fr);
-            String line;
-            while ((line = br.readLine()) != null) {
-                recordIssue(line);
-
-            }
-            IOUtils.closeQuietly(br);
-            IOUtils.closeQuietly(fr);
-
-        } catch (FileNotFoundException e) {
-            LOGGER.error("Failed to parse SwiftLint report file", e);
+            lines.forEach(this::recordIssue);
         } catch (IOException e) {
             LOGGER.error("Failed to parse SwiftLint report file", e);
         }

swiftlang/src/main/java/com/backelite/sonarqube/swift/issues/swiftlint/SwiftLintRulesDefinition.java

@@ -18,7 +18,6 @@
 package com.backelite.sonarqube.swift.issues.swiftlint;
 
 import com.backelite.sonarqube.swift.lang.core.Swift;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.CharEncoding;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -28,7 +27,6 @@
 import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.squidbridge.rules.SqaleXmlLoader;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -37,51 +35,30 @@
  * Created by gillesgrousset on 27/11/2015.
  */
 public class SwiftLintRulesDefinition implements RulesDefinition {
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(SwiftLintRulesDefinition.class);
     public static final String REPOSITORY_KEY = "SwiftLint";
     public static final String REPOSITORY_NAME = REPOSITORY_KEY;
-    private static final Logger LOGGER = LoggerFactory.getLogger(SwiftLintRulesDefinition.class);
     private static final String RULES_FILE = "/org/sonar/plugins/swiftlint/rules.json";
 
     @Override
     public void define(Context context) {
-
-        NewRepository repository = context
-                .createRepository(REPOSITORY_KEY, Swift.KEY)
-                .setName(REPOSITORY_NAME);
-
-        try {
-            loadRules(repository);
+        NewRepository repository = context.createRepository(REPOSITORY_KEY, Swift.KEY).setName(REPOSITORY_NAME);
+
+        try(Reader reader = new InputStreamReader(getClass().getResourceAsStream(RULES_FILE), CharEncoding.UTF_8)){
+            JSONArray slRules = (JSONArray)JSONValue.parse(reader);
+            if(slRules != null){
+                for (Object obj : slRules) {
+                    JSONObject slRule = (JSONObject) obj;
+                    repository.createRule((String) slRule.get("key"))
+                        .setName((String) slRule.get("name"))
+                        .setSeverity((String) slRule.get("severity"))
+                        .setHtmlDescription((String) slRule.get("description"));
+                }
+            }
         } catch (IOException e) {
             LOGGER.error("Failed to load SwiftLint rules", e);
         }
-
         SqaleXmlLoader.load(repository, "/com/sonar/sqale/swiftlint-model.xml");
-
         repository.done();
-
-    }
-
-    private void loadRules(NewRepository repository) throws IOException {
-
-        Reader reader = new BufferedReader(new InputStreamReader(getClass()
-                .getResourceAsStream(RULES_FILE), CharEncoding.UTF_8));
-
-        String jsonString = IOUtils.toString(reader);
-
-        Object rulesObj = JSONValue.parse(jsonString);
-
-        if (rulesObj != null) {
-            JSONArray slRules = (JSONArray) rulesObj;
-            for (Object obj : slRules) {
-                JSONObject slRule = (JSONObject) obj;
-
-                RulesDefinition.NewRule rule = repository.createRule((String) slRule.get("key"));
-                rule.setName((String) slRule.get("name"));
-                rule.setSeverity((String) slRule.get("severity"));
-                rule.setHtmlDescription((String) slRule.get("description"));
-
-            }
-        }
     }
 }