Merge pull request #1296 from guwirth/metrics-missing

add CxxClangSASensor & CxxClangTidySensor metric

Author: guwirth

cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerGccParser.java

@@ -33,7 +33,7 @@
  */
 public class CxxCompilerGccParser implements CompilerParser {
   private static final Logger LOG = Loggers.get(CxxCompilerGccParser.class);
-  public static final String COMPILER_KEY = "GCC";
+  public static final String KEY = "GCC";
   // search for single line with compiler warning message - order for groups: 1 = file, 2 = line, 3 = message, 4=id
   public static final String DEFAULT_REGEX_DEF = "^(.*):([0-9]+):[0-9]+:\\x20warning:\\x20(.*)\\x20\\[(.*)\\]$";
   // ToDo: as long as java 7 API is not used the support of named groups for regular expression is not possible
@@ -46,7 +46,7 @@ public class CxxCompilerGccParser implements CompilerParser {
    */
   @Override
   public String key() {
-    return COMPILER_KEY;
+    return KEY;
   }
 
   /**
@@ -78,7 +78,7 @@ public String defaultCharset() {
    */
   @Override
   public void processReport(final SensorContext context, File report, String charset, String reportRegEx, List<Warning> warnings) throws java.io.FileNotFoundException {
-    LOG.info("Parsing '{}' format", COMPILER_KEY);
+    LOG.info("Parsing '{}' format", KEY);
 
     Scanner scanner = new Scanner(report, charset);
     Pattern p = Pattern.compile(reportRegEx, Pattern.MULTILINE);

cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensor.java

@@ -44,9 +44,9 @@ public class CxxCompilerSensor extends CxxReportSensor {
   public static final String REPORT_REGEX_DEF = "compiler.regex";
   public static final String REPORT_CHARSET_DEF = "compiler.charset";
   public static final String PARSER_KEY_DEF = "compiler.parser";
-  public static final String DEFAULT_PARSER_DEF = CxxCompilerVcParser.COMPILER_KEY;
+  public static final String DEFAULT_PARSER_DEF = CxxCompilerVcParser.KEY;
   public static final String DEFAULT_CHARSET_DEF = "UTF-8";
-  public static final String COMPILER_KEY = "Compiler";
+  public static final String KEY = "Compiler";
 
   private final Map<String, CompilerParser> parsers = new HashMap<>();
 
@@ -122,6 +122,6 @@ private static boolean isInputValid(CompilerParser.Warning warning) {
 
   @Override
   protected String getSensorKey() {
-    return COMPILER_KEY;
+    return KEY;
   }  
 }

cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerVcParser.java

@@ -34,7 +34,7 @@
  */
 public class CxxCompilerVcParser implements CompilerParser {
   private static final Logger LOG = Loggers.get(CxxCompilerVcParser.class);
-  public static final String COMPILER_KEY = "Visual C++";
+  public static final String KEY = "Visual C++";
   // search for single line with compiler warning message VS2008 - order for groups: 1 = file, 2 = line, 3 = ID, 4=message
   public static final String DEFAULT_REGEX_DEF = "^(.*)\\((\\d+)\\)\\x20:\\x20warning\\x20(C\\d+):(.*)$";
   // sample regex for VS2012/2013: "^.*>(?<filename>.*)\\((?<line>\\d+)\\):\\x20warning\\x20(?<id>C\\d+):(?<message>.*)$";
@@ -46,7 +46,7 @@ public class CxxCompilerVcParser implements CompilerParser {
    */
   @Override
   public String key() {
-    return COMPILER_KEY;
+    return KEY;
   }
 
   /**

cxx-sensors/src/main/java/org/sonar/cxx/sensors/utils/CxxMetrics.java

@@ -35,43 +35,50 @@
 import org.sonar.cxx.sensors.squid.CxxSquidSensor;
 import org.sonar.cxx.sensors.valgrind.CxxValgrindSensor;
 import org.sonar.cxx.sensors.veraxx.CxxVeraxxSensor;
+import org.sonar.cxx.sensors.clangsa.CxxClangSASensor;
+import org.sonar.cxx.sensors.clangtidy.CxxClangTidySensor;
 
 /**
  * {@inheritDoc}
  */
 public class CxxMetrics implements Metrics {
+
   private final CxxLanguage language;
 
   /**
-  * CxxMetrics
-  * @param language for metrics
-  **/
+   * CxxMetrics
+   *
+   * @param language for metrics
+  *
+   */
   public CxxMetrics(CxxLanguage language) {
     this.language = language;
-    
-    buildMetric(CxxCompilerSensor.COMPILER_KEY, "Compiler issues", language);
+
+    buildMetric(CxxCompilerSensor.KEY, "Compiler issues", language);
     buildMetric(CxxCppCheckSensor.KEY, "CppCheck issues", language);
     buildMetric(CxxOtherSensor.KEY, "Other tools issues", language);
     buildMetric(CxxPCLintSensor.KEY, "PC-Lint issues", language);
-    buildMetric(CxxRatsSensor.KEY, "Rats issues", language);    
-    buildMetric(CxxSquidSensor.KEY, "Squid issues", language);      
-    buildMetric(CxxValgrindSensor.KEY, "Valgrind issues", language);    
-    buildMetric(CxxVeraxxSensor.KEY, "Vera issues", language);    
-    buildMetric(CxxDrMemorySensor.KEY, "DrMemory issues", language);  
+    buildMetric(CxxRatsSensor.KEY, "Rats issues", language);
+    buildMetric(CxxSquidSensor.KEY, "Squid issues", language);
+    buildMetric(CxxValgrindSensor.KEY, "Valgrind issues", language);
+    buildMetric(CxxVeraxxSensor.KEY, "Vera issues", language);
+    buildMetric(CxxDrMemorySensor.KEY, "DrMemory issues", language);
+    buildMetric(CxxClangSASensor.KEY, "ClangSA issues", language);
+    buildMetric(CxxClangTidySensor.KEY, "ClangTidy issues", language);
   }
 
   /**
-  * GetKey
-  * @param key for language
-  * @param language for metrics
-  * @return String
-  **/
+   * GetKey
+   *
+   * @param key for language
+   * @param language for metrics
+   * @return String
+  *
+   */
   public static String getKey(String key, CxxLanguage language) {
     return language.getPropertiesKey().toUpperCase(Locale.ENGLISH) + "-" + key.toUpperCase(Locale.ENGLISH);
   }
 
-
-  
   @Override
   public List<Metric> getMetrics() {
     return new ArrayList(this.language.getMetricsCache());
@@ -80,11 +87,11 @@ public List<Metric> getMetrics() {
   private static void buildMetric(String key, String description, CxxLanguage language) {
     String effectiveKey = CxxMetrics.getKey(key, language);
     Metric<?> metric = new Metric.Builder(effectiveKey, description, Metric.ValueType.INT)
-    .setDirection(Metric.DIRECTION_WORST)
-    .setQualitative(Boolean.TRUE)
-    .setDomain(language.getKey().toUpperCase(Locale.ENGLISH))
-    .create();
-    
-    language.SaveMetric(metric, key);    
+      .setDirection(Metric.DIRECTION_WORST)
+      .setQualitative(Boolean.TRUE)
+      .setDomain(language.getKey().toUpperCase(Locale.ENGLISH))
+      .create();
+
+    language.SaveMetric(metric, key);
   }
 }

cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensorTest.java

@@ -63,7 +63,7 @@ public void shouldReportCorrectGccViolations() {
 
     Settings settings = new Settings();
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_PATH_KEY), "compiler-reports/build.gcclog");
-    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerGccParser.COMPILER_KEY);
+    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerGccParser.KEY);
     context.setSettings(settings);
 
     context.fileSystem().add(new DefaultInputFile("ProjectKey", "src/zipmanager.cpp")
@@ -80,7 +80,7 @@ public void shouldReportACorrectVcViolations() {
 
     Settings settings = new Settings();
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_PATH_KEY), "compiler-reports/BuildLog.htm");
-    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.COMPILER_KEY);
+    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.KEY);
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_CHARSET_DEF), "UTF-16");
     context.setSettings(settings);
 
@@ -99,7 +99,7 @@ public void shouldReportBCorrectVcViolations() {
 
     Settings settings = new Settings();
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_PATH_KEY), "compiler-reports/VC-report.vclog");
-    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.COMPILER_KEY);
+    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.KEY);
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_CHARSET_DEF), "UTF-8");
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_REGEX_DEF), "^.*>(?<filename>.*)\\((?<line>\\d+)\\):\\x20warning\\x20(?<id>C\\d+):(?<message>.*)$");
     context.setSettings(settings);
