Removed + operator from log strings to conform to rest of plugin

Clarified disctinction between root and modular analysis
Re-added unused Project variable that was there before
Re-added misspelled function name
Fixed whitespace issues

Author: iwang-atlassian

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/CoberturaReportParser.java

@@ -84,12 +84,9 @@ private void collectPackageMeasures(SMInputCursor pack) throws XMLStreamExceptio
             collectFileMeasures(pack.descendantElementCursor("class"), builderByFilename);
             for (Map.Entry<String, CoverageMeasuresBuilder> entry : builderByFilename.entrySet()) {
                 String filePath = entry.getKey();
-                if (project.isModule()) {
-                    if (!filePath.startsWith(project.path())) {
-                        continue;
-                    }
-                    // fileSystem.baseDir() will include the module path, so we need to get rid of it here
-                    filePath = filePath.substring(project.path().length());
+                filePath = getAdjustedPathIfProjectIsModule(filePath);
+                if (filePath == null) {
+                    continue;
                 }
                 File file = new File(fileSystem.baseDir(), filePath);
                 InputFile inputFile = fileSystem.inputFile(fileSystem.predicates().hasAbsolutePath(file.getAbsolutePath()));
@@ -105,7 +102,7 @@ private void collectPackageMeasures(SMInputCursor pack) throws XMLStreamExceptio
                         context.saveMeasure(resource, measure);
                     }
                 }
-                LOGGER.info("Successfully collected measures for file " + file.getPath());
+                LOGGER.info("Successfully collected measures for file {}", file.getPath());
             }
         }
     }
@@ -114,6 +111,18 @@ private boolean resourceExists(Resource file) {
         return context.getResource(file) != null;
     }
 
