Merge pull request #1287 from guwirth/context-settings

use local context.settings()

Author: guwirth

cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java

@@ -22,7 +22,6 @@
 import java.io.File;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -48,8 +47,8 @@ public class CxxClangSASensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxClangSASensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxClangSASensor(CxxLanguage language) {
+    super(language);
   }
 
   @Override

cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensor.java

@@ -27,7 +27,6 @@
 
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -47,8 +46,8 @@ public class CxxClangTidySensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxClangTidySensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxClangTidySensor(CxxLanguage language) {
+    super(language);
   }
 
   @Override
@@ -61,25 +60,9 @@ public void describe(SensorDescriptor descriptor) {
     descriptor.onlyOnLanguage(this.language.getKey()).name(language.getName() + " ClangTidySensor");
   }
 
-  /**
-   * Get string property from configuration. If the string is not set or empty,
-   * return the default value.
-   *
-   * @param name Name of the property
-   * @param def Default value
-   * @return Value of the property if set and not empty, else default value.
-   */
-  public String getParserStringProperty(String name, String def) {
-    String s = this.settings.getString(name);
-    if (s == null || s.isEmpty()) {
-      return def;
-    }
-    return s;
-  }
-
   @Override
   protected void processReport(final SensorContext context, File report) {
-    final String reportCharset = getParserStringProperty(this.language.getPluginProperty(REPORT_CHARSET_DEF), "UTF-8");
+    final String reportCharset = getContextStringProperty(context, this.language.getPluginProperty(REPORT_CHARSET_DEF), "UTF-8");
     LOG.debug("Parsing 'clang-tidy' report, CharSet= '{}'", reportCharset);
 
     try (Scanner scanner = new Scanner(report, reportCharset)) {

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

@@ -27,7 +27,6 @@
 
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -53,10 +52,9 @@ public class CxxCompilerSensor extends CxxReportSensor {
 
   /**
    * {@inheritDoc}
-   * @param settings for report sensor
    */
-  public CxxCompilerSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxCompilerSensor(CxxLanguage language) {
+    super(language);
 
     addCompilerParser(new CxxCompilerVcParser());
     addCompilerParser(new CxxCompilerGccParser());
@@ -73,8 +71,8 @@ private void addCompilerParser(CompilerParser parser) {
    * Get the compiler parser to use.
    * @return CompilerParser
    */
-  protected CompilerParser getCompilerParser() {
-    String parserValue = this.settings.getString(this.language.getPluginProperty(PARSER_KEY_DEF));
+  protected CompilerParser getCompilerParser(SensorContext context) {
+    String parserValue = context.settings().getString(this.language.getPluginProperty(PARSER_KEY_DEF));
     CompilerParser parser = parsers.get(parserValue);
     if (parser == null) {
       parserValue = language.getPluginProperty(language.getPluginProperty(DEFAULT_PARSER_DEF));
@@ -94,28 +92,12 @@ public String getReportPathKey() {
     return language.getPluginProperty(REPORT_PATH_KEY);
   }
 
-  /**
-   * Get string property from configuration. If the string is not set or empty,
-   * return the default value.
-   *
-   * @param name Name of the property
-   * @param def Default value
-   * @return Value of the property if set and not empty, else default value.
-   */
-  public String getParserStringProperty(String name, String def) {
-    String s = this.settings.getString(name);
-    if (s == null || s.isEmpty()) {
-      return def;
-    }
-    return s;
-  }
-
   @Override
   protected void processReport(final SensorContext context, File report)
     throws javax.xml.stream.XMLStreamException {
-    final CompilerParser parser = getCompilerParser();
-    final String reportCharset = getParserStringProperty(this.language.getPluginProperty(REPORT_CHARSET_DEF), parser.defaultCharset());
-    final String reportRegEx = getParserStringProperty(this.language.getPluginProperty(REPORT_REGEX_DEF), parser.defaultRegexp());
+    final CompilerParser parser = getCompilerParser(context);
+    final String reportCharset = getContextStringProperty(context, this.language.getPluginProperty(REPORT_CHARSET_DEF), parser.defaultCharset());
+    final String reportRegEx = getContextStringProperty(context, this.language.getPluginProperty(REPORT_REGEX_DEF), parser.defaultRegexp());
     final List<CompilerParser.Warning> warnings = new LinkedList<>();
 
     // Iterate through the lines of the input file

cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CxxCoverageSensor.java

@@ -86,7 +86,7 @@ public class CxxCoverageSensor extends CxxReportSensor {
    * @param context for current file
    */
   public CxxCoverageSensor(CxxCoverageCache cache, CxxLanguage language, SensorContext context) {
-    super(language, context.settings());
+    super(language);
     this.cache = cache;
     if (context.getSonarQubeVersion().isGreaterThanOrEqual(SQ_6_2)) {
       isSQ_6_2_or_newer = true;

cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensor.java

@@ -27,7 +27,6 @@
 
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -49,8 +48,8 @@ public class CxxCppCheckSensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxCppCheckSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxCppCheckSensor(CxxLanguage language) {
+    super(language);
     parsers.add(new CppcheckParserV2(this));
     parsers.add(new CppcheckParserV1(this));
   }

cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensor.java

@@ -24,7 +24,6 @@
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -50,12 +49,10 @@ public class CxxDrMemorySensor extends CxxReportSensor {
   public static final String DEFAULT_CHARSET_DEF = StandardCharsets.UTF_8.name();
 
   /**
-   * Create Sensor for DrMemory
-   * @param language C++ language object
-   * @param settings CXX properties
+   * {@inheritDoc}
    */
-  public CxxDrMemorySensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxDrMemorySensor(CxxLanguage language) {
+    super(language);
   }
 
   /**

cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherSensor.java

@@ -34,7 +34,6 @@
 import org.codehaus.staxmate.in.SMInputCursor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -60,8 +59,8 @@ public class CxxOtherSensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxOtherSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxOtherSensor(CxxLanguage language) {
+    super(language);
   }
 
   @Override

cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintSensor.java

@@ -30,7 +30,6 @@
 import org.codehaus.staxmate.in.SMInputCursor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -55,8 +54,8 @@ public class CxxPCLintSensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxPCLintSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxPCLintSensor(CxxLanguage language) {
+    super(language);
   }
 
   @Override

cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsSensor.java

@@ -28,7 +28,6 @@
 import org.jdom.input.SAXBuilder;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -47,8 +46,8 @@ public class CxxRatsSensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxRatsSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxRatsSensor(CxxLanguage language) {
+    super(language);
   }
 
   @Override

cxx-sensors/src/main/java/org/sonar/cxx/sensors/tests/xunit/CxxXunitSensor.java

@@ -36,7 +36,6 @@
 import org.sonar.cxx.sensors.utils.CxxReportSensor;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.cxx.CxxLanguage;
@@ -58,8 +57,8 @@ public class CxxXunitSensor extends CxxReportSensor {
   /**
    * {@inheritDoc}
    */
-  public CxxXunitSensor(CxxLanguage language, Settings settings) {
-    super(language, settings);
+  public CxxXunitSensor(CxxLanguage language) {
+    super(language);
     xsltURL = language.getStringOption(XSLT_URL_KEY);
   }