@@ -118,7 +118,7 @@ public void shouldReportCorrectVcViolations() {
 
     Settings settings = new Settings();
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_PATH_KEY), "compiler-reports/VC-report.vclog");
-    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.COMPILER_KEY);
+    settings.setProperty(language.getPluginProperty(CxxCompilerSensor.PARSER_KEY_DEF), CxxCompilerVcParser.KEY);
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_CHARSET_DEF), "UTF-8");
     settings.setProperty(language.getPluginProperty(CxxCompilerSensor.REPORT_REGEX_DEF), "^(.*)\\((\\d+)\\):\\x20warning\\x20(C\\d+):(.*)$");
     context.setSettings(settings);

sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java

@@ -329,7 +329,7 @@ private static List<PropertyDefinition> compilerWarningsProperties() {
       .defaultValue(CxxCompilerSensor.DEFAULT_PARSER_DEF)
       .name("Format")
       .type(PropertyType.SINGLE_SELECT_LIST)
-      .options(LANG_PROP_PREFIX + CxxCompilerVcParser.COMPILER_KEY, LANG_PROP_PREFIX + CxxCompilerGccParser.COMPILER_KEY)
+      .options(LANG_PROP_PREFIX + CxxCompilerVcParser.KEY, LANG_PROP_PREFIX + CxxCompilerGccParser.KEY)
       .description("The format of the warnings file. Currently supported are Visual C++ and GCC.")
       .subCategory(subcateg)
       .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE)

sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java

@@ -354,8 +354,8 @@ private static List<PropertyDefinition> compilerWarningsProperties() {
       .defaultValue(CxxCompilerSensor.DEFAULT_PARSER_DEF)
       .name("Format")
       .type(PropertyType.SINGLE_SELECT_LIST)
-      .options(LANG_PROP_PREFIX + CxxCompilerVcParser.COMPILER_KEY, LANG_PROP_PREFIX
-               + CxxCompilerGccParser.COMPILER_KEY)
+      .options(LANG_PROP_PREFIX + CxxCompilerVcParser.KEY, LANG_PROP_PREFIX
+               + CxxCompilerGccParser.KEY)
       .description("The format of the warnings file. Currently supported are Visual C++ and GCC.")
       .subCategory(subcateg)
       .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE)