Scala updates.

SimY4 · SimY4 · commit 52e226f2c719 · 2022-09-28T16:52:54.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.diffplug.spotless' version '6.11.0' apply false
-    id 'cz.augi.gradle.wartremover' version '0.16.1' apply false
     id 'info.solidsoft.pitest' version '1.9.0' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'me.champeau.jmh' version '0.6.8' apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
 errorprone = '2.10.0'
 jackson = '2.13.4'
-scala212 = '2.12.15'
-scala213 = '2.13.8'
+scala212 = '2.12.17'
+scala213 = '2.13.9'
 scala3 = '3.2.0'
 scalatest = '3.2.13'
 scalaxml = '2.1.0'
+wartremover = '3.0.6'
 
 [libraries]
 assertj = 'org.assertj:assertj-core:3.23.1'
@@ -37,6 +38,9 @@ scalatest-shouldmatchers-v212 = { module = 'org.scalatest:scalatest-shouldmatche
 scalatest-shouldmatchers-v213 = { module = 'org.scalatest:scalatest-shouldmatchers_2.13', version.ref = 'scalatest' }
 scalatest-shouldmatchers-v3 = { module = 'org.scalatest:scalatest-shouldmatchers_3', version.ref = 'scalatest' }
 scalatest-junit-runner = 'co.helmethair:scalatest-junit-runner:0.1.12'
+wartremover-v212 = { module = 'org.wartremover:wartremover_2.12', version.ref = 'wartremover' }
+wartremover-v213 = { module = 'org.wartremover:wartremover_2.13', version.ref = 'wartremover' }
+wartremover-v3 = { module = 'org.wartremover:wartremover_3', version.ref = 'wartremover' }
 xom = 'xom:xom:1.3.8'
 
 [bundles]
diff --git a/xpath-to-xml-scala/build-2.12.gradle b/xpath-to-xml-scala/build-2.12.gradle
@@ -1,7 +1,6 @@
 ext.moduleName = 'com.github.simych.xpath.scala'
 
 apply plugin: 'scala'
-apply plugin: 'cz.augi.gradle.wartremover'
 
 buildDir = 'build-2.12'
 
@@ -20,6 +19,8 @@ dependencies {
     implementation libs.scala.reflect.v212
     implementation libs.scala.xml.v212
 
+    scalaCompilerPlugins libs.wartremover.v212
+
     testImplementation project(':xpath-to-xml-test')
     testImplementation libs.bundles.scalatest.v212
 }
@@ -45,10 +46,6 @@ scaladoc {
     }
 }
 