+    private String getAdjustedPathIfProjectIsModule(String filePath) {
+        if (project.isModule()) {
+            // the file doesn't belong to the module we're analyzing
+            if (!filePath.startsWith(project.path())) {
+                return null;
+            }
+            // fileSystem.baseDir() will include the module path, so we need to get rid of it here
+            return filePath.substring(project.path().length());
+        }
+        return filePath;
+    }
+
     private static void collectFileMeasures(SMInputCursor clazz,
                                             Map<String, CoverageMeasuresBuilder> builderByFilename) throws XMLStreamException {
         while (clazz.getNext() != null) {

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/ReportFilesFinder.java

@@ -44,11 +44,23 @@ public ReportFilesFinder(final Settings settings, final String settingsReportKey
         this.settingsDirectoryKey = settingsDirectoryKey;
     }
 
+    public List<File> reportsIn(final String baseDirectory) {
+
+        final String reportDirectory = getReportDirectory(baseDirectory, baseDirectory); // the root directory in this case is the base directory
+        final String reportPattern = getReportPattern();
+        return reportsInHelper(reportDirectory, reportPattern);
+    }
+
     public List<File> reportsIn(final String module, final String rootDirectory, final String baseDirectory) {
 
         final String reportDirectory = getReportDirectory(module, rootDirectory, baseDirectory);
         final String reportPattern = getReportPattern(module);
-        final String[] relPaths = filesMatchingPattern(reportDirectory, reportPattern);
+        return reportsInHelper(reportDirectory, reportPattern);
+    }
+
+    private List<File> reportsInHelper(final String reportDirectory, final String reportPattern) {
+
+        final String[] relPaths = filesMathingPattern(reportDirectory, reportPattern);
 
         final List<File> reports = new ArrayList<File>();
 
@@ -59,49 +71,53 @@ public List<File> reportsIn(final String module, final String rootDirectory, fin
         return reports;
     }
 
-    private String[] filesMatchingPattern(final String reportDirectory, final String reportPath) {
+    private String[] filesMathingPattern(final String reportDirectory, final String reportPath) {
 
         final DirectoryScanner scanner = new DirectoryScanner();
         scanner.setIncludes(new String[] { reportPath });
         scanner.setBasedir(new File(reportDirectory));
         scanner.scan();
-        
-        LOGGER.info("Files found in directory '" + reportDirectory + "' including '" + reportPath + "': " + Arrays.toString(scanner.getIncludedFiles()));
+
+        LOGGER.info("Files found in directory '{}' including '{}': {}", reportDirectory, reportPath, Arrays.toString(scanner.getIncludedFiles()));
 
         return scanner.getIncludedFiles();
     }
 
-    private String getReportPattern(final String module) {
-
-        String reportPath = conf.getString(module + "." + settingsReportKey);
+    private String getReportPattern() {
 
+        String reportPath = conf.getString(settingsReportKey);
         if (reportPath == null) {
-            reportPath = conf.getString(settingsReportKey);
+            reportPath = settingsReportDefault;
         }
+        return reportPath;
+    }
 
+    private String getReportPattern(final String module) {
+
+        String reportPath = conf.getString(module + "." + settingsReportKey);
         if (reportPath == null) {
-            reportPath = settingsReportDefault;
+            return getReportPattern();
         }
-
         return reportPath;
     }
 
-    private String getReportDirectory(final String module, final String rootDirectory, final String defaultDirectory) {
-
-        String reportDirectory = conf.getString(module + "." + settingsDirectoryKey);
+    private String getReportDirectory(final String rootDirectory, final String baseDirectory) {
 
+        String reportDirectory = conf.getString(settingsDirectoryKey);
         if (reportDirectory == null) {
-            reportDirectory = conf.getString(settingsDirectoryKey);
+            return baseDirectory;
         }
+        return rootDirectory + "/" + reportDirectory;
+    }
 
-        if (reportDirectory != null) {
-            reportDirectory = rootDirectory + reportDirectory;
-        }
-        else {
-            reportDirectory = defaultDirectory;
-        }
 
-        return reportDirectory;
+    private String getReportDirectory(final String module, final String rootDirectory, final String baseDirectory) {
+
+        String reportDirectory = conf.getString(module + "." + settingsDirectoryKey);
+        if (reportDirectory == null) {
+            return getReportDirectory(rootDirectory, baseDirectory);
+        }
+        return rootDirectory + "/" + reportDirectory;
     }
 
 }

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/SwiftCoberturaSensor.java

@@ -29,6 +29,7 @@
 import org.sonar.plugins.swift.lang.core.Swift;
 
 import java.io.File;
+import java.util.List;
 
 
 public final class SwiftCoberturaSensor implements Sensor {
@@ -44,29 +45,40 @@ public final class SwiftCoberturaSensor implements Sensor {
     private final Settings settings;
     private final FileSystem fileSystem;
     private final PathResolver pathResolver;
+    private Project project;
 
     public SwiftCoberturaSensor(final FileSystem fileSystem, final PathResolver pathResolver, final Settings settings) {
-        
+
         this.settings = settings;
         this.fileSystem = fileSystem;
-        this.pathResolver = pathResolver;   
+        this.pathResolver = pathResolver;
 
         reportFilesFinder = new ReportFilesFinder(settings, REPORT_PATTERN_KEY, DEFAULT_REPORT_PATTERN, REPORT_DIRECTORY_KEY);
-    }   
+    }
 
     public boolean shouldExecuteOnProject(final Project project) {
+
+        this.project = project;
+
         return fileSystem.languages().contains(Swift.KEY);
     }
 
     public void analyse(final Project project, final SensorContext context) {
 
         final String projectBaseDir = fileSystem.baseDir().getPath();
-        LOGGER.info("Analyzing directory: " + projectBaseDir);
+        LOGGER.info("Analyzing directory: {}", projectBaseDir);
 
-        final String module = project.getName();
-        final String rootDir = getRootDirectory(project);
+        List<File> reports;
+        if (project.isRoot()) {
+            reports = reportFilesFinder.reportsIn(projectBaseDir);
+        }
+        else {
+            final String module = project.getName();
+            final String rootDir = getRootDirectory(project);
+            reports = reportFilesFinder.reportsIn(module, rootDir, projectBaseDir);
+        }
 
-        for (final File report : reportFilesFinder.reportsIn(module, rootDir, projectBaseDir)) {
+        for (final File report : reports) {
             LOGGER.info("Processing coverage report {}", report);
             CoberturaReportParser.parseReport(report, fileSystem, project, context);
         }