fix most scala deprecation warnings rooted in this build (#1095)

* more

* more

* more

* more

* upgrade odb

* back to latest released codegen for now

* fmt

Author: mpollmeier

build.sbt

@@ -1,7 +1,7 @@
 name := "codepropertygraph"
 
 // parsed by project/Versions.scala, updated by updateDependencies.sh
-val overflowdbVersion = "1.28"
+val overflowdbVersion = "1.29"
 
 inThisBuild(
   List(

codepropertygraph/src/main/scala/io/shiftleft/Implicits.scala

@@ -10,7 +10,7 @@ object Implicits {
   implicit class IteratorDeco[T](val iterator: Iterator[T]) extends AnyVal {
     def onlyChecked: T = {
       if (iterator.hasNext) {
-        val res = iterator.next
+        val res = iterator.next()
         if (iterator.hasNext) {
           logger.warn("iterator was expected to have exactly one element, but it actually has more")
         }

codepropertygraph/src/main/scala/io/shiftleft/SerializedCpg.scala

@@ -19,7 +19,7 @@ class SerializedCpg extends AutoCloseable {
     * Create Serialized CPG from existing file. If the file does not exist,
     * an empty Serialized CPG is created.
     **/
-  def this(filename: String) {
+  def this(filename: String) = {
     this()
     initZipFilesystem(filename)
   }

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgOverlayLoader.scala

@@ -154,7 +154,7 @@ private class CpgOverlayApplier(graph: Graph) {
       case STRING_LIST =>
         val listBuilder = List.newBuilder[String]
         propertyValue.getStringList.getValuesList.forEach(listBuilder.addOne)
-        element.setProperty(propertyName, listBuilder.result)
+        element.setProperty(propertyName, listBuilder.result())
       case VALUE_NOT_SET =>
       case valueCase =>
         throw new RuntimeException("Error: unsupported property case: " + valueCase)

codepropertygraph/src/test/scala/io/shiftleft/codepropertygraph/cpgloading/DiffGraphTest.scala

@@ -90,7 +90,7 @@ class DiffGraphTest extends AnyWordSpec with Matchers {
       builder.addNode(secondNode)
       builder.addNode(thirdNode)
       val keyPool = Some(new IntervalKeyPool(20, 30))
-      val appliedGraph = DiffGraph.Applier.applyDiff(builder.build, graph, true, keyPool)
+      val appliedGraph = DiffGraph.Applier.applyDiff(builder.build(), graph, true, keyPool)
       appliedGraph.nodeToGraphId(firstNode) shouldBe 20
       appliedGraph.nodeToGraphId(secondNode) shouldBe 21
       appliedGraph.nodeToGraphId(thirdNode) shouldBe 22

codepropertygraph/src/test/scala/io/shiftleft/passes/CpgOverlayIntegrationTest.scala

@@ -111,7 +111,7 @@ class CpgOverlayIntegrationTest extends AnyWordSpec with Matchers {
   def applyDiffAndGetInverse(cpg: Cpg)(fun: DiffGraph.Builder => Unit): DiffGraph = {
     val builder = DiffGraph.newBuilder
     fun(builder)
-    val diff = builder.build
+    val diff = builder.build()
     val applied = DiffGraph.Applier.applyDiff(diff, cpg, undoable = true)
     val inverse = applied.inverseDiffGraph.get
     val inverseProto = new DiffGraphProtoSerializer().serialize(inverse)

codepropertygraph/src/test/scala/io/shiftleft/passes/KeyPoolTests.scala

@@ -32,6 +32,8 @@ class KeyPoolTests extends AnyWordSpec with Matchers {
       keySets.combinations(2).foreach {
         case List(x: Set[Long], y: Set[Long]) =>
           x.intersect(y).isEmpty shouldBe true
+        case _ =>
+          fail()
       }
     }
 
@@ -63,7 +65,7 @@ class KeyPoolTests extends AnyWordSpec with Matchers {
           pool1.last should be < pool2.first
           pool2.last should be < pool3.first
           pool3.last shouldBe Long.MaxValue - 1
-        case _ => fail
+        case _ => fail()
       }
     }
 

console/src/test/scala/io/shiftleft/console/ConsoleTests.scala

@@ -169,7 +169,7 @@ class ConsoleTests extends AnyWordSpec with Matchers {
         case Some(p) =>
           p.name shouldBe projectName
           console.workspace.projectByCpg(p.cpg.get).map(_.name) shouldBe Some(projectName)
-        case None => fail
+        case None => fail()
       }
     }
 

console/src/test/scala/io/shiftleft/console/PluginManagerTests.scala

@@ -26,7 +26,7 @@ class PluginManagerTests extends AnyWordSpec with Matchers {
       manager.pluginDir match {
         case Some(dir) =>
           dir.toFile.list().toList shouldBe List("joernext-test-foo.jar")
-        case None => fail
+        case None => fail()
       }
     }
 
@@ -37,7 +37,7 @@ class PluginManagerTests extends AnyWordSpec with Matchers {
         case Some(dir) =>
           dir.toFile.list().toList shouldBe List("joernext-test-foo.json")
           (manager.installDir / "out.txt").exists shouldBe true
-        case None => fail
+        case None => fail()
       }
     }
 

console/src/test/scala/io/shiftleft/console/cpgqlserver/CPGQLServerTests.scala

@@ -38,7 +38,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
   "CPGQLServer" should {
 
     "allow websocket connections to the `/connect` endpoint" in Fixture() { host =>
-      val webSocketTextMsg = scala.concurrent.Promise[String]
+      val webSocketTextMsg = scala.concurrent.Promise[String]()
       cask.util.WsClient.connect(s"$host/connect") {
         case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
       }
@@ -73,7 +73,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
     }
 
     "allow fetching the result of a completed query using its UUID" in Fixture() { host =>
-      var webSocketTextMsg = scala.concurrent.Promise[String]
+      var webSocketTextMsg = scala.concurrent.Promise[String]()
       cask.util.WsClient.connect(s"$host/connect") {
         case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
       }
@@ -82,7 +82,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
       val queryUUID = postQueryResponse("uuid").str
       queryUUID.length should not be (0)
 
-      webSocketTextMsg = scala.concurrent.Promise[String]
+      webSocketTextMsg = scala.concurrent.Promise[String]()
       val queryResultWSMessage = Await.result(webSocketTextMsg.future, DefaultPromiseAwaitTimeout)
       queryResultWSMessage.length should not be (0)
 
@@ -94,7 +94,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
     }
 
     "disallow fetching the result of a completed query with an invalid auth header" in Fixture() { host =>
-      var webSocketTextMsg = scala.concurrent.Promise[String]
+      var webSocketTextMsg = scala.concurrent.Promise[String]()
       cask.util.WsClient.connect(s"$host/connect") {
         case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
       }
@@ -103,7 +103,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
       val queryUUID = postQueryResponse("uuid").str
       queryUUID.length should not be (0)
 
-      webSocketTextMsg = scala.concurrent.Promise[String]
+      webSocketTextMsg = scala.concurrent.Promise[String]()
       val queryResultWSMessage = Await.result(webSocketTextMsg.future, DefaultPromiseAwaitTimeout)
       queryResultWSMessage.length should not be (0)
 
@@ -114,7 +114,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
 
     "write a well-formatted message to a websocket connection when a query has finished evaluation" in Fixture() {
       host =>
-        var webSocketTextMsg = scala.concurrent.Promise[String]
+        var webSocketTextMsg = scala.concurrent.Promise[String]()
         cask.util.WsClient.connect(s"$host/connect") {
           case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
         }
@@ -124,7 +124,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
         val queryUUID = postQueryResponse("uuid").str
         queryUUID.length should not be (0)
 
-        webSocketTextMsg = scala.concurrent.Promise[String]
+        webSocketTextMsg = scala.concurrent.Promise[String]()
         val queryResultWSMessage = Await.result(webSocketTextMsg.future, DefaultPromiseAwaitTimeout)
         queryResultWSMessage.length should not be (0)
 
@@ -139,7 +139,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
     }
 
     "write a well-formatted message to a websocket connection when a query failed evaluation" in Fixture() { host =>
-      var webSocketTextMsg = scala.concurrent.Promise[String]
+      var webSocketTextMsg = scala.concurrent.Promise[String]()
       cask.util.WsClient.connect(s"$host/connect") {
         case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
       }
@@ -149,7 +149,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
       val queryUUID = postQueryResponse("uuid").str
       queryUUID.length should not be (0)
 
-      webSocketTextMsg = scala.concurrent.Promise[String]
+      webSocketTextMsg = scala.concurrent.Promise[String]()
       val queryResultWSMessage = Await.result(webSocketTextMsg.future, DefaultPromiseAwaitTimeout)
       queryResultWSMessage.length should not be (0)
 
@@ -166,7 +166,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
   }
 
   "receive error when attempting to retrieve result with invalid uuid" in Fixture() { host =>
-    val webSocketTextMsg = scala.concurrent.Promise[String]
+    val webSocketTextMsg = scala.concurrent.Promise[String]()
     cask.util.WsClient.connect(s"$host/connect") {
       case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
     }
@@ -178,7 +178,7 @@ class CPGQLServerTests extends AnyWordSpec with Matchers {
   }
 
   "return a valid JSON response when calling /result with incorrectly-formatted UUID parameter" in Fixture() { host =>
-    val webSocketTextMsg = scala.concurrent.Promise[String]
+    val webSocketTextMsg = scala.concurrent.Promise[String]()
     cask.util.WsClient.connect(s"$host/connect") {
       case cask.Ws.Text(msg) => webSocketTextMsg.success(msg)
     }