Skip to content

Commit 90d859e

Browse files
committed
Replace SLF4J with Sonar logging
1 parent dec2bfd commit 90d859e

File tree

4 files changed

+43
-15
lines changed

4 files changed

+43
-15
lines changed

plugin/src/main/scala/com/buransky/plugins/scoverage/sensor/ScoverageSensor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import com.buransky.plugins.scoverage.measure.ScalaMetrics
2626
import com.buransky.plugins.scoverage.util.LogUtil
2727
import com.buransky.plugins.scoverage.xml.XmlScoverageReportParser
2828
import com.buransky.plugins.scoverage.{CoveredStatement, DirectoryStatementCoverage, FileStatementCoverage, _}
29-
import org.slf4j.LoggerFactory
3029
import org.sonar.api.batch.fs.{FileSystem, InputFile}
3130
import org.sonar.api.batch.{CoverageExtension, Sensor, SensorContext}
3231
import org.sonar.api.config.Settings
3332
import org.sonar.api.measures.{CoreMetrics, CoverageMeasuresBuilder, Measure}
3433
import org.sonar.api.resources.{File, Project, Resource}
3534
import org.sonar.api.scan.filesystem.PathResolver
35+
import org.sonar.api.utils.log.Loggers
3636

3737
import scala.collection.JavaConversions._
3838

@@ -43,7 +43,7 @@ import scala.collection.JavaConversions._
4343
*/
4444
class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem: FileSystem, scala: Scala)
4545
extends Sensor with CoverageExtension {
46-
private val log = LoggerFactory.getLogger(classOf[ScoverageSensor])
46+
private val log = Loggers.get(classOf[ScoverageSensor])
4747
protected val SCOVERAGE_REPORT_PATH_PROPERTY = "sonar.scoverage.reportPath"
4848
protected lazy val scoverageReportParser: ScoverageReportParser = XmlScoverageReportParser()
4949

plugin/src/main/scala/com/buransky/plugins/scoverage/xml/XmlScoverageReportConstructingParser.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,25 @@
1919
*/
2020
package com.buransky.plugins.scoverage.xml
2121

22+
import java.io.File
23+
2224
import com.buransky.plugins.scoverage._
25+
import com.buransky.plugins.scoverage.util.PathUtil
26+
import org.sonar.api.utils.log.Loggers
27+
28+
import scala.annotation.tailrec
29+
import scala.collection.mutable
2330
import scala.io.Source
2431
import scala.xml.parsing.ConstructingParser
25-
import scala.xml.{Text, NamespaceBinding, MetaData}
26-
import org.apache.log4j.Logger
27-
import scala.collection.mutable
28-
import scala.annotation.tailrec
29-
import java.io.File
30-
import com.buransky.plugins.scoverage.util.PathUtil
32+
import scala.xml.{MetaData, NamespaceBinding, Text}
3133

3234
/**
3335
* Scoverage XML parser based on ConstructingParser provided by standard Scala library.
3436
*
3537
* @author Rado Buransky
3638
*/
3739
class XmlScoverageReportConstructingParser(source: Source) extends ConstructingParser(source, false) {
38-
private val log = Logger.getLogger(classOf[XmlScoverageReportConstructingParser])
40+
private val log = Loggers.get(classOf[XmlScoverageReportConstructingParser])
3941

4042
private val CLASS_ELEMENT = "class"
4143
private val FILENAME_ATTRIBUTE = "filename"

plugin/src/main/scala/com/buransky/plugins/scoverage/xml/XmlScoverageReportParser.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@
1919
*/
2020
package com.buransky.plugins.scoverage.xml
2121

22-
import scala.io.Source
23-
import com.buransky.plugins.scoverage.{ProjectStatementCoverage, ScoverageReportParser, ScoverageException}
24-
import org.apache.log4j.Logger
2522
import com.buransky.plugins.scoverage.util.LogUtil
23+
import com.buransky.plugins.scoverage.{ProjectStatementCoverage, ScoverageException, ScoverageReportParser}
24+
import org.sonar.api.utils.log.Loggers
25+
26+
import scala.io.Source
2627

2728
/**
2829
* Bridge between parser implementation and coverage provider.
2930
*
3031
* @author Rado Buransky
3132
*/
3233
class XmlScoverageReportParser extends ScoverageReportParser {
33-
private val log = Logger.getLogger(classOf[XmlScoverageReportParser])
34+
private val log = Loggers.get(classOf[XmlScoverageReportParser])
3435

3536
def parse(reportFilePath: String): ProjectStatementCoverage = {
3637
require(reportFilePath != null)

plugin/src/test/scala/com/buransky/plugins/scoverage/sensor/TestSensorContext.scala

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ import java.lang.Double
2323
import java.util.Date
2424
import java.{io, util}
2525

26-
import org.sonar.api.batch.fs.{InputFile, InputPath}
27-
import org.sonar.api.batch.{Event, SensorContext}
26+
import org.sonar.api.batch.fs.{FileSystem, InputFile, InputPath}
27+
import org.sonar.api.batch.rule.ActiveRules
28+
import org.sonar.api.batch.sensor.dependency.NewDependency
29+
import org.sonar.api.batch.sensor.duplication.NewDuplication
30+
import org.sonar.api.batch.sensor.highlighting.NewHighlighting
31+
import org.sonar.api.batch.sensor.issue.NewIssue
32+
import org.sonar.api.batch.sensor.measure.NewMeasure
33+
import org.sonar.api.batch.{AnalysisMode, Event, SensorContext}
34+
import org.sonar.api.config.Settings
2835
import org.sonar.api.design.Dependency
2936
import org.sonar.api.measures.{Measure, MeasuresFilter, Metric}
3037
import org.sonar.api.resources.{ProjectLink, Resource}
@@ -102,4 +109,22 @@ class TestSensorContext extends SensorContext {
102109
override def saveMeasure(inputFile: InputFile, metric: Metric[_ <: io.Serializable], value: Double): Measure[_ <: io.Serializable] = ???
103110

104111
override def saveMeasure(inputFile: InputFile, measure: Measure[_ <: io.Serializable]): Measure[_ <: io.Serializable] = ???
112+
113+
override def newDuplication(): NewDuplication = ???
114+
115+
override def activeRules(): ActiveRules = ???
116+
117+
override def newHighlighting(): NewHighlighting = ???
118+
119+
override def analysisMode(): AnalysisMode = ???
120+
121+
override def fileSystem(): FileSystem = ???
122+
123+
override def newDependency(): NewDependency = ???
124+
125+
override def settings(): Settings = ???
126+
127+
override def newMeasure[G <: io.Serializable](): NewMeasure[G] = ???
128+
129+
override def newIssue(): NewIssue = ???
105130
}

0 commit comments

Comments
 (0)