diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/AbstractXinfoProvider.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/AbstractXinfoProvider.java index 1f42595..74060ce 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/AbstractXinfoProvider.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/AbstractXinfoProvider.java @@ -24,8 +24,8 @@ import org.apache.commons.io.IOUtils; import org.sonar.api.config.Configuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -40,7 +40,7 @@ * Fundamental implementation of a XinfoProvider. */ public abstract class AbstractXinfoProvider implements IXinfoProvider { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractXinfoProvider.class); + private static final Logger LOGGER = Loggers.get(AbstractXinfoProvider.class); private static final String PROLOGUE = "\n\n"; private DocumentBuilder documentBuilder; private Unmarshaller unmarshaller; diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/RuleFactory.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/RuleFactory.java index 3fc1e09..462c593 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/RuleFactory.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/RuleFactory.java @@ -12,8 +12,8 @@ import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import org.sonar.check.Rule; import de.tgmz.sonar.plugins.xinfo.languages.Language; @@ -25,7 +25,7 @@ * Factory for creating the sonar rules for a {@link Language} */ public final class RuleFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(RuleFactory.class); + private static final Logger LOGGER = Loggers.get(RuleFactory.class); private static RuleFactory instance; private RuleFactory() { diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/SecureDocumentBuilderFactory.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/SecureDocumentBuilderFactory.java index 3990c0a..225fb0d 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/SecureDocumentBuilderFactory.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/SecureDocumentBuilderFactory.java @@ -15,14 +15,14 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; /** * Factory for secure DocumentBuilders. */ public final class SecureDocumentBuilderFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(SecureDocumentBuilderFactory.class); + private static final Logger LOGGER = Loggers.get(SecureDocumentBuilderFactory.class); private DocumentBuilder documentBuilder; private static SecureDocumentBuilderFactory instance; diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/XinfoFileProvider.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/XinfoFileProvider.java index dea63d0..84b2ca2 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/XinfoFileProvider.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/XinfoFileProvider.java @@ -28,8 +28,8 @@ import org.apache.commons.io.filefilter.WildcardFileFilter; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.config.Configuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import de.tgmz.sonar.plugins.xinfo.config.XinfoConfig; import de.tgmz.sonar.plugins.xinfo.generated.plicomp.FILE; @@ -41,7 +41,7 @@ * Searches the filesystem for a suitable xinfo.xml file and parses it. */ public class XinfoFileProvider extends AbstractXinfoProvider { - private static final Logger LOGGER = LoggerFactory.getLogger(XinfoFileProvider.class); + private static final Logger LOGGER = Loggers.get(XinfoFileProvider.class); public XinfoFileProvider(Configuration configuration) { super(configuration); diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/color/AbstractColorizing.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/color/AbstractColorizing.java index c226481..fabe8ca 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/color/AbstractColorizing.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/color/AbstractColorizing.java @@ -22,10 +22,10 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.math.NumberUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.highlighting.TypeOfText; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; /** * Common functions for Syntax highlighting. @@ -33,7 +33,7 @@ public abstract class AbstractColorizing implements IColorizing { public static final ThreadLocal NF = ThreadLocal.withInitial(NumberFormat::getNumberInstance); - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractColorizing.class); + private static final Logger LOGGER = Loggers.get(AbstractColorizing.class); /** The areas to colorize. */ private HighligthedAreas areas; @@ -54,7 +54,7 @@ protected AbstractColorizing(InputFile file, Charset charset, int limit) throws List readLines = IOUtils.readLines(file.inputStream(), charset); - if (readLines.size() > limit && LOGGER.isInfoEnabled()) { + if (readLines.size() > limit) { LOGGER.info("File {} containes {} lines. Syntax highlighting will be limited to {} lines" , file.filename(), NF.get().format(readLines.size()), NF.get().format(this.limit)); } diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/rules/XinfoRulesDefinition.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/rules/XinfoRulesDefinition.java index f4aba7e..fdedcf9 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/rules/XinfoRulesDefinition.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/rules/XinfoRulesDefinition.java @@ -12,8 +12,8 @@ import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.server.rule.RulesDefinitionAnnotationLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import de.tgmz.sonar.plugins.xinfo.RuleFactory; import de.tgmz.sonar.plugins.xinfo.languages.Language; @@ -22,7 +22,7 @@ * Defines rules for all language. */ public final class XinfoRulesDefinition implements RulesDefinition { - private static final Logger LOGGER = LoggerFactory.getLogger(XinfoRulesDefinition.class); + private static final Logger LOGGER = Loggers.get(XinfoRulesDefinition.class); @Override public void define(Context context) { diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractColorizer.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractColorizer.java index da16834..15eeba8 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractColorizer.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractColorizer.java @@ -21,8 +21,8 @@ import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.SensorDescriptor; import org.sonar.api.batch.sensor.highlighting.NewHighlighting; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import de.tgmz.sonar.plugins.xinfo.color.ColorizingData; import de.tgmz.sonar.plugins.xinfo.color.IColorizing; @@ -35,7 +35,7 @@ * @param the colorizing scheme to use */ public abstract class AbstractColorizer implements Sensor { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractColorizer.class); + private static final Logger LOGGER = Loggers.get(AbstractColorizer.class); private static final int DEFAULT_LINES_LIMIT = 5000; private Language lang; diff --git a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractXinfoIssuesLoader.java b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractXinfoIssuesLoader.java index e82ef52..dfd0ef5 100644 --- a/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractXinfoIssuesLoader.java +++ b/sonar-xinfo-plugin/src/main/java/de/tgmz/sonar/plugins/xinfo/sensors/AbstractXinfoIssuesLoader.java @@ -13,18 +13,17 @@ import java.util.Iterator; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.FileSystem; 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.batch.sensor.issue.NewIssue; import org.sonar.api.batch.sensor.issue.NewIssueLocation; -import org.sonar.api.issue.impact.Severity; -import org.sonar.api.issue.impact.SoftwareQuality; import org.sonar.api.rule.RuleKey; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; import de.tgmz.sonar.plugins.xinfo.XinfoException; import de.tgmz.sonar.plugins.xinfo.XinfoProviderFactory; @@ -51,7 +50,7 @@ public String toString() { + ", severity=" + severity + "]"; } } - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractXinfoIssuesLoader.class); + private static final Logger LOGGER = Loggers.get(AbstractXinfoIssuesLoader.class); protected final FileSystem fileSystem; protected SensorContext context; private Language lang; @@ -156,10 +155,6 @@ private void saveIssue(final Issue issue) { NewIssue newIssue = context.newIssue().forRule(ruleKey); - if (issue.severity != null) { - newIssue.overrideImpact(SoftwareQuality.RELIABILITY, issue.severity); - } - NewIssueLocation primaryLocation = newIssue.newLocation().on(issue.inputFile).message(issue.message); int lineToSave = issue.line; @@ -180,14 +175,16 @@ private void saveIssue(final Issue issue) { private static Severity computeSeverity(char c) { switch (c) { case 'I': - return Severity.LOW; + return Severity.INFO; case 'W': - return Severity.MEDIUM; + return Severity.MINOR; case 'E': + return Severity.MAJOR; case 'S': + return Severity.CRITICAL; case 'U': default: - return Severity.HIGH; + return Severity.BLOCKER; } }