upgrade and adapt (#1766)

* upgrade deps

* upgrade and adapt

note re `-Wconf:cat=deprecation:w,any:e`: this doesn't seem to work any
longer, it leads to deprecation warnings being categorized as error...

* latest codegen

* upgrade scalafmt, use released codegen

* fmt

Author: mpollmeier

.scalafmt.conf

@@ -1,5 +1,5 @@
-version = 3.4.2
-runner.dialect = scala213
+version = 3.8.1
+runner.dialect = scala3
 preset = IntelliJ
 maxColumn = 120
 align.preset = true

build.sbt

@@ -1,13 +1,13 @@
 name := "codepropertygraph"
 
 // parsed by project/Versions.scala, updated by updateDependencies.sh
-val overflowdbVersion = "1.189"
-val overflowdbCodegenVersion = "2.106"
+val overflowdbVersion = "1.192"
+val overflowdbCodegenVersion = "2.107"
 
 inThisBuild(
   List(
     organization       := "io.shiftleft",
-    scalaVersion       := "3.3.1",
+    scalaVersion       := "3.4.1",
     resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
     packageDoc / publishArtifact := true,
     packageSrc / publishArtifact := true,
@@ -61,7 +61,7 @@ ThisBuild / scalacOptions ++= Seq(
   "-feature",
   // "-explain",
   // "-Xfatal-warnings",
-  "-Wconf:cat=deprecation:w,any:e",
+  // "-Wconf:cat=deprecation:w,any:e",
   "-language:implicitConversions"
 )
 

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

@@ -11,8 +11,8 @@ class SerializedCpg extends AutoCloseable {
 
   /** We allow creating a dummy serialized CPG that does not do anything.
     */
-  private[this] var zipFileSystem: FileSystem = null
-  private[this] var counter                   = 0
+  private var zipFileSystem: FileSystem = null
+  private var counter                   = 0
 
   /** Create Serialized CPG from existing file. If the file does not exist, an empty Serialized CPG is created.
     */
@@ -25,7 +25,7 @@ class SerializedCpg extends AutoCloseable {
 
   @throws[URISyntaxException]
   @throws[IOException]
-  private[this] def initZipFilesystem(filename: String): Unit = {
+  private def initZipFilesystem(filename: String): Unit = {
     val env = new util.HashMap[String, AnyRef]
     // This ensures that the file is created if it does not exist
     env.put("create", "true")

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

@@ -21,9 +21,8 @@ object Cpg {
 
   /** Instantiate cpg with storage. If the storage file already exists, it will load (a subset of) the data into memory.
     * Otherwise it will create an empty cpg. In either case, configuring storage means that OverflowDb will be stored to
-    * disk on shutdown (`close`).
-    * I.e. if you want to preserve state between sessions, just use this method to instantiate the cpg and ensure to
-    * properly `close` the cpg at the end.
+    * disk on shutdown (`close`). I.e. if you want to preserve state between sessions, just use this method to
+    * instantiate the cpg and ensure to properly `close` the cpg at the end.
     * @param path
     *   to the storage file, e.g. /home/user1/overflowdb.bin
     */

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

@@ -54,7 +54,7 @@ class ProtoToCpg(overflowConfig: Config = Config.withoutOverflow) {
       if (node.getKey() == -1) {
         throw new IllegalArgumentException("node has illegal key -1. Something is wrong with the cpg.")
       }
-      odbGraph.+(node.getType.name, node.getKey, properties: _*)
+      odbGraph.+(node.getType.name, node.getKey, properties*)
     } catch {
       case e: Exception =>
         throw new RuntimeException("Failed to insert a node. proto:\n" + node, e)
@@ -68,7 +68,7 @@ class ProtoToCpg(overflowConfig: Config = Config.withoutOverflow) {
       .map(prop => (prop.getName.name, prop.getValue))
       .map(toProperty)
     try {
-      srcNode.---(typ.name, propertyPairs: _*) --> dstNode
+      srcNode.---(typ.name, propertyPairs*) --> dstNode
     } catch {
       case e: IllegalArgumentException =>
         val context = "label=" + typ.name +

codepropertygraph/src/main/scala/io/shiftleft/passes/CpgPass.scala

@@ -21,7 +21,7 @@ abstract class CpgPass(cpg: Cpg, outName: String = "", keyPool: Option[KeyPool]
 
   def run(builder: overflowdb.BatchedUpdate.DiffGraphBuilder): Unit
 
-  final override def generateParts(): Array[_ <: AnyRef] = Array[AnyRef](null)
+  final override def generateParts(): Array[? <: AnyRef] = Array[AnyRef](null)
 
   final override def runOnPart(builder: overflowdb.BatchedUpdate.DiffGraphBuilder, part: AnyRef): Unit =
     run(builder)
@@ -115,7 +115,7 @@ abstract class ForkJoinParallelCpgPass[T <: AnyRef](
 abstract class NewStyleCpgPassBase[T <: AnyRef] extends CpgPassBase {
   type DiffGraphBuilder = overflowdb.BatchedUpdate.DiffGraphBuilder
   // generate Array of parts that can be processed in parallel
-  def generateParts(): Array[_ <: AnyRef]
+  def generateParts(): Array[? <: AnyRef]
   // setup large data structures, acquire external resources
   def init(): Unit = {}
   // release large data structures and external resources

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

@@ -4,14 +4,15 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.Config
+import scala.compiletime.uninitialized
 
 /** Specification of the CPGLoader. The loader allows CPGs to be loaded from the CPG protobuf file format (based on
   * Google protocol buffers). An optional `CpgLoaderConfig` can be passed to the loader to influence the loading
   * process.
   */
 class CpgLoaderTests extends AnyWordSpec with Matchers with BeforeAndAfterAll {
 
-  var zipFile: better.files.File = _
+  var zipFile: better.files.File = uninitialized
 
   override def beforeAll(): Unit = {
     zipFile = TestProtoCpg.createTestProtoCpg

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala

@@ -18,9 +18,8 @@ object Cpg {
 
   /** Instantiate Cpg with storage. If the storage file already exists, it will load (a subset of) the data into memory.
     * Otherwise it will create an empty Cpg. In either case, configuring storage means that OverflowDb will be stored to
-    * disk on shutdown (`close`).
-    * I.e. if you want to preserve state between sessions, just use this method to instantiate the Cpg and ensure to
-    * properly `close` it at the end.
+    * disk on shutdown (`close`). I.e. if you want to preserve state between sessions, just use this method to
+    * instantiate the Cpg and ensure to properly `close` it at the end.
     * @param path
     *   to the storage file, e.g. /home/user1/overflowdb.bin
     */
@@ -81,8 +80,8 @@ class GeneratedNodeStarterExt(val wrapper: Cpg) extends AnyVal {
   def annotationParameter: Iterator[nodes.AnnotationParameter] =
     overflowdb.traversal.InitialTraversal.from[nodes.AnnotationParameter](wrapper.graph, "ANNOTATION_PARAMETER")
 
-  @overflowdb.traversal.help.Doc(
-    info = "All nodes of type AnnotationParameterAssign, i.e. with label ANNOTATION_PARAMETER_ASSIGN"
+  @overflowdb.traversal.help.Doc(info =
+    "All nodes of type AnnotationParameterAssign, i.e. with label ANNOTATION_PARAMETER_ASSIGN"
   )
   def annotationParameterAssign: Iterator[nodes.AnnotationParameterAssign] = overflowdb.traversal.InitialTraversal
     .from[nodes.AnnotationParameterAssign](wrapper.graph, "ANNOTATION_PARAMETER_ASSIGN")
@@ -238,9 +237,8 @@ class GeneratedNodeStarterExt(val wrapper: Cpg) extends AnyVal {
   def unknown: Iterator[nodes.Unknown] =
     overflowdb.traversal.InitialTraversal.from[nodes.Unknown](wrapper.graph, "UNKNOWN")
 
-  @overflowdb.traversal.help.Doc(
-    info =
-      "All nodes of type AstNode, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ANNOTATION_PARAMETER, ANNOTATION_PARAMETER_ASSIGN, ARRAY_INITIALIZER, BLOCK, CALL, COMMENT, CONTROL_STRUCTURE, FIELD_IDENTIFIER, FILE, IDENTIFIER, IMPORT, JUMP_LABEL, JUMP_TARGET, LITERAL, LOCAL, MEMBER, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT, METHOD_REF, METHOD_RETURN, MODIFIER, NAMESPACE, NAMESPACE_BLOCK, RETURN, TEMPLATE_DOM, TYPE_ARGUMENT, TYPE_DECL, TYPE_PARAMETER, TYPE_REF, UNKNOWN"
+  @overflowdb.traversal.help.Doc(info =
+    "All nodes of type AstNode, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ANNOTATION_PARAMETER, ANNOTATION_PARAMETER_ASSIGN, ARRAY_INITIALIZER, BLOCK, CALL, COMMENT, CONTROL_STRUCTURE, FIELD_IDENTIFIER, FILE, IDENTIFIER, IMPORT, JUMP_LABEL, JUMP_TARGET, LITERAL, LOCAL, MEMBER, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT, METHOD_REF, METHOD_RETURN, MODIFIER, NAMESPACE, NAMESPACE_BLOCK, RETURN, TEMPLATE_DOM, TYPE_ARGUMENT, TYPE_DECL, TYPE_PARAMETER, TYPE_REF, UNKNOWN"
   )
   def astNode: Iterator[nodes.AstNode] = wrapper.graph
     .nodes(
@@ -284,9 +282,8 @@ class GeneratedNodeStarterExt(val wrapper: Cpg) extends AnyVal {
   @overflowdb.traversal.help.Doc(info = "All nodes of type CallRepr, i.e. with label in CALL")
   def callRepr: Iterator[nodes.CallRepr] = wrapper.graph.nodes("CALL").asScala.asInstanceOf[Iterator[nodes.CallRepr]]
 
-  @overflowdb.traversal.help.Doc(
-    info =
-      "All nodes of type CfgNode, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ARRAY_INITIALIZER, BLOCK, CALL, CONTROL_STRUCTURE, FIELD_IDENTIFIER, IDENTIFIER, JUMP_TARGET, LITERAL, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT, METHOD_REF, METHOD_RETURN, RETURN, TEMPLATE_DOM, TYPE_REF, UNKNOWN"
+  @overflowdb.traversal.help.Doc(info =
+    "All nodes of type CfgNode, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ARRAY_INITIALIZER, BLOCK, CALL, CONTROL_STRUCTURE, FIELD_IDENTIFIER, IDENTIFIER, JUMP_TARGET, LITERAL, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT, METHOD_REF, METHOD_RETURN, RETURN, TEMPLATE_DOM, TYPE_REF, UNKNOWN"
   )
   def cfgNode: Iterator[nodes.CfgNode] = wrapper.graph
     .nodes(
@@ -313,18 +310,16 @@ class GeneratedNodeStarterExt(val wrapper: Cpg) extends AnyVal {
     .asScala
     .asInstanceOf[Iterator[nodes.CfgNode]]
 
-  @overflowdb.traversal.help.Doc(
-    info =
-      "All nodes of type Declaration, i.e. with label in LOCAL, MEMBER, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT"
+  @overflowdb.traversal.help.Doc(info =
+    "All nodes of type Declaration, i.e. with label in LOCAL, MEMBER, METHOD, METHOD_PARAMETER_IN, METHOD_PARAMETER_OUT"
   )
   def declaration: Iterator[nodes.Declaration] = wrapper.graph
     .nodes("LOCAL", "MEMBER", "METHOD", "METHOD_PARAMETER_IN", "METHOD_PARAMETER_OUT")
     .asScala
     .asInstanceOf[Iterator[nodes.Declaration]]
 
-  @overflowdb.traversal.help.Doc(
-    info =
-      "All nodes of type Expression, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ARRAY_INITIALIZER, BLOCK, CALL, CONTROL_STRUCTURE, FIELD_IDENTIFIER, IDENTIFIER, LITERAL, METHOD_REF, RETURN, TEMPLATE_DOM, TYPE_REF, UNKNOWN"
+  @overflowdb.traversal.help.Doc(info =
+    "All nodes of type Expression, i.e. with label in ANNOTATION, ANNOTATION_LITERAL, ARRAY_INITIALIZER, BLOCK, CALL, CONTROL_STRUCTURE, FIELD_IDENTIFIER, IDENTIFIER, LITERAL, METHOD_REF, RETURN, TEMPLATE_DOM, TYPE_REF, UNKNOWN"
   )
   def expression: Iterator[nodes.Expression] = wrapper.graph
     .nodes(

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/AliasOf.scala

@@ -29,10 +29,11 @@ object AliasOf {
 class AliasOf(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, AliasOf.Label, _outNode, _inNode, AliasOf.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Argument.scala

@@ -29,10 +29,11 @@ object Argument {
 class Argument(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Argument.Label, _outNode, _inNode, Argument.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Ast.scala

@@ -29,10 +29,11 @@ object Ast {
 class Ast(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Ast.Label, _outNode, _inNode, Ast.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Binds.scala

@@ -29,10 +29,11 @@ object Binds {
 class Binds(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Binds.Label, _outNode, _inNode, Binds.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/BindsTo.scala

@@ -29,10 +29,11 @@ object BindsTo {
 class BindsTo(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, BindsTo.Label, _outNode, _inNode, BindsTo.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Call.scala

@@ -29,10 +29,11 @@ object Call {
 class Call(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Call.Label, _outNode, _inNode, Call.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Capture.scala

@@ -29,10 +29,11 @@ object Capture {
 class Capture(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Capture.Label, _outNode, _inNode, Capture.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/CapturedBy.scala

@@ -29,10 +29,11 @@ object CapturedBy {
 class CapturedBy(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, CapturedBy.Label, _outNode, _inNode, CapturedBy.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Cdg.scala

@@ -29,10 +29,11 @@ object Cdg {
 class Cdg(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Cdg.Label, _outNode, _inNode, Cdg.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Cfg.scala

@@ -29,10 +29,11 @@ object Cfg {
 class Cfg(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Cfg.Label, _outNode, _inNode, Cfg.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Condition.scala

@@ -29,10 +29,11 @@ object Condition {
 class Condition(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Condition.Label, _outNode, _inNode, Condition.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Contains.scala

@@ -29,10 +29,11 @@ object Contains {
 class Contains(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Contains.Label, _outNode, _inNode, Contains.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Dominate.scala

@@ -29,10 +29,11 @@ object Dominate {
 class Dominate(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Dominate.Label, _outNode, _inNode, Dominate.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/EvalType.scala

@@ -29,10 +29,11 @@ object EvalType {
 class EvalType(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, EvalType.Label, _outNode, _inNode, EvalType.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/Imports.scala

@@ -29,10 +29,11 @@ object Imports {
 class Imports(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, Imports.Label, _outNode, _inNode, Imports.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/InheritsFrom.scala

@@ -29,10 +29,11 @@ object InheritsFrom {
 class InheritsFrom(_graph: Graph, _outNode: NodeRef[NodeDb], _inNode: NodeRef[NodeDb])
     extends Edge(_graph, InheritsFrom.Label, _outNode, _inNode, InheritsFrom.PropertyNames.allAsJava) {
 
-  override def propertyDefaultValue(propertyKey: String) =
+  override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
 
       case _ => super.propertyDefaultValue(propertyKey)
     }
+  }
 
 }