Merge pull request #2774 from guwirth/remove-deprecated

Remove deprecated issues
SonarOpenCommunity · Oct 10, 2024 · c868d7d · c868d7d
2 parents ce500f8 + e5a0c3d
commit c868d7d
Show file tree

Hide file tree

Showing 129 changed files with 634 additions and 973 deletions.
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/api/UndocumentedApiCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/api/UndocumentedApiCheck.java
@@ -24,8 +24,8 @@
 import com.sonar.cxx.sslr.api.Token;
 import java.util.Arrays;
 import java.util.List;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.tag.Tag;
@@ -71,7 +71,7 @@
 @SqaleConstantRemediation("5min")
 public class UndocumentedApiCheck extends AbstractCxxPublicApiVisitor<Grammar> {
 
-  private static final Logger LOG = Loggers.get(UndocumentedApiCheck.class);
+  private static final Logger LOG = LoggerFactory.getLogger(UndocumentedApiCheck.class);
 
   private static final String[] DEFAULT_NAME_SUFFIX = new String[]{".h", ".hh", ".hpp", ".H"};
 

diff --git a/cxx-checks/src/test/java/org/sonar/cxx/checks/CxxFileTesterHelper.java b/cxx-checks/src/test/java/org/sonar/cxx/checks/CxxFileTesterHelper.java
@@ -64,12 +64,17 @@ private static DefaultInputFile createInputFile(String fileName, String basePath
   }
 
   private static String getSourceCode(File filename, Charset defaultCharset) throws IOException {
-    try (var bomInputStream = new BOMInputStream(new FileInputStream(filename),
-                                             ByteOrderMark.UTF_8,
-                                             ByteOrderMark.UTF_16LE,
-                                             ByteOrderMark.UTF_16BE,
-                                             ByteOrderMark.UTF_32LE,
-                                             ByteOrderMark.UTF_32BE)) {
+    try (var bomInputStream = BOMInputStream.builder()
+      .setInputStream(new FileInputStream(filename))
+      .setInclude(false)
+      .setByteOrderMarks(
+        ByteOrderMark.UTF_8,
+        ByteOrderMark.UTF_16LE,
+        ByteOrderMark.UTF_16BE,
+        ByteOrderMark.UTF_32LE,
+        ByteOrderMark.UTF_32BE
+      )
+      .get()) {
       ByteOrderMark bom = bomInputStream.getBOM();
       Charset charset = bom != null ? Charset.forName(bom.getCharsetName()) : defaultCharset;
       byte[] bytes = bomInputStream.readAllBytes();

diff --git a/cxx-checks/src/test/java/org/sonar/cxx/checks/regex/FileHeaderCheckTest.java b/cxx-checks/src/test/java/org/sonar/cxx/checks/regex/FileHeaderCheckTest.java
@@ -163,8 +163,8 @@ void regex() throws UnsupportedEncodingException, IOException {
 
     check = new FileHeaderCheck();
     check.headerFormat = "//\\s*<copyright>\\s*"
-                           + "//\\s*Copyright \\(c\\) (AAA BBB|CCC DDD) GmbH. All rights reserved.\\s*"
-                           + "//\\s*</copyright>\\s*";
+      + "//\\s*Copyright \\(c\\) (AAA BBB|CCC DDD) GmbH. All rights reserved.\\s*"
+      + "//\\s*</copyright>\\s*";
     check.isRegularExpression = true;
 
     tester = CxxFileTesterHelper.create("src/test/resources/checks/FileHeaderCheck/Regex7.cc", ".");
@@ -179,7 +179,7 @@ void should_fail_with_bad_regular_expression() {
     check.headerFormat = "[";
     check.isRegularExpression = true;
 
-    IllegalStateException thrown = catchThrowableOfType(check::init, IllegalStateException.class);
+    IllegalStateException thrown = catchThrowableOfType(IllegalStateException.class, check::init);
     assertThat(thrown).hasMessage("Unable to compile the regular expression: \"^[\"");
   }
 

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/postjobs/FinalReport.java b/cxx-sensors/src/main/java/org/sonar/cxx/postjobs/FinalReport.java
@@ -22,16 +22,16 @@
 import org.sonar.api.batch.postjob.PostJob;
 import org.sonar.api.batch.postjob.PostJobContext;
 import org.sonar.api.batch.postjob.PostJobDescriptor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.preprocessor.CxxPreprocessor;
 import org.sonar.cxx.visitors.CxxParseErrorLoggerVisitor;
 
 public class FinalReport implements PostJob {
 
   private static final String DEBUG_INFO_MSG
     = "Turn debug info on to get more details (sonar-scanner -X -Dsonar.verbose=true ...).";
-  private static final Logger LOG = Loggers.get(FinalReport.class);
+  private static final Logger LOG = LoggerFactory.getLogger(FinalReport.class);
 
   @Override
   public void describe(PostJobDescriptor descriptor) {

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/prejobs/XlstSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/prejobs/XlstSensor.java
@@ -33,8 +33,8 @@
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.scanner.sensor.ProjectSensor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxUtils;
 
 @Phase(name = Phase.Name.PRE)
@@ -46,7 +46,7 @@ public class XlstSensor implements ProjectSensor {
   public static final String OUTPUT_KEY = ".outputs";
   private static final String MISSING_VALUE = "XLST: '{}' value is not defined.";
 
-  private static final Logger LOG = Loggers.get(XlstSensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(XlstSensor.class);
   private static final int MAX_STYLESHEETS = 10;
 
   private SensorContext context;

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSASensor.java
@@ -33,8 +33,8 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxIssuesReportSensor;
 import org.sonar.cxx.sensors.utils.InvalidReportException;
 import org.sonar.cxx.utils.CxxReportIssue;
@@ -47,7 +47,7 @@ public class CxxClangSASensor extends CxxIssuesReportSensor {
 
   public static final String REPORT_PATH_KEY = "sonar.cxx.clangsa.reportPaths";
 
-  private static final Logger LOG = Loggers.get(CxxClangSASensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxClangSASensor.class);
 
   public static List<PropertyDefinition> properties() {
     return Collections.unmodifiableList(Arrays.asList(

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java
@@ -24,14 +24,14 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.regex.Pattern;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.TextScanner;
 import org.sonar.cxx.utils.CxxReportIssue;
 
 public class ClangTidyParser {
 
-  private static final Logger LOG = Loggers.get(ClangTidyParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ClangTidyParser.class);
 
   private static final String REGEX = "((?>[a-zA-Z]:[\\\\/])??[^:]++):(\\d{1,5}):(\\d{1,5}): ([^:]++): (.+)";
   private static final Pattern PATTERN = Pattern.compile(REGEX);

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensor.java
@@ -26,8 +26,8 @@
 import java.util.regex.Pattern;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxIssuesReportSensor;
 import org.sonar.cxx.sensors.utils.InvalidReportException;
 import org.sonar.cxx.sensors.utils.TextScanner;
@@ -38,7 +38,7 @@
  */
 public abstract class CxxCompilerSensor extends CxxIssuesReportSensor {
 
-  private static final Logger LOG = Loggers.get(CxxCompilerSensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxCompilerSensor.class);
   private final Set<String> notExistingGroupName = new HashSet<>();
 
   @Override

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CoverageSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/CoverageSensor.java
@@ -25,8 +25,8 @@
 import java.util.Map;
 import org.sonar.api.batch.sensor.coverage.NewCoverage;
 import org.sonar.api.utils.PathUtils;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxReportSensor;
 import org.sonar.cxx.sensors.utils.CxxUtils;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
@@ -37,7 +37,7 @@
  */
 public abstract class CoverageSensor extends CxxReportSensor {
 
-  private static final Logger LOG = Loggers.get(CoverageSensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CoverageSensor.class);
 
   private final CoverageParser parser;
   private final String reportPathsKey;

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/bullseye/BullseyeParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/bullseye/BullseyeParser.java
@@ -30,8 +30,8 @@
 import org.codehaus.staxmate.in.SMHierarchicCursor;
 import org.codehaus.staxmate.in.SMInputCursor;
 import org.sonar.api.utils.PathUtils;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.coverage.CoverageMeasures;
 import org.sonar.cxx.sensors.coverage.CoverageParser;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
@@ -43,7 +43,7 @@
  */
 public class BullseyeParser implements CoverageParser {
 
-  private static final Logger LOG = Loggers.get(BullseyeParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BullseyeParser.class);
 
   private String prevLine;
   private int totalconditions;

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/cobertura/CoberturaParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/cobertura/CoberturaParser.java
@@ -27,8 +27,8 @@
 import javax.xml.stream.XMLStreamException;
 import org.codehaus.staxmate.in.SMHierarchicCursor;
 import org.codehaus.staxmate.in.SMInputCursor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.coverage.CoverageMeasures;
 import org.sonar.cxx.sensors.coverage.CoverageParser;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
@@ -40,7 +40,7 @@
  */
 public class CoberturaParser implements CoverageParser {
 
-  private static final Logger LOG = Loggers.get(CoberturaParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CoberturaParser.class);
   private static final Pattern CONDITION_PATTERN = Pattern.compile("\\((.*?)\\)");
 
   private Path baseDir = Path.of(".");

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/ctc/TestwellCtcTxtParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/ctc/TestwellCtcTxtParser.java
@@ -31,8 +31,8 @@
 import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import org.apache.commons.io.FilenameUtils;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.coverage.CoverageMeasures;
 import org.sonar.cxx.sensors.coverage.CoverageParser;
 import static org.sonar.cxx.sensors.coverage.ctc.TestwellCtcTxtResult.FILE_HEADER;
@@ -47,7 +47,7 @@
  */
 public class TestwellCtcTxtParser implements CoverageParser {
 
-  private static final Logger LOG = Loggers.get(TestwellCtcTxtParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TestwellCtcTxtParser.class);
 
   private static final int FROM_START = 0;
   private static final int CONDS_FALSE = 1;

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/vs/VisualStudioParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/vs/VisualStudioParser.java
@@ -25,8 +25,8 @@
 import javax.xml.stream.XMLStreamException;
 import org.codehaus.staxmate.in.SMHierarchicCursor;
 import org.codehaus.staxmate.in.SMInputCursor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.coverage.CoverageMeasures;
 import org.sonar.cxx.sensors.coverage.CoverageParser;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
@@ -38,7 +38,7 @@
  */
 public class VisualStudioParser implements CoverageParser {
 
-  private static final Logger LOG = Loggers.get(VisualStudioParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(VisualStudioParser.class);
 
   private static void collectModuleMeasures(SMInputCursor module, Map<String, CoverageMeasures> coverageData)
     throws XMLStreamException {

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CppcheckParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CppcheckParser.java
@@ -25,15 +25,15 @@
 import javax.xml.stream.XMLStreamException;
 import org.codehaus.staxmate.in.SMHierarchicCursor;
 import org.codehaus.staxmate.in.SMInputCursor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
 import org.sonar.cxx.sensors.utils.StaxParser;
 import org.sonar.cxx.utils.CxxReportIssue;
 
 public class CppcheckParser {
 
-  private static final Logger LOG = Loggers.get(CppcheckParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CppcheckParser.class);
 
   private final CxxCppCheckSensor sensor;
 

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckSensor.java
@@ -27,8 +27,8 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxIssuesReportSensor;
 import org.sonar.cxx.sensors.utils.InvalidReportException;
 
@@ -41,7 +41,7 @@
 public class CxxCppCheckSensor extends CxxIssuesReportSensor {
 
   public static final String REPORT_PATH_KEY = "sonar.cxx.cppcheck.reportPaths";
-  private static final Logger LOG = Loggers.get(CxxCppCheckSensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxCppCheckSensor.class);
 
   public static List<PropertyDefinition> properties() {
     return Collections.unmodifiableList(Arrays.asList(

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemorySensor.java
@@ -28,8 +28,8 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.drmemory.DrMemoryParser.DrMemoryError;
 import org.sonar.cxx.sensors.drmemory.DrMemoryParser.DrMemoryError.Location;
 import org.sonar.cxx.sensors.utils.CxxIssuesReportSensor;
@@ -48,7 +48,7 @@ public class CxxDrMemorySensor extends CxxIssuesReportSensor {
   public static final String REPORT_PATH_KEY = "sonar.cxx.drmemory.reportPaths";
   public static final String REPORT_ENCODING_DEF = "sonar.cxx.drmemory.encoding";
   private static final String DEFAULT_ENCODING_DEF = StandardCharsets.UTF_8.name();
-  private static final Logger LOG = Loggers.get(CxxDrMemorySensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxDrMemorySensor.class);
 
   public static List<PropertyDefinition> properties() {
     var category = "CXX External Analyzers";

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java
@@ -27,14 +27,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.drmemory.DrMemoryParser.DrMemoryError.Location;
 import org.sonar.cxx.sensors.utils.CxxUtils;
 
 public final class DrMemoryParser {
 
-  private static final Logger LOG = Loggers.get(DrMemoryParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DrMemoryParser.class);
   private static final Pattern RX_MESSAGE_FINDER = Pattern.compile("^Error #\\d{1,6}:(.*)");
   private static final Pattern RX_FILE_FINDER = Pattern.compile(
     "\\s*+#[^\\[]++\\[((?>[a-zA-Z]:[\\\\/])??[^:]++):(\\d{1,5})\\]");

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferSensor.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferSensor.java
@@ -24,8 +24,8 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.CxxIssuesReportSensor;
 
 /**
@@ -36,7 +36,7 @@
 public class CxxInferSensor extends CxxIssuesReportSensor {
 
   public static final String REPORT_PATH_KEY = "sonar.cxx.infer.reportPaths";
-  private static final Logger LOG = Loggers.get(CxxInferSensor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxInferSensor.class);
 
   public static List<PropertyDefinition> properties() {
     return List.of(PropertyDefinition.builder(REPORT_PATH_KEY)

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/InferParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/InferParser.java
@@ -25,8 +25,8 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.EmptyReportException;
 import org.sonar.cxx.sensors.utils.InvalidReportException;
 import org.sonar.cxx.utils.CxxReportIssue;
@@ -38,7 +38,7 @@
  */
 public class InferParser {
 
-  private static final Logger LOG = Loggers.get(InferParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(InferParser.class);
 
   private final CxxInferSensor sensor;
 

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherRepository.java
@@ -23,8 +23,8 @@
 import java.nio.charset.StandardCharsets;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
@@ -35,7 +35,7 @@ public class CxxOtherRepository implements RulesDefinition {
   public static final String KEY = "other";
   private static final String NAME = "Other";
 
-  private static final Logger LOG = Loggers.get(CxxOtherRepository.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CxxOtherRepository.class);
 
   private final RulesDefinitionXmlLoader xmlRuleLoader;
   private final Configuration config;