-wartremover {
-    warningWarts -= ['IsInstanceOf', 'Null', 'Throw', 'Var']
-}
-
 tasks.withType(ScalaCompile) {
     scalaCompileOptions.with {
         deprecation = true
@@ -87,6 +84,7 @@ tasks.withType(ScalaCompile) {
                 '-opt:l:method',
                 '-opt:l:inline',
                 '-opt-inline-from:com.github.simy4.xpath.scala.navigator.**,com.github.simy4.xpath.scala.syntax.**',
+                '-P:wartremover:only-warn-traverser:org.wartremover.warts.Unsafe',
         ]
         if (JavaVersion.current().isJava9Compatible()) {
             additionalParameters << '-release' << '8'
diff --git a/xpath-to-xml-scala/build-2.13.gradle b/xpath-to-xml-scala/build-2.13.gradle
@@ -1,7 +1,6 @@
 ext.moduleName = 'com.github.simych.xpath.scala'
 
 apply plugin: 'scala'
-apply plugin: 'cz.augi.gradle.wartremover'
 
 buildDir = 'build-2.13'
 
@@ -20,6 +19,8 @@ dependencies {
     implementation libs.scala.reflect.v213
     implementation libs.scala.xml.v213
 
+    scalaCompilerPlugins libs.wartremover.v213
+
     testImplementation project(':xpath-to-xml-test')
     testImplementation libs.bundles.scalatest.v213
 }
@@ -45,10 +46,6 @@ scaladoc {
     }
 }
 
-wartremover {
-    warningWarts -= ['IsInstanceOf', 'Null', 'Throw', 'Var']
-}
-
 tasks.withType(ScalaCompile) {
     scalaCompileOptions.with {
         deprecation = true
@@ -81,10 +78,10 @@ tasks.withType(ScalaCompile) {
                 '-Wdead-code',                       // Warn when dead code is identified.
                 '-Wnumeric-widen',                   // Warn when numerics are widened.
                 '-Xsource:3',                        // Turn on future language features.
-                '-target:jvm-1.8',
                 '-opt:l:method',
                 '-opt:l:inline',
                 '-opt-inline-from:com.github.simy4.xpath.scala.navigator.**,com.github.simy4.xpath.scala.syntax.**',
+                '-P:wartremover:only-warn-traverser:org.wartremover.warts.Unsafe',
         ]
         if (JavaVersion.current().isJava9Compatible()) {
             additionalParameters << '-release' << '8'
diff --git a/xpath-to-xml-scala/build-3.gradle b/xpath-to-xml-scala/build-3.gradle
@@ -19,6 +19,8 @@ dependencies {
     implementation libs.scala.library.v3
     implementation libs.scala.xml.v3
 
+    scalaCompilerPlugins libs.wartremover.v3
+
     testImplementation project(':xpath-to-xml-test')
     testImplementation libs.bundles.scalatest.v3
 }
@@ -46,6 +48,7 @@ tasks.withType(ScalaCompile) {
                 '-language:macros,implicitConversions',
                 '-Xfatal-warnings',                     // Fail the compilation if there are any warnings.
                 '-source:3.2',                          // Turn on future language features.
+                '-P:wartremover:only-warn-traverser:org.wartremover.warts.Unsafe',
         ]
         if (JavaVersion.current().isJava9Compatible()) {
             additionalParameters << '-release' << '8'
diff --git a/xpath-to-xml-scala/src/jmh/scala/com/github/simy4/xpath/ScalaXmlBuilderBenchmark.scala b/xpath-to-xml-scala/src/jmh/scala/com/github/simy4/xpath/ScalaXmlBuilderBenchmark.scala
@@ -25,6 +25,7 @@ import javax.xml.namespace.NamespaceContext
 
 @BenchmarkMode(Array(Mode.Throughput))
 @State(Scope.Benchmark)
+@SuppressWarnings(Array("org.wartremover.warts.Null", "org.wartremover.warts.Var"))
 class ScalaXmlBuilderBenchmark {
 
   @Param(Array("simple", "ns-simple", "attr", "special"))
diff --git a/xpath-to-xml-scala/src/main/scala-2-/com/github/simy4/xpath/scala/xpath/XPathLiteral.scala b/xpath-to-xml-scala/src/main/scala-2-/com/github/simy4/xpath/scala/xpath/XPathLiteral.scala
@@ -25,6 +25,7 @@ final class XPathLiteral(private val sc: StringContext) extends AnyVal {
   def xpath(args: Any*): Expr = macro XPathLiteral.xpathImpl
 }
 
+@SuppressWarnings(Array("org.wartremover.warts.Null"))
 object XPathLiteral {
   def xpathImpl(c: blackbox.Context)(args: c.Expr[Any]*): c.Expr[Expr] = {
     import c.universe._
diff --git a/xpath-to-xml-scala/src/main/scala-3+/com/github/simy4/xpath/scala/xpath/XPathLiteral.scala b/xpath-to-xml-scala/src/main/scala-3+/com/github/simy4/xpath/scala/xpath/XPathLiteral.scala
@@ -23,6 +23,7 @@ import javax.xml.xpath.XPathExpressionException
 import scala.quoted.{ quotes, Expr, Exprs, Quotes, Varargs }
 
 object XPathLiteral:
+  @SuppressWarnings(Array("org.wartremover.warts.AsInstanceOf", "org.wartremover.warts.Null", "org.wartremover.warts.IterableOps"))
   def xpathImpl(sc: Expr[StringContext])(using Quotes): Expr[JExpr] =
     import quotes.reflect.report
     sc match
diff --git a/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/impl/ToXmlElemOps.scala b/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/impl/ToXmlElemOps.scala
@@ -22,6 +22,7 @@ import javax.xml.namespace.NamespaceContext
 import _root_.scala.collection.{ Iterable, Map }
 import _root_.scala.xml.Elem
 
+@SuppressWarnings(Array("org.wartremover.warts.Null"))
 trait ToXmlElemOps {
   @SuppressWarnings(Array("org.wartremover.warts.DefaultArguments"))
   implicit def toXmlElemOps(elem: Elem)(implicit namespaceContext: NamespaceContext = null): XmlElemOps =
diff --git a/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/navigator/ScalaXmlNavigator.scala b/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/navigator/ScalaXmlNavigator.scala
@@ -21,6 +21,7 @@ import xml.{ Attribute => XmlAttribute, Elem, Null, Text }
 
 import javax.xml.namespace.QName
 
+@SuppressWarnings(Array("org.wartremover.warts.Throw"))
 class ScalaXmlNavigator(override val root: Root) extends Navigator[ScalaXmlNode] with scala.compat.Converters {
   override def parentOf(node: ScalaXmlNode): ScalaXmlNode                                = node.parent
   override def elementsOf(parent: ScalaXmlNode): java.lang.Iterable[_ <: ScalaXmlNode]   = parent.elements
@@ -49,6 +50,7 @@ class ScalaXmlNavigator(override val root: Root) extends Navigator[ScalaXmlNode]
       case _ =>
         throw new XmlBuilderException(s"Unable to create element for ${parent.toString}")
     }
+  @SuppressWarnings(Array("org.wartremover.warts.IsInstanceOf"))
   @throws[XmlBuilderException]("If unable to set text to given node")
   override def setText(node: ScalaXmlNode, text: String): Unit =
     node match {
diff --git a/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/navigator/scalaXmlNodes.scala b/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/navigator/scalaXmlNodes.scala
@@ -31,6 +31,7 @@ import javax.xml.namespace.QName
 sealed trait ScalaXmlNode extends NavigatorNode with Equals {
   type N
   val parent: ScalaXmlNode
+  @SuppressWarnings(Array("org.wartremover.warts.Var"))
   private[navigator] var node: N
   def elements: Iterable[ScalaXmlNode]
   def attributes: Iterable[ScalaXmlNode]
@@ -40,6 +41,7 @@ sealed trait ScalaXmlNode extends NavigatorNode with Equals {
 abstract private[navigator] class AbstractScalaXmlNode protected (val parent: ScalaXmlNode)
     extends ScalaXmlNode
     with Serializable {
+  @SuppressWarnings(Array("org.wartremover.warts.IsInstanceOf"))
   def canEqual(that: Any): Boolean = that.isInstanceOf[ScalaXmlNode]
   override def equals(that: Any): Boolean =
     that match {
@@ -51,6 +53,7 @@ abstract private[navigator] class AbstractScalaXmlNode protected (val parent: Sc
 }
 
 @SerialVersionUID(1L)
+@SuppressWarnings(Array("org.wartremover.warts.Null", "org.wartremover.warts.Var"))
 final class Root(var node: Elem) extends AbstractScalaXmlNode(null) {
   type N = Elem
   def getName: QName                  = new QName(NavigatorNode.DOCUMENT)
@@ -60,6 +63,7 @@ final class Root(var node: Elem) extends AbstractScalaXmlNode(null) {
 }
 
 @SerialVersionUID(1L)
+@SuppressWarnings(Array("org.wartremover.warts.Var"))
 final class Element private[navigator] (
   private[this] var _node: Elem,
   var index: Int,
@@ -85,6 +89,7 @@ final class Element private[navigator] (
       else parentNode.copy(child = parentNode.child.updated(index, elem))
     _node = elem
   }
+  @SuppressWarnings(Array("org.wartremover.warts.IsInstanceOf"))
   override def canEqual(that: Any): Boolean = that.isInstanceOf[Element]
   override def equals(that: Any): Boolean =
     that match {
@@ -99,6 +104,7 @@ final class Element private[navigator] (
 }
 
 @SerialVersionUID(1L)
+@SuppressWarnings(Array("org.wartremover.warts.Var"))
 final class Attribute private[navigator] (
   private[this] var _attr: XmlAttribute,
   override val parent: ScalaXmlNode {
diff --git a/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/spi/ScalaXmlNavigatorSpi.scala b/xpath-to-xml-scala/src/main/scala/com/github/simy4/xpath/scala/spi/ScalaXmlNavigatorSpi.scala
@@ -25,9 +25,11 @@ import scala.navigator.{ Root, ScalaXmlNavigator }
  * Scala XML model navigator extension SPI.
  */
 class ScalaXmlNavigatorSpi extends NavigatorSpi {
+  @SuppressWarnings(Array("org.wartremover.warts.IsInstanceOf"))
   override def canHandle(o: Any): Boolean = o.isInstanceOf[Elem]
 
   @throws[XmlBuilderException]("If unable process XML node")
+  @SuppressWarnings(Array("org.wartremover.warts.AsInstanceOf", "org.wartremover.warts.Throw"))
   override def process[T](xml: T, effects: java.lang.Iterable[Effect]): T =
     xml match {
       case elem: Elem =>
diff --git a/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/XmlBuilderSpec.scala b/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/XmlBuilderSpec.scala
@@ -29,7 +29,7 @@ import javax.xml.xpath.{ XPathConstants, XPathExpression, XPathFactory }
 
 import java.io.StringReader
 
-@SuppressWarnings(Array("org.wartremover.warts.Any"))
+@SuppressWarnings(Array("org.wartremover.warts.Any", "org.wartremover.warts.Null"))
 class XmlBuilderSpec extends AnyFunSpec with Matchers {
   val namespaceContext = new SimpleNamespaceContext
   val namespaceBinding = NamespaceBinding("my", namespaceContext.getNamespaceURI("my"), TopScope)
@@ -62,7 +62,7 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(root))
-          .fold(throw _, identity)
+          .getOrThrow
         val builtDocumentString = xmlToString(builtDocument)
 
         xmlProperties.keys.foreach { xpath =>
@@ -85,7 +85,7 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(root))
-          .fold(throw _, identity)
+          .getOrThrow
         val builtDocumentString = xmlToString(builtDocument)
 
         xmlProperties.foreach { case (xpath, value) =>
@@ -112,7 +112,7 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(oldDocument))
-          .fold(throw _, identity)
+          .getOrThrow
         val builtDocumentString = xmlToString(builtDocument)
 
         xmlProperties.foreach { case (xpath, value) =>
@@ -131,48 +131,48 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
         val xmlProperties = fixtureAccessor.getXmlProperties.asScala
         val xml           = fixtureAccessor.getPutValueXml
         val oldDocument   = XML.loadString(xml)
-        var builtDocument = xmlProperties.toSeq
+        val builtDocument1 = xmlProperties.toSeq
           .foldRight(Right(Nil): Either[Throwable, List[Effect]]) { (pair, acc) =>
             for {
               xs  <- acc
               eff <- Effect.putValue(pair._1, pair._2)
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(oldDocument))
-          .fold(throw _, identity)
-        var builtDocumentString = xmlToString(builtDocument)
+          .getOrThrow
+        val builtDocumentString1 = xmlToString(builtDocument1)
 
         xmlProperties.foreach { case (xpath, value) =>
-          val documentSource: InputSource = builtDocumentString
+          val documentSource: InputSource = builtDocumentString1
           it(s"first: $xpath should evaluate to ${value.toString}") {
             xpath.evaluate(documentSource, XPathConstants.STRING) should equal(value)
           }
         }
         // although these cases are working fine the order of attribute is messed up
         if (!fixtureAccessor.toString.startsWith("attr")) {
-          it("first: should match exactly")(builtDocumentString should ===(fixtureAccessor.getPutValueXml))
+          it("first: should match exactly")(builtDocumentString1 should ===(fixtureAccessor.getPutValueXml))
         }
 
-        builtDocument = xmlProperties.keys
+        val builtDocument2 = xmlProperties.keys
           .foldRight(Right(Nil): Either[Throwable, List[Effect]]) { (xpath, acc) =>
             for {
               xs  <- acc
               eff <- Effect.put(xpath)
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(oldDocument))
-          .fold(throw _, identity)
-        builtDocumentString = xmlToString(builtDocument)
+          .getOrThrow
+        val builtDocumentString2 = xmlToString(builtDocument2)
 
         xmlProperties.foreach { case (xpath, value) =>
-          val documentSource: InputSource = builtDocumentString
+          val documentSource: InputSource = builtDocumentString2
           it(s"second: $xpath should evaluate to ${value.toString}") {
             xpath.evaluate(documentSource, XPathConstants.STRING) should equal(value)
           }
         }
         // although these cases are working fine the order of attribute is messed up
         if (!fixtureAccessor.toString.startsWith("attr")) {
-          it("second: should match exactly")(builtDocumentString should ===(fixtureAccessor.getPutValueXml))
+          it("second: should match exactly")(builtDocumentString2 should ===(fixtureAccessor.getPutValueXml))
         }
       }
 
@@ -188,7 +188,7 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
             } yield eff :: xs
           }
           .flatMap(XmlBuilder(_)(oldDocument))
-          .fold(throw _, identity)
+          .getOrThrow
         val builtDocumentString = xmlToString(builtDocument)
 
         xmlProperties.keys.foreach { xpath =>
@@ -226,4 +226,9 @@ class XmlBuilderSpec extends AnyFunSpec with Matchers {
       linkedHashMap
     }
   }
+
+  implicit class EitherOps[L, R](either: Either[L, R]) {
+    @SuppressWarnings(Array("org.wartremover.warts.Throw"))
+    def getOrThrow(implicit ev: L <:< Throwable): R = either.fold(throw _, identity)
+  }
 }
diff --git a/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/navigator/ScalaXmlNodeSpec.scala b/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/navigator/ScalaXmlNodeSpec.scala
@@ -23,7 +23,7 @@ import org.scalatest.matchers.should.Matchers
 
 import javax.xml.namespace.QName
 
-@SuppressWarnings(Array("org.wartremover.warts.TraversableOps"))
+@SuppressWarnings(Array("org.wartremover.warts.IterableOps", "org.wartremover.warts.Null"))
 class ScalaXmlNodeSpec extends AnyFunSpec with Matchers {
   val xml = <root attr="value">text</root>
 
diff --git a/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/xpath/XPathLiteralSpec.scala b/xpath-to-xml-scala/src/test/scala/com/github/simy4/xpath/scala/xpath/XPathLiteralSpec.scala
@@ -20,6 +20,7 @@ import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
 import parser.XPathParser
 
+@SuppressWarnings(Array("org.wartremover.warts.Null"))
 class XPathLiteralSpec extends AnyFunSpec with Matchers {
   import scala.implicits._
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ final class XPathLiteral(private val sc: StringContext) extends AnyVal {`
`25`	`25`	`def xpath(args: Any*): Expr = macro XPathLiteral.xpathImpl`
`26`	`26`	`}`
`27`	`27`
	`28`	`+@SuppressWarnings(Array("org.wartremover.warts.Null"))`
`28`	`29`	`object XPathLiteral {`
`29`	`30`	`def xpathImpl(c: blackbox.Context)(args: c.Expr[Any]*): c.Expr[Expr] = {`
`30`	`31`	`import c.universe._`