, AtomicInteger> counters = new HashMap<>();
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/CacheStrategies.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/CacheStrategies.java
index 2eeee267103..9d876d8446b 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/CacheStrategies.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/CacheStrategies.java
@@ -25,18 +25,18 @@
import java.io.IOException;
import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.SonarProduct;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.sensor.SensorContext;
import org.sonar.api.utils.Version;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.bridge.AnalysisMode;
import org.sonar.plugins.javascript.bridge.PluginInfo;
public class CacheStrategies {
- private static final Logger LOG = Loggers.get(CacheStrategies.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CacheStrategies.class);
private static final CacheReporter REPORTER = new CacheReporter();
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/JsonSerialization.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/JsonSerialization.java
index eaeb12cbe4a..cc6ea2f2bfc 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/JsonSerialization.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/JsonSerialization.java
@@ -24,13 +24,13 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.sensor.SensorContext;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
class JsonSerialization extends CacheSerialization {
- private static final Logger LOG = Loggers.get(JsonSerialization.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JsonSerialization.class);
private final Class
jsonClass;
private final Gson gson = new Gson();
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/SequenceSerialization.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/SequenceSerialization.java
index 659162326ef..8e5804f0370 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/SequenceSerialization.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/bridge/cache/SequenceSerialization.java
@@ -33,13 +33,13 @@
import java.util.List;
import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.sensor.SensorContext;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
class SequenceSerialization extends CacheSerialization {
- private static final Logger LOG = Loggers.get(SequenceSerialization.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SequenceSerialization.class);
private static final String ENTRY_SEPARATOR = "/";
private static final int DEFAULT_BUFFER_SIZE = 8192;
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/AbstractExternalIssuesSensor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/AbstractExternalIssuesSensor.java
index ae3e6b9b3a9..4462820ae38 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/AbstractExternalIssuesSensor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/AbstractExternalIssuesSensor.java
@@ -22,19 +22,19 @@
import com.google.gson.Gson;
import java.io.File;
import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.FilePredicates;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.rule.Severity;
import org.sonar.api.batch.sensor.Sensor;
import org.sonar.api.batch.sensor.SensorContext;
import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonarsource.analyzer.commons.ExternalReportProvider;
abstract class AbstractExternalIssuesSensor implements Sensor {
- private static final Logger LOG = Loggers.get(AbstractExternalIssuesSensor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractExternalIssuesSensor.class);
static final Gson gson = new Gson();
static final long DEFAULT_REMEDIATION_COST = 5L;
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/EslintReportSensor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/EslintReportSensor.java
index fc441d37bb6..6f164e55be6 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/EslintReportSensor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/EslintReportSensor.java
@@ -27,6 +27,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.fs.TextPointer;
import org.sonar.api.batch.fs.TextRange;
@@ -35,14 +37,12 @@
import org.sonar.api.batch.sensor.issue.NewExternalIssue;
import org.sonar.api.batch.sensor.issue.NewIssueLocation;
import org.sonar.api.rules.RuleType;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.rules.EslintRulesDefinition;
import org.sonarsource.analyzer.commons.ExternalRuleLoader;
public class EslintReportSensor extends AbstractExternalIssuesSensor {
- private static final Logger LOG = Loggers.get(EslintReportSensor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EslintReportSensor.class);
@Override
String linterName() {
@@ -90,7 +90,7 @@ private static void saveEslintError(
) {
String eslintKey = eslintError.ruleId;
if (eslintKey == null) {
- LOG.warn("Parse error issue from ESLint will not be imported, file " + inputFile.uri());
+ LOG.warn("Parse error issue from ESLint will not be imported, file {}", inputFile.uri());
return;
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/TslintReportSensor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/TslintReportSensor.java
index 3ebde562a4b..72aa265fbfd 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/TslintReportSensor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/external/TslintReportSensor.java
@@ -27,6 +27,8 @@
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.fs.TextPointer;
import org.sonar.api.batch.fs.TextRange;
@@ -34,13 +36,11 @@
import org.sonar.api.batch.sensor.issue.NewExternalIssue;
import org.sonar.api.batch.sensor.issue.NewIssueLocation;
import org.sonar.api.rules.RuleType;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.rules.TslintRulesDefinition;
public class TslintReportSensor extends AbstractExternalIssuesSensor {
- private static final Logger LOG = Loggers.get(TslintReportSensor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TslintReportSensor.class);
@Override
String linterName() {
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/BundleAssessor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/BundleAssessor.java
index 2faf3ad792c..673155aeee7 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/BundleAssessor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/BundleAssessor.java
@@ -26,13 +26,13 @@
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
public class BundleAssessor implements Assessor {
- private static final Logger LOG = Loggers.get(BundleAssessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BundleAssessor.class);
static final String PROPERTY = "sonar.javascript.detectBundles";
private static final Pattern COMMENT_OPERATOR_FUNCTION = bundleRegexPattern();
private static final int READ_CHARACTERS_LIMIT = 2048;
@@ -73,11 +73,11 @@ public boolean test(InputFile inputFile) {
}
private static Pattern bundleRegexPattern() {
- var COMMENT = "/\\*.*\\*/";
- var OPERATOR = "[!;+(]";
- var OPTIONAL_FUNCTION_NAME = "(?: [_$a-zA-Z][_$a-zA-Z0-9]*)?";
+ var comment = "/\\*.*\\*/";
+ var operator = "[!;+(]";
+ var optionalFunctionName = "(?: [_$a-zA-Z][_$a-zA-Z0-9]*)?";
return Pattern.compile(
- COMMENT + "\\s*" + OPERATOR + "function ?" + OPTIONAL_FUNCTION_NAME + "\\(",
+ comment + "\\s*" + operator + "function ?" + optionalFunctionName + "\\(",
DOTALL
);
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/MinificationAssessor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/MinificationAssessor.java
index 44ab65da4cb..d68b05742e3 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/MinificationAssessor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/MinificationAssessor.java
@@ -19,9 +19,9 @@
*/
package org.sonar.plugins.javascript.filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
/**
* An object to assess if a .js file is a minified file or not.
@@ -33,7 +33,7 @@
*/
class MinificationAssessor implements Assessor {
- private static final Logger LOG = Loggers.get(MinificationAssessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinificationAssessor.class);
private static final int DEFAULT_AVERAGE_LINE_LENGTH_THRESHOLD = 200;
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/PathAssessor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/PathAssessor.java
index 6a730646146..d4a5a07c302 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/PathAssessor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/PathAssessor.java
@@ -19,17 +19,17 @@
*/
package org.sonar.plugins.javascript.filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.config.Configuration;
import org.sonar.api.utils.WildcardPattern;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.JavaScriptPlugin;
import org.sonar.plugins.javascript.utils.Exclusions;
class PathAssessor implements Assessor {
- private static final Logger LOG = Loggers.get(PathAssessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PathAssessor.class);
private final WildcardPattern[] excludedPatterns;
PathAssessor(Configuration configuration) {
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/SizeAssessor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/SizeAssessor.java
index 241f792e7c6..a4e28ad612c 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/SizeAssessor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/filter/SizeAssessor.java
@@ -21,15 +21,15 @@
import java.io.IOException;
import java.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.config.Configuration;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.JavaScriptPlugin;
class SizeAssessor implements Assessor {
- private static final Logger LOG = Loggers.get(SizeAssessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SizeAssessor.class);
private static final long DEFAULT_MAX_FILE_SIZE_KB = 1000L; // 1MB
/**
@@ -58,7 +58,7 @@ class SizeAssessor implements Assessor {
}
final void fallbackToDefaultMaxFileSize(String reasonErrorMessage) {
- LOG.warn(reasonErrorMessage + ", falling back to " + DEFAULT_MAX_FILE_SIZE_KB + ".");
+ LOG.warn("{}, falling back to {}.", reasonErrorMessage, DEFAULT_MAX_FILE_SIZE_KB);
maxFileSizeKb = DEFAULT_MAX_FILE_SIZE_KB;
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/CoverageSensor.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/CoverageSensor.java
index 9472cd36c7e..243b838494e 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/CoverageSensor.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/CoverageSensor.java
@@ -19,6 +19,9 @@
*/
package org.sonar.plugins.javascript.lcov;
+import static org.sonar.plugins.javascript.JavaScriptPlugin.LCOV_REPORT_PATHS;
+import static org.sonar.plugins.javascript.JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,6 +29,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.FilePredicate;
import org.sonar.api.batch.fs.FileSystem;
import org.sonar.api.batch.fs.InputFile;
@@ -34,24 +39,21 @@
import org.sonar.api.batch.sensor.SensorContext;
import org.sonar.api.batch.sensor.SensorDescriptor;
import org.sonar.api.batch.sensor.coverage.NewCoverage;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.JavaScriptLanguage;
-import org.sonar.plugins.javascript.JavaScriptPlugin;
import org.sonar.plugins.javascript.TypeScriptLanguage;
import org.sonarsource.analyzer.commons.FileProvider;
public class CoverageSensor implements Sensor {
- private static final Logger LOG = Loggers.get(CoverageSensor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CoverageSensor.class);
@Override
public void describe(SensorDescriptor descriptor) {
descriptor
.onlyOnLanguages(JavaScriptLanguage.KEY, TypeScriptLanguage.KEY)
.onlyWhenConfiguration(conf ->
- conf.hasKey(JavaScriptPlugin.LCOV_REPORT_PATHS) ||
- conf.hasKey(JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS)
+ conf.hasKey(LCOV_REPORT_PATHS) ||
+ conf.hasKey(LCOV_REPORT_PATHS_ALIAS)
)
.name("JavaScript/TypeScript Coverage")
.onlyOnFileType(Type.MAIN);
@@ -60,23 +62,18 @@ public void describe(SensorDescriptor descriptor) {
@Override
public void execute(SensorContext context) {
Set reports = new HashSet<>(
- Arrays.asList(context.config().getStringArray(JavaScriptPlugin.LCOV_REPORT_PATHS))
+ Arrays.asList(context.config().getStringArray(LCOV_REPORT_PATHS))
);
reports.addAll(
- Arrays.asList(context.config().getStringArray(JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS))
+ Arrays.asList(context.config().getStringArray(LCOV_REPORT_PATHS_ALIAS))
);
- logIfUsedProperty(context, JavaScriptPlugin.LCOV_REPORT_PATHS);
- logIfUsedProperty(context, JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS);
+ logIfUsedProperty(context, LCOV_REPORT_PATHS);
+ logIfUsedProperty(context, LCOV_REPORT_PATHS_ALIAS);
if (
- context.config().hasKey(JavaScriptPlugin.LCOV_REPORT_PATHS) &&
- context.config().hasKey(JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS)
+ context.config().hasKey(LCOV_REPORT_PATHS) &&
+ context.config().hasKey(LCOV_REPORT_PATHS_ALIAS)
) {
- LOG.info(
- String.format(
- "Merging coverage reports from %s and %s.",
- JavaScriptPlugin.LCOV_REPORT_PATHS,
- JavaScriptPlugin.LCOV_REPORT_PATHS_ALIAS
- )
+ LOG.info("Merging coverage reports from {} and {}.", LCOV_REPORT_PATHS, LCOV_REPORT_PATHS_ALIAS
);
}
List lcovFiles = getLcovFiles(context.fileSystem().baseDir(), reports);
@@ -133,17 +130,12 @@ private static void saveCoverageFromLcovFiles(SensorContext context, List
List unresolvedPaths = parser.unresolvedPaths();
if (!unresolvedPaths.isEmpty()) {
- LOG.warn(
- String.format("Could not resolve %d file paths in %s", unresolvedPaths.size(), lcovFiles)
- );
+ LOG.warn("Could not resolve {} file paths in {}", unresolvedPaths.size(), lcovFiles);
if (LOG.isDebugEnabled()) {
- LOG.debug("Unresolved paths:\n" + String.join("\n", unresolvedPaths));
+ LOG.debug("Unresolved paths:\n{}", String.join("\n", unresolvedPaths));
} else {
LOG.warn(
- "First unresolved path: " +
- unresolvedPaths.get(0) +
- " (Run in DEBUG mode to get full list of unresolved paths)"
- );
+ "First unresolved path: {} (Run in DEBUG mode to get full list of unresolved paths)", unresolvedPaths.get(0));
}
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/LCOVParser.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/LCOVParser.java
index 77e76a1d78f..56409e4faf7 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/LCOVParser.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/lcov/LCOVParser.java
@@ -31,11 +31,11 @@
import java.util.Set;
import java.util.stream.Stream;
import javax.annotation.CheckForNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.sensor.SensorContext;
import org.sonar.api.batch.sensor.coverage.NewCoverage;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
/**
* http://ltp.sourceforge.net/coverage/lcov/geninfo.1.php
@@ -53,7 +53,7 @@ class LCOVParser {
private final FileLocator fileLocator;
private int inconsistenciesCounter = 0;
- private static final Logger LOG = Loggers.get(LCOVParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LCOVParser.class);
private LCOVParser(List lines, SensorContext context, FileLocator fileLocator) {
this.context = context;
@@ -150,12 +150,10 @@ private void parseLineCoverage(FileData fileData, int reportLineNum, String line
private void logWrongDataWarning(String dataType, int reportLineNum, Exception e) {
LOG.debug(
- String.format(
- "Problem during processing LCOV report: can't save %s data for line %s of coverage report file (%s).",
+ "Problem during processing LCOV report: can't save {} data for line {} of coverage report file ({}).",
dataType,
reportLineNum,
e.toString()
- )
);
inconsistenciesCounter++;
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommand.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommand.java
index 9958b71a6d3..301cc27149b 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommand.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommand.java
@@ -26,9 +26,9 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.utils.Version;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
/**
* Represents invocation of external NodeJS process. Use {@link NodeCommandBuilder} to create instance of this class.
@@ -42,7 +42,7 @@
*/
public class NodeCommand {
- private static final Logger LOG = Loggers.get(NodeCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NodeCommand.class);
final Consumer outputConsumer;
final Consumer errorConsumer;
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilder.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilder.java
index 0872b5b6ee4..84610fa8de0 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilder.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilder.java
@@ -29,7 +29,7 @@
import org.sonarsource.api.sonarlint.SonarLintSide;
@ScannerSide
-@SonarLintSide(lifespan = SonarLintSide.MULTIPLE_ANALYSES)
+@SonarLintSide(lifespan = SonarLintSide.INSTANCE)
public interface NodeCommandBuilder {
NodeCommandBuilder minNodeVersion(Version minNodeVersion);
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilderImpl.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilderImpl.java
index 94ba1877df4..227b4a5d351 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilderImpl.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeCommandBuilderImpl.java
@@ -34,15 +34,15 @@
import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.config.Configuration;
import org.sonar.api.utils.Version;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.bridge.EmbeddedNode;
public class NodeCommandBuilderImpl implements NodeCommandBuilder {
- private static final Logger LOG = Loggers.get(NodeCommandBuilderImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NodeCommandBuilderImpl.class);
public static final String NODE_EXECUTABLE_DEFAULT = "node";
private static final String NODE_EXECUTABLE_DEFAULT_MACOS =
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeVersion.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeVersion.java
index 2daf8c301a2..3979bb67022 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeVersion.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/NodeVersion.java
@@ -23,13 +23,13 @@
import static java.util.Collections.singletonList;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.utils.Version;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
public class NodeVersion {
- private static final Logger LOG = Loggers.get(NodeVersion.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NodeVersion.class);
private NodeVersion() {
// utility class
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/ProcessWrapper.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/ProcessWrapper.java
index 07737420817..d3d833f7656 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/ProcessWrapper.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/ProcessWrapper.java
@@ -36,7 +36,7 @@
* thread
*/
@ScannerSide
-@SonarLintSide(lifespan = SonarLintSide.MULTIPLE_ANALYSES)
+@SonarLintSide(lifespan = SonarLintSide.INSTANCE)
public interface ProcessWrapper {
Process startProcess(
List commandLine,
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/StreamConsumer.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/StreamConsumer.java
index 5b6236555cd..122316d106f 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/StreamConsumer.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/nodejs/StreamConsumer.java
@@ -28,12 +28,12 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class StreamConsumer {
- private static final Logger LOG = Loggers.get(StreamConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamConsumer.class);
private final ExecutorService executorService;
StreamConsumer() {
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/sonarlint/SonarLintTypeCheckingCheckerImpl.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/sonarlint/SonarLintTypeCheckingCheckerImpl.java
index 2e647efd31e..62ff6a71b2d 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/sonarlint/SonarLintTypeCheckingCheckerImpl.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/sonarlint/SonarLintTypeCheckingCheckerImpl.java
@@ -25,16 +25,16 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.stream.Stream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonar.api.batch.sensor.SensorContext;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
import org.sonar.plugins.javascript.utils.PathWalker;
import org.sonarsource.api.sonarlint.SonarLintSide;
@SonarLintSide(lifespan = "MODULE")
public class SonarLintTypeCheckingCheckerImpl implements SonarLintTypeCheckingChecker {
- private static final Logger LOG = Loggers.get(SonarLintTypeCheckingCheckerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SonarLintTypeCheckingCheckerImpl.class);
static final String MAX_FILES_PROPERTY = "sonar.javascript.sonarlint.typechecking.maxfiles";
static final int DEFAULT_MAX_FILES_FOR_TYPE_CHECKING = 20_000;
private static final int FILE_WALK_MAX_DEPTH = 20;
diff --git a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/utils/ProgressReport.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/utils/ProgressReport.java
index 466b3f31cd5..d83a7a2a33e 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/utils/ProgressReport.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/utils/ProgressReport.java
@@ -20,8 +20,8 @@
package org.sonar.plugins.javascript.utils;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ProgressReport implements Runnable {
@@ -55,7 +55,7 @@ public ProgressReport(String threadName, long period, Logger logger, String adje
}
public ProgressReport(String threadName, long period, String adjective) {
- this(threadName, period, Loggers.get(ProgressReport.class), adjective);
+ this(threadName, period, LoggerFactory.getLogger(ProgressReport.class), adjective);
}
public ProgressReport(String threadName, long period) {
diff --git a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/CssRuleSensorTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/CssRuleSensorTest.java
index af36308936e..4f607be0d6b 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/CssRuleSensorTest.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/CssRuleSensorTest.java
@@ -123,7 +123,6 @@ public void setUp() throws IOException {
new CssRuleSensor(
sonarRuntime,
bridgeServerMock,
- new AnalysisWarningsWrapper(),
CHECK_FACTORY
);
}
@@ -169,7 +168,6 @@ void test_descriptor_sonarqube_9_3() {
new CssRuleSensor(
sonarRuntime,
bridgeServerMock,
- new AnalysisWarningsWrapper(),
CHECK_FACTORY
);
DefaultSensorDescriptor sensorDescriptor = new DefaultSensorDescriptor();
@@ -189,7 +187,6 @@ void test_descriptor_sonarqube_9_2() {
new CssRuleSensor(
sonarRuntime,
bridgeServerMock,
- new AnalysisWarningsWrapper(),
CHECK_FACTORY
);
DefaultSensorDescriptor sensorDescriptor = new DefaultSensorDescriptor();
diff --git a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/HtmlSensorTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/HtmlSensorTest.java
index 4c36880620b..98cc46c529b 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/HtmlSensorTest.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/HtmlSensorTest.java
@@ -317,7 +317,6 @@ private HtmlSensor createSensor() {
return new HtmlSensor(
checks(DUPLICATE_BRANCH_RULE_KEY, PARSING_ERROR_RULE_KEY),
bridgeServerMock,
- new AnalysisWarningsWrapper(),
analysisProcessor
);
}
diff --git a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JavaScriptEslintBasedSensorTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JavaScriptEslintBasedSensorTest.java
index 215d52d9faa..bc0580730cb 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JavaScriptEslintBasedSensorTest.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JavaScriptEslintBasedSensorTest.java
@@ -524,8 +524,6 @@ void should_skip_analysis_when_no_files() throws Exception {
var javaScriptEslintBasedSensor = new JsTsSensor(
checks(ESLINT_BASED_RULE),
bridgeServerMock,
- analysisWarnings,
- tempFolder,
analysisWithProgram,
analysisWithWatchProgram
);
@@ -542,8 +540,6 @@ void handle_missing_node() throws Exception {
var javaScriptEslintBasedSensor = new JsTsSensor(
checks(ESLINT_BASED_RULE),
bridgeServerMock,
- new AnalysisWarningsWrapper(),
- tempFolder,
analysisWithProgram,
analysisWithWatchProgram
);
@@ -606,8 +602,6 @@ void should_not_create_parsing_issue_when_no_rule() throws IOException {
new JsTsSensor(
checks(ESLINT_BASED_RULE),
bridgeServerMock,
- null,
- tempFolder,
analysisWithProgram,
analysisWithWatchProgram
)
@@ -788,8 +782,6 @@ private JsTsSensor createSensor(
return new JsTsSensor(
checks(ESLINT_BASED_RULE, "S2260", "S1451"),
bridgeServerMock,
- new AnalysisWarningsWrapper(),
- tempFolder,
sonarlintTypeCheckingChecker,
analysisWithProgram,
analysisWithWatchProgram
diff --git a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JsTsSensorTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JsTsSensorTest.java
index 8c4b51dcec4..0bc38fc8adf 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JsTsSensorTest.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/bridge/JsTsSensorTest.java
@@ -187,7 +187,7 @@ void should_analyse() throws Exception {
.contains(
String.format(
"Saving issue for rule no-all-duplicated-branches on file %s at line 1",
- inputFile.absolutePath()
+ inputFile
)
);
@@ -775,8 +775,6 @@ private JsTsSensor createSensor() {
return new JsTsSensor(
checks(ESLINT_BASED_RULE, "S2260"),
bridgeServerMock,
- analysisWarnings,
- tempFolder,
analysisWithProgram(),
analysisWithWatchProgram()
);
diff --git a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/utils/ProgressReportTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/utils/ProgressReportTest.java
index 8605d3fc3d2..6b20ef8eafa 100644
--- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/utils/ProgressReportTest.java
+++ b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/utils/ProgressReportTest.java
@@ -29,8 +29,8 @@
import java.util.concurrent.atomic.AtomicLong;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import org.slf4j.Logger;
import org.sonar.api.testfixtures.log.LogTesterJUnit5;
-import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.LoggerLevel;
class ProgressReportTest {
@@ -73,7 +73,7 @@ void testPlural() throws Exception {
verify(logger, atLeast(3)).info(captor.capture());
List messages = captor.getAllValues();
- assertThat(messages.size()).isGreaterThanOrEqualTo(3);
+ assertThat(messages).hasSizeGreaterThanOrEqualTo(3);
assertThat(messages.get(0)).isEqualTo("2 source files to be analyzed");
for (int i = 1; i < messages.size() - 1; i++) {
assertThat(messages.get(i)).isEqualTo("0/2 files analyzed, current file: foo1.java");
@@ -107,7 +107,7 @@ void testSingular() throws Exception {
verify(logger, atLeast(3)).info(captor.capture());
List messages = captor.getAllValues();
- assertThat(messages.size()).isGreaterThanOrEqualTo(3);
+ assertThat(messages).hasSizeGreaterThanOrEqualTo(3);
assertThat(messages.get(0)).isEqualTo("1 source file to be analyzed");
for (int i = 1; i < messages.size() - 1; i++) {
assertThat(messages.get(i)).isEqualTo("0/1 files analyzed, current file: foo.java");