diff --git a/README.md b/README.md index c9ef62806..2108e3832 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ You can run `./regenerate-test-cpgs.sh` to update them, but this requires the pr sbt semanticcpg/console ``` ```scala -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.semanticcpg.language._ val cpg = io.shiftleft.codepropertygraph.cpgloading.CpgLoader.load("./resources/testcode/cpgs/hello-shiftleft-0.0.5/cpg.bin.zip") ``` diff --git a/build.sbt b/build.sbt index 79e34bad4..86663fdaf 100644 --- a/build.sbt +++ b/build.sbt @@ -84,4 +84,4 @@ credentials += "maven.pkg.github.com", "Privado-Inc", sys.env.getOrElse("GITHUB_TOKEN", "N/A") - ) \ No newline at end of file + ) diff --git a/codepropertygraph/src/main/scala/io/shiftleft/OverflowDbTestInstance.scala b/codepropertygraph/src/main/scala/io/shiftleft/OverflowDbTestInstance.scala index 12904a134..38c251185 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/OverflowDbTestInstance.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/OverflowDbTestInstance.scala @@ -1,6 +1,6 @@ package io.shiftleft -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import overflowdb.Graph object OverflowDbTestInstance { diff --git a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala index 362e6419d..3f96d7a51 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala @@ -1,7 +1,7 @@ package io.shiftleft.codepropertygraph.cpgloading import better.files.File -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.codepropertygraph.generated.PropertyNames import org.slf4j.{Logger, LoggerFactory} diff --git a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala index a60f65594..ca1c7c23e 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala @@ -1,7 +1,7 @@ package io.shiftleft.codepropertygraph.cpgloading import com.google.protobuf.GeneratedMessageV3 -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.proto.cpg.Cpg.CpgStruct.Edge import io.shiftleft.proto.cpg.Cpg.CpgStruct.Edge.EdgeType import io.shiftleft.proto.cpg.Cpg.{CpgOverlay, CpgStruct} diff --git a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoToCpg.scala b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoToCpg.scala index a5ce1a352..0ddd5f971 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoToCpg.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoToCpg.scala @@ -1,6 +1,6 @@ package io.shiftleft.codepropertygraph.cpgloading -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.proto.cpg.Cpg.CpgStruct.Edge.EdgeType import io.shiftleft.proto.cpg.Cpg.CpgStruct.{Edge, Node} import io.shiftleft.proto.cpg.Cpg.PropertyValue diff --git a/codepropertygraph/src/main/scala/io/shiftleft/passes/CpgPass.scala b/codepropertygraph/src/main/scala/io/shiftleft/passes/CpgPass.scala index eb4cfb248..4526a8f34 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/passes/CpgPass.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/passes/CpgPass.scala @@ -2,8 +2,7 @@ package io.shiftleft.passes import com.google.protobuf.GeneratedMessageV3 import io.shiftleft.SerializedCpg -import io.shiftleft.codepropertygraph.generated.{Cpg, DiffGraphBuilder} -import io.shiftleft.utils.StatsLogger +import io.shiftleft.codepropertygraph.Cpg import org.slf4j.{Logger, LoggerFactory, MDC} import overflowdb.BatchedUpdate @@ -73,7 +72,7 @@ abstract class ForkJoinParallelCpgPassWithTimeout[T <: AnyRef]( var nDiff = -1 var nDiffT = -1 try { - val diffGraph = Cpg.newDiffGraphBuilder + val diffGraph = new DiffGraphBuilder nParts = runWithBuilder(diffGraph) nanosBuilt = System.nanoTime() nDiff = diffGraph.size() @@ -200,7 +199,7 @@ abstract class NewStyleCpgPassBase[T <: AnyRef] extends CpgPassBase { val diff = stream.collect( new Supplier[DiffGraphBuilder] { override def get(): DiffGraphBuilder = - Cpg.newDiffGraphBuilder + new DiffGraphBuilder }, new BiConsumer[DiffGraphBuilder, AnyRef] { override def accept(builder: DiffGraphBuilder, part: AnyRef): Unit = diff --git a/codepropertygraph/src/main/scala/io/shiftleft/passes/ParallelCpgPass.scala b/codepropertygraph/src/main/scala/io/shiftleft/passes/ParallelCpgPass.scala index 22850945f..7b56e7437 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/passes/ParallelCpgPass.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/passes/ParallelCpgPass.scala @@ -1,7 +1,7 @@ package io.shiftleft.passes import io.shiftleft.SerializedCpg -import io.shiftleft.codepropertygraph.generated.Cpg -import io.shiftleft.utils.{ExecutionContextProvider, StatsLogger} +import io.shiftleft.codepropertygraph.Cpg +import io.shiftleft.utils.ExecutionContextProvider import org.slf4j.MDC import java.util.concurrent.LinkedBlockingQueue @@ -88,7 +88,7 @@ abstract class ConcurrentWriterCpgPass[T <: AnyRef]( // todo: Verify that we get FIFO scheduling; otherwise, do something about it. // if this e.g. used LIFO with 4 cores and 18 size of ringbuffer, then 3 cores may idle while we block on the front item. completionQueue.append(Future.apply { - val builder = Cpg.newDiffGraphBuilder + val builder = new DiffGraphBuilder runOnPart(builder, next.asInstanceOf[T]) builder.build() }) diff --git a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala index ff3144d4c..9a9679233 100644 --- a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala +++ b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala @@ -2,7 +2,7 @@ package io.shiftleft.passes import better.files.File import io.shiftleft.SerializedCpg -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.codepropertygraph.generated.nodes.NewFile import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec @@ -14,10 +14,10 @@ class CpgPassNewTests extends AnyWordSpec with Matchers { private object Fixture { def apply(keyPool: Option[KeyPool] = None)(f: (Cpg, CpgPassBase) => Unit): Unit = { - val cpg = Cpg.empty + val cpg = Cpg.emptyCpg class MyPass(cpg: Cpg) extends SimpleCpgPass(cpg, "MyPass", keyPool) { override def run(builder: DiffGraphBuilder): Unit = { - val builder2 = Cpg.newDiffGraphBuilder + val builder2 = new DiffGraphBuilder builder.addNode(NewFile().name("foo")) builder2.addNode(NewFile().name("bar")) builder.absorb(builder2) @@ -52,7 +52,7 @@ class CpgPassNewTests extends AnyWordSpec with Matchers { } "fail for schema violations" in { - val cpg = Cpg.empty + val cpg = Cpg.emptyCpg val pass = new SimpleCpgPass(cpg, "pass1") { override def run(dst: DiffGraphBuilder): Unit = { val file1 = NewFile().name("foo") diff --git a/codepropertygraph/src/test/scala/io/shiftleft/passes/ParallelCpgPassNewTests.scala b/codepropertygraph/src/test/scala/io/shiftleft/passes/ParallelCpgPassNewTests.scala index 3f7a9829f..8be62b501 100644 --- a/codepropertygraph/src/test/scala/io/shiftleft/passes/ParallelCpgPassNewTests.scala +++ b/codepropertygraph/src/test/scala/io/shiftleft/passes/ParallelCpgPassNewTests.scala @@ -2,7 +2,7 @@ package io.shiftleft.passes import better.files.File import io.shiftleft.SerializedCpg -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.codepropertygraph.generated.Properties import io.shiftleft.codepropertygraph.generated.nodes.{NewCall, NewFile} import org.scalatest.matchers.should.Matchers @@ -16,7 +16,7 @@ class ParallelCpgPassNewTests extends AnyWordSpec with Matchers { private object Fixture { def apply(keyPools: Option[Iterator[KeyPool]] = None)(f: (Cpg, CpgPassBase) => Unit): Unit = { - val cpg = Cpg.empty + val cpg = Cpg.emptyCpg val pool = keyPools.flatMap(_.nextOption()) class MyPass(cpg: Cpg) extends ConcurrentWriterCpgPass[String](cpg, "MyPass", pool) { override def generateParts(): Array[String] = Array("foo", "bar") @@ -33,7 +33,7 @@ class ParallelCpgPassNewTests extends AnyWordSpec with Matchers { "ConcurrentWriterCpgPass" should { "allow creating and applying result of pass" in Fixture() { (cpg, pass) => pass.createAndApply() - cpg.graph.nodes.map(_.property(Properties.Name)).toSetMutable shouldBe Set("foo", "bar") + cpg.graph.nodes.map(_.property(Properties.NAME)).toSetMutable shouldBe Set("foo", "bar") } "produce a serialized CPG file" in Fixture() { (_, pass) => @@ -56,7 +56,7 @@ class ParallelCpgPassNewTests extends AnyWordSpec with Matchers { } "fail for schema violations" in { - val cpg = Cpg.empty + val cpg = Cpg.emptyCpg val pass = new ConcurrentWriterCpgPass[String](cpg, "pass2") { override def generateParts() = Array("a", "b") override def runOnPart(diffGraph: DiffGraphBuilder, part: String): Unit = @@ -83,7 +83,7 @@ class ParallelCpgPassNewTests extends AnyWordSpec with Matchers { } "add NewNodes that are referenced in different parts only once" in { - val cpg = Cpg.empty + val cpg = Cpg.emptyCpg val pass = new ConcurrentWriterCpgPass[String](cpg, "pass2") { val call1 = NewCall().name("call1") val call2 = NewCall().name("call2") diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala index 824afa67d..c6c9bfb05 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala @@ -47,7 +47,6 @@ object Cpg { case other => other } - def newDiffGraphBuilder: DiffGraphBuilder = new DiffGraphBuilder } /** Domain-specific wrapper for graph, starting point for traversals. diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.java b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.java new file mode 100644 index 000000000..673201d5f --- /dev/null +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.java @@ -0,0 +1,335 @@ +package io.shiftleft.codepropertygraph.generated; + +import overflowdb.*; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +public class Properties { + +/** This property holds the fully qualified name of the type that the node is +a type alias of. */ +public static final overflowdb.PropertyKey ALIAS_TYPE_FULL_NAME = new overflowdb.PropertyKey<>("ALIAS_TYPE_FULL_NAME"); + +/** AST-children of CALL nodes have an argument index, that is used to match +call-site arguments with callee parameters. Explicit parameters are numbered +from 1 to N, while index 0 is reserved for implicit self / this parameter. +CALLs without implicit parameter therefore have arguments starting with index 1. +AST-children of BLOCK nodes may have an argument index as well; in this case, +the last argument index determines the return expression of a BLOCK expression. +If the `PARAMETER_NAME` field is set, then the `ARGUMENT_INDEX` field is +ignored. It is suggested to set it to -1. */ +public static final overflowdb.PropertyKey ARGUMENT_INDEX = new overflowdb.PropertyKey<>("ARGUMENT_INDEX"); + +/** For calls involving named parameters, the `ARGUMENT_NAME` field holds the +name of the parameter initialized by the expression. For all other calls, +this field is unset. */ +public static final overflowdb.PropertyKey ARGUMENT_NAME = new overflowdb.PropertyKey<>("ARGUMENT_NAME"); + +/** This field holds the FULL_NAME of the AST parent of an entity. */ +public static final overflowdb.PropertyKey AST_PARENT_FULL_NAME = new overflowdb.PropertyKey<>("AST_PARENT_FULL_NAME"); + +/** The type of the AST parent. Since this is only used in some parts of the graph, +the list does not include all possible parents by intention. +Possible parents: METHOD, TYPE_DECL, NAMESPACE_BLOCK. */ +public static final overflowdb.PropertyKey AST_PARENT_TYPE = new overflowdb.PropertyKey<>("AST_PARENT_TYPE"); + +/** This field holds the canonical name of a `FIELD_IDENTIFIER`. It is typically +identical to the CODE field, but canonicalized according to source language +semantics. Human readable names are preferable. `FIELD_IDENTIFIER` nodes must +share identical `CANONICAL_NAME` if and +only if they alias, e.g., in C-style unions (if the aliasing relationship is +unknown or there are partial overlaps, then one must make a reasonable guess, +and trade off between false negatives and false positives). */ +public static final overflowdb.PropertyKey CANONICAL_NAME = new overflowdb.PropertyKey<>("CANONICAL_NAME"); + + +public static final overflowdb.PropertyKey CLASS_NAME = new overflowdb.PropertyKey<>("CLASS_NAME"); + + +public static final overflowdb.PropertyKey CLASS_SHORT_NAME = new overflowdb.PropertyKey<>("CLASS_SHORT_NAME"); + +/** Identifier which uniquely describes a CLOSURE_BINDING. This property is used to match captured LOCAL nodes with the corresponding CLOSURE_BINDING nodes */ +public static final overflowdb.PropertyKey CLOSURE_BINDING_ID = new overflowdb.PropertyKey<>("CLOSURE_BINDING_ID"); + +/** The original name of the (potentially mangled) captured variable */ +public static final overflowdb.PropertyKey CLOSURE_ORIGINAL_NAME = new overflowdb.PropertyKey<>("CLOSURE_ORIGINAL_NAME"); + +/** This field holds the code snippet that the node represents. */ +public static final overflowdb.PropertyKey CODE = new overflowdb.PropertyKey<>("CODE"); + +/** This optional fields provides the column number of the program construct +represented by the node. */ +public static final overflowdb.PropertyKey COLUMN_NUMBER = new overflowdb.PropertyKey<>("COLUMN_NUMBER"); + +/** This optional fields provides the column number at which the program construct +represented by the node ends. */ +public static final overflowdb.PropertyKey COLUMN_NUMBER_END = new overflowdb.PropertyKey<>("COLUMN_NUMBER_END"); + +/** References to other nodes. This is not a real property; it exists here for the sake of proto serialization only. valueType and cardinality are meaningless. */ +public static final overflowdb.PropertyKey CONTAINED_REF = new overflowdb.PropertyKey<>("CONTAINED_REF"); + +/** Certain files, e.g., configuration files, may be included in the CPG as-is. +For such files, the `CONTENT` field contains the files content. */ +public static final overflowdb.PropertyKey CONTENT = new overflowdb.PropertyKey<>("CONTENT"); + +/** The `CONTROL_STRUCTURE_TYPE` field indicates which kind of control structure +a `CONTROL_STRUCTURE` node represents. The available types are the following: + BREAK, CONTINUE, DO, WHILE, FOR, GOTO, IF, ELSE, TRY, THROW and SWITCH. */ +public static final overflowdb.PropertyKey CONTROL_STRUCTURE_TYPE = new overflowdb.PropertyKey<>("CONTROL_STRUCTURE_TYPE"); + +/** The group ID for a dependency */ +public static final overflowdb.PropertyKey DEPENDENCY_GROUP_ID = new overflowdb.PropertyKey<>("DEPENDENCY_GROUP_ID"); + +/** This field holds the dispatch type of a call, which is either `STATIC_DISPATCH` or +`DYNAMIC_DISPATCH`. For statically dispatched method calls, the call target is known +at compile time while for dynamically dispatched calls, it can only be determined at +runtime as it may depend on the type of an object (as is the case for virtual method +calls) or calculation of an offset. */ +public static final overflowdb.PropertyKey DISPATCH_TYPE = new overflowdb.PropertyKey<>("DISPATCH_TYPE"); + +/** Type hint for the dynamic type. These are observed to be verifiable at runtime. */ +public static final overflowdb.PropertyKey> DYNAMIC_TYPE_HINT_FULL_NAME = new overflowdb.PropertyKey<>("DYNAMIC_TYPE_HINT_FULL_NAME"); + +/** For formal method input parameters, output parameters, and return parameters, +this field holds the evaluation strategy, which is one of the following: +1) `BY_REFERENCE` indicates that the parameter is passed by reference, 2) +`BY_VALUE` indicates that it is passed by value, that is, a copy is made, +3) `BY_SHARING` the parameter is a pointer/reference and it is shared with +the caller/callee. While a copy of the pointer is made, a copy of the object +that it points to is not made. */ +public static final overflowdb.PropertyKey EVALUATION_STRATEGY = new overflowdb.PropertyKey<>("EVALUATION_STRATEGY"); + +/** Specifies whether the IMPORTED_AS property was explicitly present in the code. +For languages like Java which do not allow a renaming during import this is +always false. For e.g. Kotlin it depends on the existence of the "as" keyword. */ +public static final overflowdb.PropertyKey EXPLICIT_AS = new overflowdb.PropertyKey<>("EXPLICIT_AS"); + +/** The path of the source file this node was generated from, relative to the root +path in the meta data node. This field must be set but may be set to the value `` to +indicate that no source file can be associated with the node, e.g., because the node represents +an entity known to exist because it is referenced, but for which the file that is is declared in +is unknown. */ +public static final overflowdb.PropertyKey FILENAME = new overflowdb.PropertyKey<>("FILENAME"); + +/** This is the fully-qualified name of an entity, e.g., the fully-qualified +name of a method or type. The details of what constitutes a fully-qualified +name are language specific. This field SHOULD be human readable. */ +public static final overflowdb.PropertyKey FULL_NAME = new overflowdb.PropertyKey<>("FULL_NAME"); + +/** This property contains a hash value in the form of a string. +Hashes can be used to summarize data, e.g., to summarize the +contents of source files or sub graphs. Such summaries are useful +to determine whether code has already been analyzed in incremental +analysis pipelines. This property is optional to allow its calculation +to be deferred or skipped if the hash is not needed. */ +public static final overflowdb.PropertyKey HASH = new overflowdb.PropertyKey<>("HASH"); + +/** The identifier under which the import can be accessed in the importing context. +For a Java import this is always identical to the class name. But e.g. for a +Kotlin import like "import java.nio.ByteBuffer as BBuffer" this would be "BBuffer". +This property is ignored if IS_WILDCARD is true. */ +public static final overflowdb.PropertyKey IMPORTED_AS = new overflowdb.PropertyKey<>("IMPORTED_AS"); + +/** The identifying string of the imported entity. +For a Java import like "import java.nio.ByteBuffer;" this would be "java.nio.ByteBuffer". */ +public static final overflowdb.PropertyKey IMPORTED_ENTITY = new overflowdb.PropertyKey<>("IMPORTED_ENTITY"); + +/** Specifies an index, e.g., for a parameter or argument. + Explicit parameters are numbered from 1 to N, while index 0 is reserved for implicit + self / this parameter. */ +public static final overflowdb.PropertyKey INDEX = new overflowdb.PropertyKey<>("INDEX"); + +/** The static types a TYPE_DECL inherits from. This property is matched against the +FULL_NAME of TYPE nodes and thus it is required to have at least one TYPE node +for each TYPE_FULL_NAME */ +public static final overflowdb.PropertyKey> INHERITS_FROM_TYPE_FULL_NAME = new overflowdb.PropertyKey<>("INHERITS_FROM_TYPE_FULL_NAME"); + +/** Specifies whether this is an explicit import. +Most languages have implicit default imports of some standard library elements +and this flag is used to distinguish those from explicit imports found in the +code base. */ +public static final overflowdb.PropertyKey IS_EXPLICIT = new overflowdb.PropertyKey<>("IS_EXPLICIT"); + +/** Indicates that the construct (METHOD or TYPE_DECL) is external, that is, +it is referenced but not defined in the code (applies both to insular +parsing and to library functions where we have header files only) */ +public static final overflowdb.PropertyKey IS_EXTERNAL = new overflowdb.PropertyKey<>("IS_EXTERNAL"); + +/** Specifies whether a parameter is the variadic argument handling parameter of +a variadic method. Only one parameter of a method is allowed to have this +property set to true. */ +public static final overflowdb.PropertyKey IS_VARIADIC = new overflowdb.PropertyKey<>("IS_VARIADIC"); + +/** Specifies whether this is a wildcard import. +For a Java import like "import java.nio.*;" IS_WILDCARD would be "true" and +IMPORTED_ENTITY would be "java.nio". +For wildcard imports the IMPORTED_AS property is ignored. */ +public static final overflowdb.PropertyKey IS_WILDCARD = new overflowdb.PropertyKey<>("IS_WILDCARD"); + +/** This property denotes a key of a key-value pair. */ +public static final overflowdb.PropertyKey KEY = new overflowdb.PropertyKey<>("KEY"); + +/** This field indicates which CPG language frontend generated the CPG. +Frontend developers may freely choose a value that describes their frontend +so long as it is not used by an existing frontend. Reserved values are to date: +C, LLVM, GHIDRA, PHP. */ +public static final overflowdb.PropertyKey LANGUAGE = new overflowdb.PropertyKey<>("LANGUAGE"); + +/** This optional field provides the line number of the program construct +represented by the node. */ +public static final overflowdb.PropertyKey LINE_NUMBER = new overflowdb.PropertyKey<>("LINE_NUMBER"); + +/** This optional fields provides the line number at which the program construct +represented by the node ends. */ +public static final overflowdb.PropertyKey LINE_NUMBER_END = new overflowdb.PropertyKey<>("LINE_NUMBER_END"); + +/** The FULL_NAME of a method. Used to link CALL and METHOD nodes. It is required +to have exactly one METHOD node for each METHOD_FULL_NAME */ +public static final overflowdb.PropertyKey METHOD_FULL_NAME = new overflowdb.PropertyKey<>("METHOD_FULL_NAME"); + + +public static final overflowdb.PropertyKey METHOD_SHORT_NAME = new overflowdb.PropertyKey<>("METHOD_SHORT_NAME"); + +/** The modifier type is a free-form string. The following are known modifier types: +`STATIC`, `PUBLIC`, `PROTECTED`, `PRIVATE`, `ABSTRACT`, `NATIVE`, `CONSTRUCTOR`, `VIRTUAL`. */ +public static final overflowdb.PropertyKey MODIFIER_TYPE = new overflowdb.PropertyKey<>("MODIFIER_TYPE"); + +/** Name of represented object, e.g., method name (e.g. "run") */ +public static final overflowdb.PropertyKey NAME = new overflowdb.PropertyKey<>("NAME"); + + +public static final overflowdb.PropertyKey NODE_LABEL = new overflowdb.PropertyKey<>("NODE_LABEL"); + +/** Start offset into the CONTENT property of the corresponding FILE node. +The offset is such that parts of the content can easily +be accessed via `content.substring(offset, offsetEnd)`. +This means that the offset must be measured in utf16 encoding (i.e. neither in +characters/codeunits nor in byte-offsets into a utf8 encoding). +E.g. for METHOD nodes this start offset points to the start of the methods +source code in the string holding the source code of the entire file. */ +public static final overflowdb.PropertyKey OFFSET = new overflowdb.PropertyKey<>("OFFSET"); + +/** End offset (exclusive) into the CONTENT property of the corresponding FILE node. +See OFFSET documentation for finer details. +E.g. for METHOD nodes this end offset points to the first code position which is +not part of the method. */ +public static final overflowdb.PropertyKey OFFSET_END = new overflowdb.PropertyKey<>("OFFSET_END"); + +/** This integer indicates the position of the node among +its siblings in the AST. The left-most child has an +order of 0. */ +public static final overflowdb.PropertyKey ORDER = new overflowdb.PropertyKey<>("ORDER"); + +/** The field contains the names of the overlays applied to this CPG, in order of their +application. Names are free-form strings, that is, this specification does not +dictate them but rather requires tool producers and consumers to communicate them +between each other. */ +public static final overflowdb.PropertyKey> OVERLAYS = new overflowdb.PropertyKey<>("OVERLAYS"); + + +public static final overflowdb.PropertyKey PACKAGE_NAME = new overflowdb.PropertyKey<>("PACKAGE_NAME"); + +/** AST node type name emitted by parser. */ +public static final overflowdb.PropertyKey PARSER_TYPE_NAME = new overflowdb.PropertyKey<>("PARSER_TYPE_NAME"); + +/** Similar to `DYNAMIC_TYPE_HINT_FULL_NAME`, but that this makes no guarantee that types within this property are correct. This property is used to capture observations between node interactions during a 'may-analysis'. */ +public static final overflowdb.PropertyKey> POSSIBLE_TYPES = new overflowdb.PropertyKey<>("POSSIBLE_TYPES"); + +/** The path to the root directory of the source/binary this CPG is generated from. */ +public static final overflowdb.PropertyKey ROOT = new overflowdb.PropertyKey<>("ROOT"); + +/** The method signature encodes the types of parameters in a string. +The string SHOULD be human readable and suitable for differentiating methods +with different parameter types sufficiently to allow for resolving of +function overloading. The present specification does not enforce a strict +format for the signature, that is, it can be chosen by the frontend +implementor to fit the source language. */ +public static final overflowdb.PropertyKey SIGNATURE = new overflowdb.PropertyKey<>("SIGNATURE"); + + +public static final overflowdb.PropertyKey SYMBOL = new overflowdb.PropertyKey<>("SYMBOL"); + +/** The static type decl of a TYPE. This property is matched against the FULL_NAME +of TYPE_DECL nodes. It is required to have exactly one TYPE_DECL for each +different TYPE_DECL_FULL_NAME */ +public static final overflowdb.PropertyKey TYPE_DECL_FULL_NAME = new overflowdb.PropertyKey<>("TYPE_DECL_FULL_NAME"); + +/** This field contains the fully-qualified static type name of the program +construct represented by a node. It is the name of an instantiated type, e.g., +`java.util.List`, rather than `java.util.List[T]`. If the type +cannot be determined, this field should be set to the empty string. */ +public static final overflowdb.PropertyKey TYPE_FULL_NAME = new overflowdb.PropertyKey<>("TYPE_FULL_NAME"); + +/** This property denotes a string value as used in a key-value pair. */ +public static final overflowdb.PropertyKey VALUE = new overflowdb.PropertyKey<>("VALUE"); + +/** This edge property represents the variable propagated by a reaching definition edge. */ +public static final overflowdb.PropertyKey VARIABLE = new overflowdb.PropertyKey<>("VARIABLE"); + +/** A version, given as a string. Used, for example, in the META_DATA node to +indicate which version of the CPG spec this CPG conforms to */ +public static final overflowdb.PropertyKey VERSION = new overflowdb.PropertyKey<>("VERSION"); + + +public static Set> ALL = new HashSet>() {{ +add(ALIAS_TYPE_FULL_NAME); +add(ARGUMENT_INDEX); +add(ARGUMENT_NAME); +add(AST_PARENT_FULL_NAME); +add(AST_PARENT_TYPE); +add(CANONICAL_NAME); +add(CLASS_NAME); +add(CLASS_SHORT_NAME); +add(CLOSURE_BINDING_ID); +add(CLOSURE_ORIGINAL_NAME); +add(CODE); +add(COLUMN_NUMBER); +add(COLUMN_NUMBER_END); +add(CONTAINED_REF); +add(CONTENT); +add(CONTROL_STRUCTURE_TYPE); +add(DEPENDENCY_GROUP_ID); +add(DISPATCH_TYPE); +add(DYNAMIC_TYPE_HINT_FULL_NAME); +add(EVALUATION_STRATEGY); +add(EXPLICIT_AS); +add(FILENAME); +add(FULL_NAME); +add(HASH); +add(IMPORTED_AS); +add(IMPORTED_ENTITY); +add(INDEX); +add(INHERITS_FROM_TYPE_FULL_NAME); +add(IS_EXPLICIT); +add(IS_EXTERNAL); +add(IS_VARIADIC); +add(IS_WILDCARD); +add(KEY); +add(LANGUAGE); +add(LINE_NUMBER); +add(LINE_NUMBER_END); +add(METHOD_FULL_NAME); +add(METHOD_SHORT_NAME); +add(MODIFIER_TYPE); +add(NAME); +add(NODE_LABEL); +add(OFFSET); +add(OFFSET_END); +add(ORDER); +add(OVERLAYS); +add(PACKAGE_NAME); +add(PARSER_TYPE_NAME); +add(POSSIBLE_TYPES); +add(ROOT); +add(SIGNATURE); +add(SYMBOL); +add(TYPE_DECL_FULL_NAME); +add(TYPE_FULL_NAME); +add(VALUE); +add(VARIABLE); +add(VERSION); +}}; + +} \ No newline at end of file diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.scala deleted file mode 100644 index 2154aecbe..000000000 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.scala +++ /dev/null @@ -1,117 +0,0 @@ -package io.shiftleft.codepropertygraph.generated - -object Properties { - val AliasTypeFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ALIAS_TYPE_FULL_NAME") - - val ArgumentIndex: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("ARGUMENT_INDEX") - - val ArgumentName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ARGUMENT_NAME") - - val AstParentFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("AST_PARENT_FULL_NAME") - - val AstParentType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("AST_PARENT_TYPE") - - val CanonicalName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CANONICAL_NAME") - - val ClassName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLASS_NAME") - - val ClassShortName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLASS_SHORT_NAME") - - val ClosureBindingId: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLOSURE_BINDING_ID") - - val ClosureOriginalName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLOSURE_ORIGINAL_NAME") - - val Code: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CODE") - - val ColumnNumber: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("COLUMN_NUMBER") - - val ColumnNumberEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("COLUMN_NUMBER_END") - - val ContainedRef: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTAINED_REF") - - val Content: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTENT") - - val ControlStructureType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTROL_STRUCTURE_TYPE") - - val DependencyGroupId: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("DEPENDENCY_GROUP_ID") - - val DispatchType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("DISPATCH_TYPE") - - val DynamicTypeHintFullName: overflowdb.PropertyKey[IndexedSeq[String]] = - new overflowdb.PropertyKey("DYNAMIC_TYPE_HINT_FULL_NAME") - - val EvaluationStrategy: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("EVALUATION_STRATEGY") - - val ExplicitAs: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("EXPLICIT_AS") - - val Filename: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("FILENAME") - - val FullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("FULL_NAME") - - val Hash: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("HASH") - - val ImportedAs: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("IMPORTED_AS") - - val ImportedEntity: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("IMPORTED_ENTITY") - - val Index: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("INDEX") - - val InheritsFromTypeFullName: overflowdb.PropertyKey[IndexedSeq[String]] = - new overflowdb.PropertyKey("INHERITS_FROM_TYPE_FULL_NAME") - - val IsExplicit: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_EXPLICIT") - - val IsExternal: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_EXTERNAL") - - val IsVariadic: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_VARIADIC") - - val IsWildcard: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_WILDCARD") - - val Key: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("KEY") - - val Language: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("LANGUAGE") - - val LineNumber: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("LINE_NUMBER") - - val LineNumberEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("LINE_NUMBER_END") - - val MethodFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("METHOD_FULL_NAME") - - val MethodShortName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("METHOD_SHORT_NAME") - - val ModifierType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("MODIFIER_TYPE") - - val Name: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("NAME") - - val NodeLabel: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("NODE_LABEL") - - val Offset: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("OFFSET") - - val OffsetEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("OFFSET_END") - - val Order: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("ORDER") - - val Overlays: overflowdb.PropertyKey[IndexedSeq[String]] = new overflowdb.PropertyKey("OVERLAYS") - - val PackageName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("PACKAGE_NAME") - - val ParserTypeName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("PARSER_TYPE_NAME") - - val PossibleTypes: overflowdb.PropertyKey[IndexedSeq[String]] = new overflowdb.PropertyKey("POSSIBLE_TYPES") - - val Root: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ROOT") - - val Signature: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("SIGNATURE") - - val Symbol: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("SYMBOL") - - val TypeDeclFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("TYPE_DECL_FULL_NAME") - - val TypeFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("TYPE_FULL_NAME") - - val Value: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VALUE") - - val Variable: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VARIABLE") - - val Version: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VERSION") -} diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala index 27296346e..54c7ccfb1 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala @@ -25,9 +25,9 @@ object Annotation { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val FullName = new overflowdb.PropertyKey[String]("FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -76,9 +76,9 @@ trait AnnotationBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def fullName: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -89,14 +89,14 @@ class Annotation(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/ with AnnotationBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def fullName: String = get().fullName - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def fullName: String = get().fullName + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => Annotation.PropertyDefaults.ArgumentIndex @@ -215,22 +215,22 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit override def layoutInformation: NodeLayoutInformation = Annotation.layoutInformation - private var _argumentIndex: Integer = Annotation.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _code: String = Annotation.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _fullName: String = Annotation.PropertyDefaults.FullName - def fullName: String = _fullName - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = Annotation.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = Annotation.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = Annotation.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _code: String = Annotation.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _fullName: String = Annotation.PropertyDefaults.FullName + def fullName: String = _fullName + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = Annotation.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = Annotation.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -347,9 +347,9 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "FULL_NAME" => this._fullName = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -368,17 +368,11 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewAnnotation].argumentIndex - this._argumentName = newNode.asInstanceOf[NewAnnotation].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewAnnotation].argumentName.orNull this._code = newNode.asInstanceOf[NewAnnotation].code - this._columnNumber = newNode.asInstanceOf[NewAnnotation].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewAnnotation].columnNumber.orNull this._fullName = newNode.asInstanceOf[NewAnnotation].fullName - this._lineNumber = newNode.asInstanceOf[NewAnnotation].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewAnnotation].lineNumber.orNull this._name = newNode.asInstanceOf[NewAnnotation].name this._order = newNode.asInstanceOf[NewAnnotation].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala index ee8b345b5..ea68aa33b 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala @@ -24,8 +24,8 @@ object AnnotationLiteral { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -70,8 +70,8 @@ trait AnnotationLiteralBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -82,13 +82,13 @@ class AnnotationLiteral(graph_4762: Graph, id_4762: Long /*cf https://github.com with AnnotationLiteralBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => AnnotationLiteral.PropertyDefaults.ArgumentIndex @@ -168,20 +168,20 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = AnnotationLiteral.layoutInformation - private var _argumentIndex: Integer = AnnotationLiteral.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _code: String = AnnotationLiteral.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = AnnotationLiteral.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = AnnotationLiteral.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = AnnotationLiteral.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _code: String = AnnotationLiteral.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = AnnotationLiteral.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = AnnotationLiteral.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -278,8 +278,8 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb]) case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -298,16 +298,10 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewAnnotationLiteral].argumentIndex - this._argumentName = newNode.asInstanceOf[NewAnnotationLiteral].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewAnnotationLiteral].argumentName.orNull this._code = newNode.asInstanceOf[NewAnnotationLiteral].code - this._columnNumber = newNode.asInstanceOf[NewAnnotationLiteral].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewAnnotationLiteral].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewAnnotationLiteral].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewAnnotationLiteral].lineNumber.orNull this._name = newNode.asInstanceOf[NewAnnotationLiteral].name this._order = newNode.asInstanceOf[NewAnnotationLiteral].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala index 58aac36f9..987f50e5e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala @@ -19,8 +19,8 @@ object AnnotationParameter { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -56,8 +56,8 @@ trait AnnotationParameterBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -67,10 +67,10 @@ class AnnotationParameter(graph_4762: Graph, id_4762: Long /*cf https://github.c with AnnotationParameterBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => AnnotationParameter.PropertyDefaults.Code @@ -133,14 +133,14 @@ class AnnotationParameterDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = AnnotationParameter.layoutInformation - private var _code: String = AnnotationParameter.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = AnnotationParameter.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = AnnotationParameter.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = AnnotationParameter.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -211,8 +211,8 @@ class AnnotationParameterDb(ref: NodeRef[NodeDb]) override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -230,12 +230,8 @@ class AnnotationParameterDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewAnnotationParameter].code - this._columnNumber = newNode.asInstanceOf[NewAnnotationParameter].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewAnnotationParameter].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewAnnotationParameter].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewAnnotationParameter].lineNumber.orNull this._order = newNode.asInstanceOf[NewAnnotationParameter].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala index bcbfad144..e8cb5e831 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala @@ -19,8 +19,8 @@ object AnnotationParameterAssign { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -56,8 +56,8 @@ trait AnnotationParameterAssignBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -67,10 +67,10 @@ class AnnotationParameterAssign(graph_4762: Graph, id_4762: Long /*cf https://gi with AnnotationParameterAssignBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => AnnotationParameterAssign.PropertyDefaults.Code @@ -152,14 +152,14 @@ class AnnotationParameterAssignDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = AnnotationParameterAssign.layoutInformation - private var _code: String = AnnotationParameterAssign.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = AnnotationParameterAssign.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = AnnotationParameterAssign.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = AnnotationParameterAssign.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -238,8 +238,8 @@ class AnnotationParameterAssignDb(ref: NodeRef[NodeDb]) override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -257,12 +257,8 @@ class AnnotationParameterAssignDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewAnnotationParameterAssign].code - this._columnNumber = newNode.asInstanceOf[NewAnnotationParameterAssign].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewAnnotationParameterAssign].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewAnnotationParameterAssign].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewAnnotationParameterAssign].lineNumber.orNull this._order = newNode.asInstanceOf[NewAnnotationParameterAssign].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala index c6fc4d8db..b22e03047 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala @@ -23,8 +23,8 @@ object ArrayInitializer { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -71,8 +71,8 @@ trait ArrayInitializerBase extends AbstractNode with AstNodeBase with Expression def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -83,12 +83,12 @@ class ArrayInitializer(graph_4762: Graph, id_4762: Long /*cf https://github.com/ with StoredNode with AstNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => ArrayInitializer.PropertyDefaults.ArgumentIndex @@ -180,18 +180,18 @@ class ArrayInitializerDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = ArrayInitializer.layoutInformation - private var _argumentIndex: Integer = ArrayInitializer.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _code: String = ArrayInitializer.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = ArrayInitializer.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = ArrayInitializer.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _code: String = ArrayInitializer.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = ArrayInitializer.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -291,8 +291,8 @@ class ArrayInitializerDb(ref: NodeRef[NodeDb]) case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -310,16 +310,10 @@ class ArrayInitializerDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewArrayInitializer].argumentIndex - this._argumentName = newNode.asInstanceOf[NewArrayInitializer].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewArrayInitializer].argumentName.orNull this._code = newNode.asInstanceOf[NewArrayInitializer].code - this._columnNumber = newNode.asInstanceOf[NewArrayInitializer].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewArrayInitializer].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewArrayInitializer].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewArrayInitializer].lineNumber.orNull this._order = newNode.asInstanceOf[NewArrayInitializer].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AstNode.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AstNode.scala index bfdd4e73d..a6e4fc57e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AstNode.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AstNode.scala @@ -11,8 +11,8 @@ object AstNode { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -30,19 +30,19 @@ object AstNode { trait AstNodeBase extends AbstractNode { def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } trait AstNodeNew extends NewNode { def code_=(value: String): Unit - def columnNumber_=(value: Option[scala.Int]): Unit - def lineNumber_=(value: Option[scala.Int]): Unit + def columnNumber_=(value: Option[Integer]): Unit + def lineNumber_=(value: Option[Integer]): Unit def order_=(value: scala.Int): Unit def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala index bd0f9e3ee..f3d3673d1 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala @@ -36,9 +36,9 @@ object Block { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") val TypeFullName = new overflowdb.PropertyKey[String]("TYPE_FULL_NAME") @@ -113,9 +113,9 @@ trait BlockBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def possibleTypes: IndexedSeq[String] def typeFullName: String @@ -130,9 +130,9 @@ class Block(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/i override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes override def typeFullName: String = get().typeFullName @@ -688,19 +688,19 @@ class BlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Exp override def layoutInformation: NodeLayoutInformation = Block.layoutInformation - private var _argumentIndex: Integer = Block.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = Block.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = Block.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Block.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Block.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -989,7 +989,7 @@ class BlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Exp case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -1008,7 +1008,7 @@ class BlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Exp collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => this._possibleTypes = value match { @@ -1045,18 +1045,14 @@ class BlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Exp override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewBlock].argumentIndex - this._argumentName = newNode.asInstanceOf[NewBlock].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewBlock].argumentName.orNull this._code = newNode.asInstanceOf[NewBlock].code - this._columnNumber = newNode.asInstanceOf[NewBlock].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewBlock].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewBlock].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewBlock].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewBlock].lineNumber match { case None => null; case Some(value) => value } + this._lineNumber = newNode.asInstanceOf[NewBlock].lineNumber.orNull this._order = newNode.asInstanceOf[NewBlock].order this._possibleTypes = if (newNode.asInstanceOf[NewBlock].possibleTypes != null) newNode.asInstanceOf[NewBlock].possibleTypes diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala index 778ecfdc0..dbc727631 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala @@ -44,10 +44,10 @@ object Call { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DispatchType = new overflowdb.PropertyKey[String]("DISPATCH_TYPE") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val MethodFullName = new overflowdb.PropertyKey[String]("METHOD_FULL_NAME") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -146,10 +146,10 @@ trait CallBase extends AbstractNode with CallReprBase with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dispatchType: String def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def methodFullName: String def name: String def order: scala.Int @@ -168,10 +168,10 @@ class Call(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/is override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dispatchType: String = get().dispatchType override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def methodFullName: String = get().methodFullName override def name: String = get().name override def order: scala.Int = get().order @@ -864,25 +864,25 @@ class CallDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Call override def layoutInformation: NodeLayoutInformation = Call.layoutInformation - private var _argumentIndex: Integer = Call.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = Call.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = Call.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dispatchType: String = Call.PropertyDefaults.DispatchType def dispatchType: String = _dispatchType private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _methodFullName: String = Call.PropertyDefaults.MethodFullName def methodFullName: String = _methodFullName private var _name: String = Call.PropertyDefaults.Name def name: String = _name - private var _order: Integer = Call.PropertyDefaults.Order + private var _order: scala.Int = Call.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -1230,7 +1230,7 @@ class CallDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Call case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DISPATCH_TYPE" => this._dispatchType = value.asInstanceOf[String] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { @@ -1250,7 +1250,7 @@ class CallDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Call collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "METHOD_FULL_NAME" => this._methodFullName = value.asInstanceOf[String] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -1290,19 +1290,15 @@ class CallDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Call override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewCall].argumentIndex - this._argumentName = newNode.asInstanceOf[NewCall].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewCall].argumentName.orNull this._code = newNode.asInstanceOf[NewCall].code - this._columnNumber = newNode.asInstanceOf[NewCall].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewCall].columnNumber.orNull this._dispatchType = newNode.asInstanceOf[NewCall].dispatchType this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewCall].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewCall].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewCall].lineNumber match { case None => null; case Some(value) => value } + this._lineNumber = newNode.asInstanceOf[NewCall].lineNumber.orNull this._methodFullName = newNode.asInstanceOf[NewCall].methodFullName this._name = newNode.asInstanceOf[NewCall].name this._order = newNode.asInstanceOf[NewCall].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CallRepr.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CallRepr.scala index 88ef1953a..f48d96cec 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CallRepr.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CallRepr.scala @@ -13,8 +13,8 @@ object CallRepr { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val Signature = new overflowdb.PropertyKey[String]("SIGNATURE") @@ -36,8 +36,8 @@ object CallRepr { trait CallReprBase extends AbstractNode with CfgNodeBase { def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int def signature: String @@ -45,14 +45,14 @@ trait CallReprBase extends AbstractNode with CfgNodeBase { trait CallReprNew extends NewNode with CfgNodeNew { def code_=(value: String): Unit - def columnNumber_=(value: Option[scala.Int]): Unit - def lineNumber_=(value: Option[scala.Int]): Unit + def columnNumber_=(value: Option[Integer]): Unit + def lineNumber_=(value: Option[Integer]): Unit def name_=(value: String): Unit def order_=(value: scala.Int): Unit def signature_=(value: String): Unit def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int def signature: String diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CfgNode.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CfgNode.scala index 7a379b83e..1b53ae974 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CfgNode.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/CfgNode.scala @@ -11,8 +11,8 @@ object CfgNode { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -30,19 +30,19 @@ object CfgNode { trait CfgNodeBase extends AbstractNode with AstNodeBase { def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } trait CfgNodeNew extends NewNode with AstNodeNew { def code_=(value: String): Unit - def columnNumber_=(value: Option[scala.Int]): Unit - def lineNumber_=(value: Option[scala.Int]): Unit + def columnNumber_=(value: Option[Integer]): Unit + def lineNumber_=(value: Option[Integer]): Unit def order_=(value: scala.Int): Unit def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala index e1acfdf1c..80b0a428f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala @@ -150,9 +150,9 @@ class ClosureBindingDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override def layoutInformation: NodeLayoutInformation = ClosureBinding.layoutInformation private var _closureBindingId: String = null - def closureBindingId: Option[String] = Option(_closureBindingId).asInstanceOf[Option[String]] + def closureBindingId: Option[String] = Option(_closureBindingId) private var _closureOriginalName: String = null - def closureOriginalName: Option[String] = Option(_closureOriginalName).asInstanceOf[Option[String]] + def closureOriginalName: Option[String] = Option(_closureOriginalName) private var _evaluationStrategy: String = ClosureBinding.PropertyDefaults.EvaluationStrategy def evaluationStrategy: String = _evaluationStrategy @@ -248,12 +248,8 @@ class ClosureBindingDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._closureBindingId = newNode.asInstanceOf[NewClosureBinding].closureBindingId match { - case None => null; case Some(value) => value - } - this._closureOriginalName = newNode.asInstanceOf[NewClosureBinding].closureOriginalName match { - case None => null; case Some(value) => value - } + this._closureBindingId = newNode.asInstanceOf[NewClosureBinding].closureBindingId.orNull + this._closureOriginalName = newNode.asInstanceOf[NewClosureBinding].closureOriginalName.orNull this._evaluationStrategy = newNode.asInstanceOf[NewClosureBinding].evaluationStrategy } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala index b852a6814..043b745ba 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala @@ -20,9 +20,9 @@ object Comment { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val Filename = new overflowdb.PropertyKey[String]("FILENAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -62,9 +62,9 @@ trait CommentBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def filename: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int } @@ -74,11 +74,11 @@ class Comment(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug with CommentBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def filename: String = get().filename - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def filename: String = get().filename + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => Comment.PropertyDefaults.Code @@ -153,16 +153,16 @@ class CommentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with A override def layoutInformation: NodeLayoutInformation = Comment.layoutInformation - private var _code: String = Comment.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _filename: String = Comment.PropertyDefaults.Filename - def filename: String = _filename - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Comment.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = Comment.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _filename: String = Comment.PropertyDefaults.Filename + def filename: String = _filename + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Comment.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -245,9 +245,9 @@ class CommentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with A override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "FILENAME" => this._filename = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -265,13 +265,9 @@ class CommentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with A override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewComment].code - this._columnNumber = newNode.asInstanceOf[NewComment].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewComment].columnNumber.orNull this._filename = newNode.asInstanceOf[NewComment].filename - this._lineNumber = newNode.asInstanceOf[NewComment].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewComment].lineNumber.orNull this._order = newNode.asInstanceOf[NewComment].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala index d58ff1607..48784ae9f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala @@ -26,9 +26,9 @@ object ControlStructure { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val ControlStructureType = new overflowdb.PropertyKey[String]("CONTROL_STRUCTURE_TYPE") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val ParserTypeName = new overflowdb.PropertyKey[String]("PARSER_TYPE_NAME") @@ -114,9 +114,9 @@ trait ControlStructureBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def controlStructureType: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def parserTypeName: String @@ -127,14 +127,14 @@ class ControlStructure(graph_4762: Graph, id_4762: Long /*cf https://github.com/ with ControlStructureBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def controlStructureType: String = get().controlStructureType - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order - override def parserTypeName: String = get().parserTypeName + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def controlStructureType: String = get().controlStructureType + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order + override def parserTypeName: String = get().parserTypeName override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => ControlStructure.PropertyDefaults.ArgumentIndex @@ -720,19 +720,19 @@ class ControlStructureDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = ControlStructure.layoutInformation - private var _argumentIndex: Integer = ControlStructure.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = ControlStructure.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = ControlStructure.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _controlStructureType: String = ControlStructure.PropertyDefaults.ControlStructureType def controlStructureType: String = _controlStructureType private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = ControlStructure.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = ControlStructure.PropertyDefaults.Order def order: scala.Int = _order private var _parserTypeName: String = ControlStructure.PropertyDefaults.ParserTypeName def parserTypeName: String = _parserTypeName @@ -1007,9 +1007,9 @@ class ControlStructureDb(ref: NodeRef[NodeDb]) case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "CONTROL_STRUCTURE_TYPE" => this._controlStructureType = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "PARSER_TYPE_NAME" => this._parserTypeName = value.asInstanceOf[String] @@ -1028,17 +1028,11 @@ class ControlStructureDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewControlStructure].argumentIndex - this._argumentName = newNode.asInstanceOf[NewControlStructure].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewControlStructure].argumentName.orNull this._code = newNode.asInstanceOf[NewControlStructure].code - this._columnNumber = newNode.asInstanceOf[NewControlStructure].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewControlStructure].columnNumber.orNull this._controlStructureType = newNode.asInstanceOf[NewControlStructure].controlStructureType - this._lineNumber = newNode.asInstanceOf[NewControlStructure].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewControlStructure].lineNumber.orNull this._order = newNode.asInstanceOf[NewControlStructure].order this._parserTypeName = newNode.asInstanceOf[NewControlStructure].parserTypeName diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala index 163b5d804..24cc63489 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala @@ -122,7 +122,7 @@ class DependencyDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit override def layoutInformation: NodeLayoutInformation = Dependency.layoutInformation private var _dependencyGroupId: String = null - def dependencyGroupId: Option[String] = Option(_dependencyGroupId).asInstanceOf[Option[String]] + def dependencyGroupId: Option[String] = Option(_dependencyGroupId) private var _name: String = Dependency.PropertyDefaults.Name def name: String = _name private var _version: String = Dependency.PropertyDefaults.Version @@ -208,9 +208,7 @@ class DependencyDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._dependencyGroupId = newNode.asInstanceOf[NewDependency].dependencyGroupId match { - case None => null; case Some(value) => value - } + this._dependencyGroupId = newNode.asInstanceOf[NewDependency].dependencyGroupId.orNull this._name = newNode.asInstanceOf[NewDependency].name this._version = newNode.asInstanceOf[NewDependency].version diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Expression.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Expression.scala index ed5875b81..51bbb22eb 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Expression.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Expression.scala @@ -15,8 +15,8 @@ object Expression { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -37,8 +37,8 @@ trait ExpressionBase extends AbstractNode with AstNodeBase with CfgNodeBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -46,14 +46,14 @@ trait ExpressionNew extends NewNode with AstNodeNew with CfgNodeNew { def argumentIndex_=(value: scala.Int): Unit def argumentName_=(value: Option[String]): Unit def code_=(value: String): Unit - def columnNumber_=(value: Option[scala.Int]): Unit - def lineNumber_=(value: Option[scala.Int]): Unit + def columnNumber_=(value: Option[Integer]): Unit + def lineNumber_=(value: Option[Integer]): Unit def order_=(value: scala.Int): Unit def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala index 7fb5ad758..edcc2edcd 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala @@ -25,8 +25,8 @@ object FieldIdentifier { val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val CanonicalName = new overflowdb.PropertyKey[String]("CANONICAL_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -84,8 +84,8 @@ trait FieldIdentifierBase extends AbstractNode with ExpressionBase { def argumentName: Option[String] def canonicalName: String def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -95,13 +95,13 @@ class FieldIdentifier(graph_4762: Graph, id_4762: Long /*cf https://github.com/s with FieldIdentifierBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def canonicalName: String = get().canonicalName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def canonicalName: String = get().canonicalName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => FieldIdentifier.PropertyDefaults.ArgumentIndex @@ -523,20 +523,20 @@ class FieldIdentifierDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = FieldIdentifier.layoutInformation - private var _argumentIndex: Integer = FieldIdentifier.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _canonicalName: String = FieldIdentifier.PropertyDefaults.CanonicalName - def canonicalName: String = _canonicalName - private var _code: String = FieldIdentifier.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = FieldIdentifier.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = FieldIdentifier.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _canonicalName: String = FieldIdentifier.PropertyDefaults.CanonicalName + def canonicalName: String = _canonicalName + private var _code: String = FieldIdentifier.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = FieldIdentifier.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -762,8 +762,8 @@ class FieldIdentifierDb(ref: NodeRef[NodeDb]) case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CANONICAL_NAME" => this._canonicalName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -781,17 +781,11 @@ class FieldIdentifierDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewFieldIdentifier].argumentIndex - this._argumentName = newNode.asInstanceOf[NewFieldIdentifier].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewFieldIdentifier].argumentName.orNull this._canonicalName = newNode.asInstanceOf[NewFieldIdentifier].canonicalName this._code = newNode.asInstanceOf[NewFieldIdentifier].code - this._columnNumber = newNode.asInstanceOf[NewFieldIdentifier].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewFieldIdentifier].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewFieldIdentifier].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewFieldIdentifier].lineNumber.orNull this._order = newNode.asInstanceOf[NewFieldIdentifier].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala index af77be077..8ee00a74e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala @@ -22,10 +22,10 @@ object File { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val Content = new overflowdb.PropertyKey[String]("CONTENT") val Hash = new overflowdb.PropertyKey[String]("HASH") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -68,10 +68,10 @@ trait FileBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def content: String def hash: Option[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -82,13 +82,13 @@ class File(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/is with FileBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def content: String = get().content - override def hash: Option[String] = get().hash - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def content: String = get().content + override def hash: Option[String] = get().hash + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => File.PropertyDefaults.Code @@ -199,20 +199,20 @@ class FileDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with AstN override def layoutInformation: NodeLayoutInformation = File.layoutInformation - private var _code: String = File.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _content: String = File.PropertyDefaults.Content - def content: String = _content - private var _hash: String = null - def hash: Option[String] = Option(_hash).asInstanceOf[Option[String]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = File.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = File.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = File.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _content: String = File.PropertyDefaults.Content + def content: String = _content + private var _hash: String = null + def hash: Option[String] = Option(_hash) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = File.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = File.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -315,10 +315,10 @@ class FileDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with AstN override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "CONTENT" => this._content = value.asInstanceOf[String] case "HASH" => this._hash = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -337,12 +337,10 @@ class FileDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with AstN override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewFile].code - this._columnNumber = newNode.asInstanceOf[NewFile].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewFile].columnNumber.orNull this._content = newNode.asInstanceOf[NewFile].content - this._hash = newNode.asInstanceOf[NewFile].hash match { case None => null; case Some(value) => value } - this._lineNumber = newNode.asInstanceOf[NewFile].lineNumber match { case None => null; case Some(value) => value } + this._hash = newNode.asInstanceOf[NewFile].hash.orNull + this._lineNumber = newNode.asInstanceOf[NewFile].lineNumber.orNull this._name = newNode.asInstanceOf[NewFile].name this._order = newNode.asInstanceOf[NewFile].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala index d40625a9d..d4a0bc758 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala @@ -38,9 +38,9 @@ object Identifier { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -128,9 +128,9 @@ trait IdentifierBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int def possibleTypes: IndexedSeq[String] @@ -146,9 +146,9 @@ class Identifier(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/ override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def name: String = get().name override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -712,21 +712,21 @@ class IdentifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit override def layoutInformation: NodeLayoutInformation = Identifier.layoutInformation - private var _argumentIndex: Integer = Identifier.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = Identifier.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = Identifier.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = Identifier.PropertyDefaults.Name def name: String = _name - private var _order: Integer = Identifier.PropertyDefaults.Order + private var _order: scala.Int = Identifier.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -1012,7 +1012,7 @@ class IdentifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -1031,7 +1031,7 @@ class IdentifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => @@ -1069,20 +1069,14 @@ class IdentifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewIdentifier].argumentIndex - this._argumentName = newNode.asInstanceOf[NewIdentifier].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewIdentifier].argumentName.orNull this._code = newNode.asInstanceOf[NewIdentifier].code - this._columnNumber = newNode.asInstanceOf[NewIdentifier].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewIdentifier].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewIdentifier].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewIdentifier].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewIdentifier].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewIdentifier].lineNumber.orNull this._name = newNode.asInstanceOf[NewIdentifier].name this._order = newNode.asInstanceOf[NewIdentifier].order this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala index 1cf38cbca..3eb80457a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala @@ -25,13 +25,13 @@ object Import { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val ExplicitAs = new overflowdb.PropertyKey[Boolean]("EXPLICIT_AS") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val ExplicitAs = new overflowdb.PropertyKey[java.lang.Boolean]("EXPLICIT_AS") val ImportedAs = new overflowdb.PropertyKey[String]("IMPORTED_AS") val ImportedEntity = new overflowdb.PropertyKey[String]("IMPORTED_ENTITY") - val IsExplicit = new overflowdb.PropertyKey[Boolean]("IS_EXPLICIT") - val IsWildcard = new overflowdb.PropertyKey[Boolean]("IS_WILDCARD") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val IsExplicit = new overflowdb.PropertyKey[java.lang.Boolean]("IS_EXPLICIT") + val IsWildcard = new overflowdb.PropertyKey[java.lang.Boolean]("IS_WILDCARD") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -73,13 +73,13 @@ trait ImportBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def explicitAs: Option[Boolean] + def columnNumber: Option[Integer] + def explicitAs: Option[java.lang.Boolean] def importedAs: Option[String] def importedEntity: Option[String] - def isExplicit: Option[Boolean] - def isWildcard: Option[Boolean] - def lineNumber: Option[scala.Int] + def isExplicit: Option[java.lang.Boolean] + def isWildcard: Option[java.lang.Boolean] + def lineNumber: Option[Integer] def order: scala.Int } @@ -89,15 +89,15 @@ class Import(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/ with ImportBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def explicitAs: Option[Boolean] = get().explicitAs - override def importedAs: Option[String] = get().importedAs - override def importedEntity: Option[String] = get().importedEntity - override def isExplicit: Option[Boolean] = get().isExplicit - override def isWildcard: Option[Boolean] = get().isWildcard - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def explicitAs: Option[java.lang.Boolean] = get().explicitAs + override def importedAs: Option[String] = get().importedAs + override def importedEntity: Option[String] = get().importedEntity + override def isExplicit: Option[java.lang.Boolean] = get().isExplicit + override def isWildcard: Option[java.lang.Boolean] = get().isWildcard + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => Import.PropertyDefaults.Code @@ -197,20 +197,20 @@ class ImportDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As private var _code: String = Import.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _explicitAs: java.lang.Boolean = null - def explicitAs: Option[Boolean] = Option(_explicitAs).asInstanceOf[Option[Boolean]] + def explicitAs: Option[java.lang.Boolean] = Option(_explicitAs) private var _importedAs: String = null - def importedAs: Option[String] = Option(_importedAs).asInstanceOf[Option[String]] + def importedAs: Option[String] = Option(_importedAs) private var _importedEntity: String = null - def importedEntity: Option[String] = Option(_importedEntity).asInstanceOf[Option[String]] + def importedEntity: Option[String] = Option(_importedEntity) private var _isExplicit: java.lang.Boolean = null - def isExplicit: Option[Boolean] = Option(_isExplicit).asInstanceOf[Option[Boolean]] + def isExplicit: Option[java.lang.Boolean] = Option(_isExplicit) private var _isWildcard: java.lang.Boolean = null - def isWildcard: Option[Boolean] = Option(_isWildcard).asInstanceOf[Option[Boolean]] + def isWildcard: Option[java.lang.Boolean] = Option(_isWildcard) private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Import.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Import.PropertyDefaults.Order def order: scala.Int = _order /** faster than the default implementation */ @@ -320,13 +320,13 @@ class ImportDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "EXPLICIT_AS" => this._explicitAs = value.asInstanceOf[Boolean] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "EXPLICIT_AS" => this._explicitAs = value.asInstanceOf[java.lang.Boolean] case "IMPORTED_AS" => this._importedAs = value.asInstanceOf[String] case "IMPORTED_ENTITY" => this._importedEntity = value.asInstanceOf[String] - case "IS_EXPLICIT" => this._isExplicit = value.asInstanceOf[Boolean] - case "IS_WILDCARD" => this._isWildcard = value.asInstanceOf[Boolean] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "IS_EXPLICIT" => this._isExplicit = value.asInstanceOf[java.lang.Boolean] + case "IS_WILDCARD" => this._isWildcard = value.asInstanceOf[java.lang.Boolean] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -344,17 +344,13 @@ class ImportDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewImport].code - this._columnNumber = newNode.asInstanceOf[NewImport].columnNumber match { - case None => null; case Some(value) => value - } - this._explicitAs = newNode.asInstanceOf[NewImport].explicitAs match { case None => null; case Some(value) => value } - this._importedAs = newNode.asInstanceOf[NewImport].importedAs match { case None => null; case Some(value) => value } - this._importedEntity = newNode.asInstanceOf[NewImport].importedEntity match { - case None => null; case Some(value) => value - } - this._isExplicit = newNode.asInstanceOf[NewImport].isExplicit match { case None => null; case Some(value) => value } - this._isWildcard = newNode.asInstanceOf[NewImport].isWildcard match { case None => null; case Some(value) => value } - this._lineNumber = newNode.asInstanceOf[NewImport].lineNumber match { case None => null; case Some(value) => value } + this._columnNumber = newNode.asInstanceOf[NewImport].columnNumber.orNull + this._explicitAs = newNode.asInstanceOf[NewImport].explicitAs.orNull + this._importedAs = newNode.asInstanceOf[NewImport].importedAs.orNull + this._importedEntity = newNode.asInstanceOf[NewImport].importedEntity.orNull + this._isExplicit = newNode.asInstanceOf[NewImport].isExplicit.orNull + this._isWildcard = newNode.asInstanceOf[NewImport].isWildcard.orNull + this._lineNumber = newNode.asInstanceOf[NewImport].lineNumber.orNull this._order = newNode.asInstanceOf[NewImport].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala index ae14f7c7c..61b0a2461 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala @@ -21,8 +21,8 @@ object JumpLabel { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val ParserTypeName = new overflowdb.PropertyKey[String]("PARSER_TYPE_NAME") @@ -62,8 +62,8 @@ trait JumpLabelBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int def parserTypeName: String @@ -75,12 +75,12 @@ class JumpLabel(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/b with JumpLabelBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order - override def parserTypeName: String = get().parserTypeName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order + override def parserTypeName: String = get().parserTypeName override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => JumpLabel.PropertyDefaults.Code @@ -147,12 +147,12 @@ class JumpLabelDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with private var _code: String = JumpLabel.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = JumpLabel.PropertyDefaults.Name def name: String = _name - private var _order: Integer = JumpLabel.PropertyDefaults.Order + private var _order: scala.Int = JumpLabel.PropertyDefaults.Order def order: scala.Int = _order private var _parserTypeName: String = JumpLabel.PropertyDefaults.ParserTypeName def parserTypeName: String = _parserTypeName @@ -235,8 +235,8 @@ class JumpLabelDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "PARSER_TYPE_NAME" => this._parserTypeName = value.asInstanceOf[String] @@ -256,12 +256,8 @@ class JumpLabelDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewJumpLabel].code - this._columnNumber = newNode.asInstanceOf[NewJumpLabel].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewJumpLabel].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewJumpLabel].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewJumpLabel].lineNumber.orNull this._name = newNode.asInstanceOf[NewJumpLabel].name this._order = newNode.asInstanceOf[NewJumpLabel].order this._parserTypeName = newNode.asInstanceOf[NewJumpLabel].parserTypeName diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala index 65e67654a..2d8cdee84 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala @@ -23,8 +23,8 @@ object JumpTarget { object Properties { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val ParserTypeName = new overflowdb.PropertyKey[String]("PARSER_TYPE_NAME") @@ -81,8 +81,8 @@ trait JumpTargetBase extends AbstractNode with AstNodeBase with CfgNodeBase { def argumentIndex: scala.Int def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int def parserTypeName: String @@ -95,13 +95,13 @@ class JumpTarget(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/ with StoredNode with AstNode with CfgNode { - override def argumentIndex: scala.Int = get().argumentIndex - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order - override def parserTypeName: String = get().parserTypeName + override def argumentIndex: scala.Int = get().argumentIndex + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order + override def parserTypeName: String = get().parserTypeName override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => JumpTarget.PropertyDefaults.ArgumentIndex @@ -523,20 +523,20 @@ class JumpTargetDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = JumpTarget.layoutInformation - private var _argumentIndex: Integer = JumpTarget.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _code: String = JumpTarget.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = JumpTarget.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = JumpTarget.PropertyDefaults.Order - def order: scala.Int = _order - private var _parserTypeName: String = JumpTarget.PropertyDefaults.ParserTypeName - def parserTypeName: String = _parserTypeName + private var _argumentIndex: scala.Int = JumpTarget.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _code: String = JumpTarget.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = JumpTarget.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = JumpTarget.PropertyDefaults.Order + def order: scala.Int = _order + private var _parserTypeName: String = JumpTarget.PropertyDefaults.ParserTypeName + def parserTypeName: String = _parserTypeName /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -744,8 +744,8 @@ class JumpTargetDb(ref: NodeRef[NodeDb]) key match { case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "PARSER_TYPE_NAME" => this._parserTypeName = value.asInstanceOf[String] @@ -766,12 +766,8 @@ class JumpTargetDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewJumpTarget].argumentIndex this._code = newNode.asInstanceOf[NewJumpTarget].code - this._columnNumber = newNode.asInstanceOf[NewJumpTarget].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewJumpTarget].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewJumpTarget].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewJumpTarget].lineNumber.orNull this._name = newNode.asInstanceOf[NewJumpTarget].name this._order = newNode.asInstanceOf[NewJumpTarget].order this._parserTypeName = newNode.asInstanceOf[NewJumpTarget].parserTypeName diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala index f2a73df5b..ad2658500 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala @@ -36,9 +36,9 @@ object Literal { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") val TypeFullName = new overflowdb.PropertyKey[String]("TYPE_FULL_NAME") @@ -113,9 +113,9 @@ trait LiteralBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def possibleTypes: IndexedSeq[String] def typeFullName: String @@ -130,9 +130,9 @@ class Literal(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes override def typeFullName: String = get().typeFullName @@ -681,19 +681,19 @@ class LiteralDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def layoutInformation: NodeLayoutInformation = Literal.layoutInformation - private var _argumentIndex: Integer = Literal.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = Literal.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = Literal.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Literal.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Literal.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -976,7 +976,7 @@ class LiteralDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -995,7 +995,7 @@ class LiteralDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => this._possibleTypes = value match { @@ -1032,20 +1032,14 @@ class LiteralDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewLiteral].argumentIndex - this._argumentName = newNode.asInstanceOf[NewLiteral].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewLiteral].argumentName.orNull this._code = newNode.asInstanceOf[NewLiteral].code - this._columnNumber = newNode.asInstanceOf[NewLiteral].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewLiteral].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewLiteral].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewLiteral].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewLiteral].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewLiteral].lineNumber.orNull this._order = newNode.asInstanceOf[NewLiteral].order this._possibleTypes = if (newNode.asInstanceOf[NewLiteral].possibleTypes != null) newNode.asInstanceOf[NewLiteral].possibleTypes diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala index d79f9ec6c..306b67548 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala @@ -35,9 +35,9 @@ object Local { object Properties { val ClosureBindingId = new overflowdb.PropertyKey[String]("CLOSURE_BINDING_ID") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -86,9 +86,9 @@ trait LocalBase extends AbstractNode with AstNodeBase with DeclarationBase { def closureBindingId: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int def possibleTypes: IndexedSeq[String] @@ -104,9 +104,9 @@ class Local(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/i with Declaration { override def closureBindingId: Option[String] = get().closureBindingId override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def name: String = get().name override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -228,18 +228,18 @@ class LocalDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ast override def layoutInformation: NodeLayoutInformation = Local.layoutInformation private var _closureBindingId: String = null - def closureBindingId: Option[String] = Option(_closureBindingId).asInstanceOf[Option[String]] + def closureBindingId: Option[String] = Option(_closureBindingId) private var _code: String = Local.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = Local.PropertyDefaults.Name def name: String = _name - private var _order: Integer = Local.PropertyDefaults.Order + private var _order: scala.Int = Local.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -364,7 +364,7 @@ class LocalDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ast key match { case "CLOSURE_BINDING_ID" => this._closureBindingId = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -383,7 +383,7 @@ class LocalDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ast collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => @@ -420,18 +420,14 @@ class LocalDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ast fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._closureBindingId = newNode.asInstanceOf[NewLocal].closureBindingId match { - case None => null; case Some(value) => value - } + this._closureBindingId = newNode.asInstanceOf[NewLocal].closureBindingId.orNull this._code = newNode.asInstanceOf[NewLocal].code - this._columnNumber = newNode.asInstanceOf[NewLocal].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewLocal].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewLocal].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewLocal].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewLocal].lineNumber match { case None => null; case Some(value) => value } + this._lineNumber = newNode.asInstanceOf[NewLocal].lineNumber.orNull this._name = newNode.asInstanceOf[NewLocal].name this._order = newNode.asInstanceOf[NewLocal].order this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Location.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Location.scala index 3b0547aa1..a33ec3912 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Location.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Location.scala @@ -38,7 +38,7 @@ object Location { val ClassName = new overflowdb.PropertyKey[String]("CLASS_NAME") val ClassShortName = new overflowdb.PropertyKey[String]("CLASS_SHORT_NAME") val Filename = new overflowdb.PropertyKey[String]("FILENAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val MethodFullName = new overflowdb.PropertyKey[String]("METHOD_FULL_NAME") val MethodShortName = new overflowdb.PropertyKey[String]("METHOD_SHORT_NAME") val NodeLabel = new overflowdb.PropertyKey[String]("NODE_LABEL") @@ -81,7 +81,7 @@ trait LocationBase extends AbstractNode { def className: String def classShortName: String def filename: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def methodFullName: String def methodShortName: String def nodeLabel: String @@ -95,15 +95,15 @@ class Location(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bu extends NodeRef[LocationDb](graph_4762, id_4762) with LocationBase with StoredNode { - override def className: String = get().className - override def classShortName: String = get().classShortName - override def filename: String = get().filename - override def lineNumber: Option[scala.Int] = get().lineNumber - override def methodFullName: String = get().methodFullName - override def methodShortName: String = get().methodShortName - override def nodeLabel: String = get().nodeLabel - override def packageName: String = get().packageName - override def symbol: String = get().symbol + override def className: String = get().className + override def classShortName: String = get().classShortName + override def filename: String = get().filename + override def lineNumber: Option[Integer] = get().lineNumber + override def methodFullName: String = get().methodFullName + override def methodShortName: String = get().methodShortName + override def nodeLabel: String = get().nodeLabel + override def packageName: String = get().packageName + override def symbol: String = get().symbol override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CLASS_NAME" => Location.PropertyDefaults.ClassName @@ -181,7 +181,7 @@ class LocationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with private var _filename: String = Location.PropertyDefaults.Filename def filename: String = _filename private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _methodFullName: String = Location.PropertyDefaults.MethodFullName def methodFullName: String = _methodFullName private var _methodShortName: String = Location.PropertyDefaults.MethodShortName @@ -290,7 +290,7 @@ class LocationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with case "CLASS_NAME" => this._className = value.asInstanceOf[String] case "CLASS_SHORT_NAME" => this._classShortName = value.asInstanceOf[String] case "FILENAME" => this._filename = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "METHOD_FULL_NAME" => this._methodFullName = value.asInstanceOf[String] case "METHOD_SHORT_NAME" => this._methodShortName = value.asInstanceOf[String] case "NODE_LABEL" => this._nodeLabel = value.asInstanceOf[String] @@ -314,9 +314,7 @@ class LocationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with this._className = newNode.asInstanceOf[NewLocation].className this._classShortName = newNode.asInstanceOf[NewLocation].classShortName this._filename = newNode.asInstanceOf[NewLocation].filename - this._lineNumber = newNode.asInstanceOf[NewLocation].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewLocation].lineNumber.orNull this._methodFullName = newNode.asInstanceOf[NewLocation].methodFullName this._methodShortName = newNode.asInstanceOf[NewLocation].methodShortName this._nodeLabel = newNode.asInstanceOf[NewLocation].nodeLabel diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala index dbee46bc8..370bb7a52 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala @@ -38,9 +38,9 @@ object Member { val AstParentFullName = new overflowdb.PropertyKey[String]("AST_PARENT_FULL_NAME") val AstParentType = new overflowdb.PropertyKey[String]("AST_PARENT_TYPE") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -92,9 +92,9 @@ trait MemberBase extends AbstractNode with AstNodeBase with DeclarationBase { def astParentFullName: String def astParentType: String def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int def possibleTypes: IndexedSeq[String] @@ -111,9 +111,9 @@ class Member(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/ override def astParentFullName: String = get().astParentFullName override def astParentType: String = get().astParentType override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def name: String = get().name override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -238,14 +238,14 @@ class MemberDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As private var _code: String = Member.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = Member.PropertyDefaults.Name def name: String = _name - private var _order: Integer = Member.PropertyDefaults.Order + private var _order: scala.Int = Member.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -381,7 +381,7 @@ class MemberDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As case "AST_PARENT_FULL_NAME" => this._astParentFullName = value.asInstanceOf[String] case "AST_PARENT_TYPE" => this._astParentType = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -400,7 +400,7 @@ class MemberDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => @@ -440,14 +440,12 @@ class MemberDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with As this._astParentFullName = newNode.asInstanceOf[NewMember].astParentFullName this._astParentType = newNode.asInstanceOf[NewMember].astParentType this._code = newNode.asInstanceOf[NewMember].code - this._columnNumber = newNode.asInstanceOf[NewMember].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMember].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewMember].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewMember].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewMember].lineNumber match { case None => null; case Some(value) => value } + this._lineNumber = newNode.asInstanceOf[NewMember].lineNumber.orNull this._name = newNode.asInstanceOf[NewMember].name this._order = newNode.asInstanceOf[NewMember].order this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala index 04327b54d..e0ba16b1f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala @@ -124,7 +124,7 @@ class MetaDataDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def layoutInformation: NodeLayoutInformation = MetaData.layoutInformation private var _hash: String = null - def hash: Option[String] = Option(_hash).asInstanceOf[Option[String]] + def hash: Option[String] = Option(_hash) private var _language: String = MetaData.PropertyDefaults.Language def language: String = _language private var _overlays: IndexedSeq[String] = collection.immutable.ArraySeq.empty @@ -240,7 +240,7 @@ class MetaDataDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._hash = newNode.asInstanceOf[NewMetaData].hash match { case None => null; case Some(value) => value } + this._hash = newNode.asInstanceOf[NewMetaData].hash.orNull this._language = newNode.asInstanceOf[NewMetaData].language this._overlays = if (newNode.asInstanceOf[NewMetaData].overlays != null) newNode.asInstanceOf[NewMetaData].overlays diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala index 1fed14484..0648df858 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala @@ -50,17 +50,17 @@ object Method { val AstParentFullName = new overflowdb.PropertyKey[String]("AST_PARENT_FULL_NAME") val AstParentType = new overflowdb.PropertyKey[String]("AST_PARENT_TYPE") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val ColumnNumberEnd = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER_END") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val ColumnNumberEnd = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER_END") val Filename = new overflowdb.PropertyKey[String]("FILENAME") val FullName = new overflowdb.PropertyKey[String]("FULL_NAME") val Hash = new overflowdb.PropertyKey[String]("HASH") val IsExternal = new overflowdb.PropertyKey[Boolean]("IS_EXTERNAL") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") - val LineNumberEnd = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER_END") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") + val LineNumberEnd = new overflowdb.PropertyKey[Integer]("LINE_NUMBER_END") val Name = new overflowdb.PropertyKey[String]("NAME") - val Offset = new overflowdb.PropertyKey[scala.Int]("OFFSET") - val OffsetEnd = new overflowdb.PropertyKey[scala.Int]("OFFSET_END") + val Offset = new overflowdb.PropertyKey[Integer]("OFFSET") + val OffsetEnd = new overflowdb.PropertyKey[Integer]("OFFSET_END") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val Signature = new overflowdb.PropertyKey[String]("SIGNATURE") @@ -121,17 +121,17 @@ trait MethodBase extends AbstractNode with AstNodeBase with CfgNodeBase with Dec def astParentFullName: String def astParentType: String def code: String - def columnNumber: Option[scala.Int] - def columnNumberEnd: Option[scala.Int] + def columnNumber: Option[Integer] + def columnNumberEnd: Option[Integer] def filename: String def fullName: String def hash: Option[String] def isExternal: Boolean - def lineNumber: Option[scala.Int] - def lineNumberEnd: Option[scala.Int] + def lineNumber: Option[Integer] + def lineNumberEnd: Option[Integer] def name: String - def offset: Option[scala.Int] - def offsetEnd: Option[scala.Int] + def offset: Option[Integer] + def offsetEnd: Option[Integer] def order: scala.Int def signature: String @@ -144,22 +144,22 @@ class Method(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/ with AstNode with CfgNode with Declaration { - override def astParentFullName: String = get().astParentFullName - override def astParentType: String = get().astParentType - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def columnNumberEnd: Option[scala.Int] = get().columnNumberEnd - override def filename: String = get().filename - override def fullName: String = get().fullName - override def hash: Option[String] = get().hash - override def isExternal: Boolean = get().isExternal - override def lineNumber: Option[scala.Int] = get().lineNumber - override def lineNumberEnd: Option[scala.Int] = get().lineNumberEnd - override def name: String = get().name - override def offset: Option[scala.Int] = get().offset - override def offsetEnd: Option[scala.Int] = get().offsetEnd - override def order: scala.Int = get().order - override def signature: String = get().signature + override def astParentFullName: String = get().astParentFullName + override def astParentType: String = get().astParentType + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def columnNumberEnd: Option[Integer] = get().columnNumberEnd + override def filename: String = get().filename + override def fullName: String = get().fullName + override def hash: Option[String] = get().hash + override def isExternal: Boolean = get().isExternal + override def lineNumber: Option[Integer] = get().lineNumber + override def lineNumberEnd: Option[Integer] = get().lineNumberEnd + override def name: String = get().name + override def offset: Option[Integer] = get().offset + override def offsetEnd: Option[Integer] = get().offsetEnd + override def order: scala.Int = get().order + override def signature: String = get().signature override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "AST_PARENT_FULL_NAME" => Method.PropertyDefaults.AstParentFullName @@ -553,38 +553,38 @@ class MethodDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = Method.layoutInformation - private var _astParentFullName: String = Method.PropertyDefaults.AstParentFullName - def astParentFullName: String = _astParentFullName - private var _astParentType: String = Method.PropertyDefaults.AstParentType - def astParentType: String = _astParentType - private var _code: String = Method.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _columnNumberEnd: Integer = null - def columnNumberEnd: Option[scala.Int] = Option(_columnNumberEnd).asInstanceOf[Option[scala.Int]] - private var _filename: String = Method.PropertyDefaults.Filename - def filename: String = _filename - private var _fullName: String = Method.PropertyDefaults.FullName - def fullName: String = _fullName - private var _hash: String = null - def hash: Option[String] = Option(_hash).asInstanceOf[Option[String]] - private var _isExternal: java.lang.Boolean = Method.PropertyDefaults.IsExternal - def isExternal: Boolean = _isExternal - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumberEnd: Integer = null - def lineNumberEnd: Option[scala.Int] = Option(_lineNumberEnd).asInstanceOf[Option[scala.Int]] - private var _name: String = Method.PropertyDefaults.Name - def name: String = _name - private var _offset: Integer = null - def offset: Option[scala.Int] = Option(_offset).asInstanceOf[Option[scala.Int]] - private var _offsetEnd: Integer = null - def offsetEnd: Option[scala.Int] = Option(_offsetEnd).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Method.PropertyDefaults.Order - def order: scala.Int = _order - private var _signature: String = Method.PropertyDefaults.Signature - def signature: String = _signature + private var _astParentFullName: String = Method.PropertyDefaults.AstParentFullName + def astParentFullName: String = _astParentFullName + private var _astParentType: String = Method.PropertyDefaults.AstParentType + def astParentType: String = _astParentType + private var _code: String = Method.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _columnNumberEnd: Integer = null + def columnNumberEnd: Option[Integer] = Option(_columnNumberEnd) + private var _filename: String = Method.PropertyDefaults.Filename + def filename: String = _filename + private var _fullName: String = Method.PropertyDefaults.FullName + def fullName: String = _fullName + private var _hash: String = null + def hash: Option[String] = Option(_hash) + private var _isExternal: Boolean = Method.PropertyDefaults.IsExternal + def isExternal: Boolean = _isExternal + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _lineNumberEnd: Integer = null + def lineNumberEnd: Option[Integer] = Option(_lineNumberEnd) + private var _name: String = Method.PropertyDefaults.Name + def name: String = _name + private var _offset: Integer = null + def offset: Option[Integer] = Option(_offset) + private var _offsetEnd: Integer = null + def offsetEnd: Option[Integer] = Option(_offsetEnd) + private var _order: scala.Int = Method.PropertyDefaults.Order + def order: scala.Int = _order + private var _signature: String = Method.PropertyDefaults.Signature + def signature: String = _signature /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -836,17 +836,17 @@ class MethodDb(ref: NodeRef[NodeDb]) case "AST_PARENT_FULL_NAME" => this._astParentFullName = value.asInstanceOf[String] case "AST_PARENT_TYPE" => this._astParentType = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "COLUMN_NUMBER_END" => this._columnNumberEnd = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "COLUMN_NUMBER_END" => this._columnNumberEnd = value.asInstanceOf[Integer] case "FILENAME" => this._filename = value.asInstanceOf[String] case "FULL_NAME" => this._fullName = value.asInstanceOf[String] case "HASH" => this._hash = value.asInstanceOf[String] case "IS_EXTERNAL" => this._isExternal = value.asInstanceOf[Boolean] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER_END" => this._lineNumberEnd = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER_END" => this._lineNumberEnd = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] - case "OFFSET" => this._offset = value.asInstanceOf[scala.Int] - case "OFFSET_END" => this._offsetEnd = value.asInstanceOf[scala.Int] + case "OFFSET" => this._offset = value.asInstanceOf[Integer] + case "OFFSET_END" => this._offsetEnd = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "SIGNATURE" => this._signature = value.asInstanceOf[String] @@ -867,23 +867,17 @@ class MethodDb(ref: NodeRef[NodeDb]) this._astParentFullName = newNode.asInstanceOf[NewMethod].astParentFullName this._astParentType = newNode.asInstanceOf[NewMethod].astParentType this._code = newNode.asInstanceOf[NewMethod].code - this._columnNumber = newNode.asInstanceOf[NewMethod].columnNumber match { - case None => null; case Some(value) => value - } - this._columnNumberEnd = newNode.asInstanceOf[NewMethod].columnNumberEnd match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMethod].columnNumber.orNull + this._columnNumberEnd = newNode.asInstanceOf[NewMethod].columnNumberEnd.orNull this._filename = newNode.asInstanceOf[NewMethod].filename this._fullName = newNode.asInstanceOf[NewMethod].fullName - this._hash = newNode.asInstanceOf[NewMethod].hash match { case None => null; case Some(value) => value } + this._hash = newNode.asInstanceOf[NewMethod].hash.orNull this._isExternal = newNode.asInstanceOf[NewMethod].isExternal - this._lineNumber = newNode.asInstanceOf[NewMethod].lineNumber match { case None => null; case Some(value) => value } - this._lineNumberEnd = newNode.asInstanceOf[NewMethod].lineNumberEnd match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewMethod].lineNumber.orNull + this._lineNumberEnd = newNode.asInstanceOf[NewMethod].lineNumberEnd.orNull this._name = newNode.asInstanceOf[NewMethod].name - this._offset = newNode.asInstanceOf[NewMethod].offset match { case None => null; case Some(value) => value } - this._offsetEnd = newNode.asInstanceOf[NewMethod].offsetEnd match { case None => null; case Some(value) => value } + this._offset = newNode.asInstanceOf[NewMethod].offset.orNull + this._offsetEnd = newNode.asInstanceOf[NewMethod].offsetEnd.orNull this._order = newNode.asInstanceOf[NewMethod].order this._signature = newNode.asInstanceOf[NewMethod].signature diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala index 3d13c84ef..8d24baf0e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala @@ -41,12 +41,12 @@ object MethodParameterIn { object Properties { val ClosureBindingId = new overflowdb.PropertyKey[String]("CLOSURE_BINDING_ID") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") val EvaluationStrategy = new overflowdb.PropertyKey[String]("EVALUATION_STRATEGY") val Index = new overflowdb.PropertyKey[scala.Int]("INDEX") val IsVariadic = new overflowdb.PropertyKey[Boolean]("IS_VARIADIC") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -103,12 +103,12 @@ trait MethodParameterInBase extends AbstractNode with AstNodeBase with CfgNodeBa def closureBindingId: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] def evaluationStrategy: String def index: scala.Int def isVariadic: Boolean - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int def possibleTypes: IndexedSeq[String] @@ -125,12 +125,12 @@ class MethodParameterIn(graph_4762: Graph, id_4762: Long /*cf https://github.com with Declaration { override def closureBindingId: Option[String] = get().closureBindingId override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName override def evaluationStrategy: String = get().evaluationStrategy override def index: scala.Int = get().index override def isVariadic: Boolean = get().isVariadic - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def name: String = get().name override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -321,24 +321,24 @@ class MethodParameterInDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = MethodParameterIn.layoutInformation private var _closureBindingId: String = null - def closureBindingId: Option[String] = Option(_closureBindingId).asInstanceOf[Option[String]] + def closureBindingId: Option[String] = Option(_closureBindingId) private var _code: String = MethodParameterIn.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _evaluationStrategy: String = MethodParameterIn.PropertyDefaults.EvaluationStrategy def evaluationStrategy: String = _evaluationStrategy - private var _index: Integer = MethodParameterIn.PropertyDefaults.Index + private var _index: scala.Int = MethodParameterIn.PropertyDefaults.Index def index: scala.Int = _index - private var _isVariadic: java.lang.Boolean = MethodParameterIn.PropertyDefaults.IsVariadic + private var _isVariadic: Boolean = MethodParameterIn.PropertyDefaults.IsVariadic def isVariadic: Boolean = _isVariadic private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = MethodParameterIn.PropertyDefaults.Name def name: String = _name - private var _order: Integer = MethodParameterIn.PropertyDefaults.Order + private var _order: scala.Int = MethodParameterIn.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -517,7 +517,7 @@ class MethodParameterInDb(ref: NodeRef[NodeDb]) key match { case "CLOSURE_BINDING_ID" => this._closureBindingId = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -539,7 +539,7 @@ class MethodParameterInDb(ref: NodeRef[NodeDb]) case "EVALUATION_STRATEGY" => this._evaluationStrategy = value.asInstanceOf[String] case "INDEX" => this._index = value.asInstanceOf[scala.Int] case "IS_VARIADIC" => this._isVariadic = value.asInstanceOf[Boolean] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => @@ -576,13 +576,9 @@ class MethodParameterInDb(ref: NodeRef[NodeDb]) fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._closureBindingId = newNode.asInstanceOf[NewMethodParameterIn].closureBindingId match { - case None => null; case Some(value) => value - } + this._closureBindingId = newNode.asInstanceOf[NewMethodParameterIn].closureBindingId.orNull this._code = newNode.asInstanceOf[NewMethodParameterIn].code - this._columnNumber = newNode.asInstanceOf[NewMethodParameterIn].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMethodParameterIn].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewMethodParameterIn].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewMethodParameterIn].dynamicTypeHintFullName @@ -590,9 +586,7 @@ class MethodParameterInDb(ref: NodeRef[NodeDb]) this._evaluationStrategy = newNode.asInstanceOf[NewMethodParameterIn].evaluationStrategy this._index = newNode.asInstanceOf[NewMethodParameterIn].index this._isVariadic = newNode.asInstanceOf[NewMethodParameterIn].isVariadic - this._lineNumber = newNode.asInstanceOf[NewMethodParameterIn].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewMethodParameterIn].lineNumber.orNull this._name = newNode.asInstanceOf[NewMethodParameterIn].name this._order = newNode.asInstanceOf[NewMethodParameterIn].order this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala index dac7c1f82..3a50301a2 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala @@ -25,11 +25,11 @@ object MethodParameterOut { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val EvaluationStrategy = new overflowdb.PropertyKey[String]("EVALUATION_STRATEGY") val Index = new overflowdb.PropertyKey[scala.Int]("INDEX") val IsVariadic = new overflowdb.PropertyKey[Boolean]("IS_VARIADIC") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val TypeFullName = new overflowdb.PropertyKey[String]("TYPE_FULL_NAME") @@ -81,11 +81,11 @@ trait MethodParameterOutBase extends AbstractNode with AstNodeBase with CfgNodeB def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def evaluationStrategy: String def index: scala.Int def isVariadic: Boolean - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int def typeFullName: String @@ -99,15 +99,15 @@ class MethodParameterOut(graph_4762: Graph, id_4762: Long /*cf https://github.co with AstNode with CfgNode with Declaration { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def evaluationStrategy: String = get().evaluationStrategy - override def index: scala.Int = get().index - override def isVariadic: Boolean = get().isVariadic - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order - override def typeFullName: String = get().typeFullName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def evaluationStrategy: String = get().evaluationStrategy + override def index: scala.Int = get().index + override def isVariadic: Boolean = get().isVariadic + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order + override def typeFullName: String = get().typeFullName override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => MethodParameterOut.PropertyDefaults.Code @@ -288,24 +288,24 @@ class MethodParameterOutDb(ref: NodeRef[NodeDb]) override def layoutInformation: NodeLayoutInformation = MethodParameterOut.layoutInformation - private var _code: String = MethodParameterOut.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _evaluationStrategy: String = MethodParameterOut.PropertyDefaults.EvaluationStrategy - def evaluationStrategy: String = _evaluationStrategy - private var _index: Integer = MethodParameterOut.PropertyDefaults.Index - def index: scala.Int = _index - private var _isVariadic: java.lang.Boolean = MethodParameterOut.PropertyDefaults.IsVariadic - def isVariadic: Boolean = _isVariadic - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = MethodParameterOut.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = MethodParameterOut.PropertyDefaults.Order - def order: scala.Int = _order - private var _typeFullName: String = MethodParameterOut.PropertyDefaults.TypeFullName - def typeFullName: String = _typeFullName + private var _code: String = MethodParameterOut.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _evaluationStrategy: String = MethodParameterOut.PropertyDefaults.EvaluationStrategy + def evaluationStrategy: String = _evaluationStrategy + private var _index: scala.Int = MethodParameterOut.PropertyDefaults.Index + def index: scala.Int = _index + private var _isVariadic: Boolean = MethodParameterOut.PropertyDefaults.IsVariadic + def isVariadic: Boolean = _isVariadic + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = MethodParameterOut.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = MethodParameterOut.PropertyDefaults.Order + def order: scala.Int = _order + private var _typeFullName: String = MethodParameterOut.PropertyDefaults.TypeFullName + def typeFullName: String = _typeFullName /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -447,11 +447,11 @@ class MethodParameterOutDb(ref: NodeRef[NodeDb]) override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "EVALUATION_STRATEGY" => this._evaluationStrategy = value.asInstanceOf[String] case "INDEX" => this._index = value.asInstanceOf[scala.Int] case "IS_VARIADIC" => this._isVariadic = value.asInstanceOf[Boolean] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "TYPE_FULL_NAME" => this._typeFullName = value.asInstanceOf[String] @@ -471,15 +471,11 @@ class MethodParameterOutDb(ref: NodeRef[NodeDb]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewMethodParameterOut].code - this._columnNumber = newNode.asInstanceOf[NewMethodParameterOut].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMethodParameterOut].columnNumber.orNull this._evaluationStrategy = newNode.asInstanceOf[NewMethodParameterOut].evaluationStrategy this._index = newNode.asInstanceOf[NewMethodParameterOut].index this._isVariadic = newNode.asInstanceOf[NewMethodParameterOut].isVariadic - this._lineNumber = newNode.asInstanceOf[NewMethodParameterOut].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewMethodParameterOut].lineNumber.orNull this._name = newNode.asInstanceOf[NewMethodParameterOut].name this._order = newNode.asInstanceOf[NewMethodParameterOut].order this._typeFullName = newNode.asInstanceOf[NewMethodParameterOut].typeFullName diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala index 275bc9f15..3c7dbe055 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala @@ -38,9 +38,9 @@ object MethodRef { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val MethodFullName = new overflowdb.PropertyKey[String]("METHOD_FULL_NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -130,9 +130,9 @@ trait MethodRefBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def methodFullName: String def order: scala.Int def possibleTypes: IndexedSeq[String] @@ -148,9 +148,9 @@ class MethodRef(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/b override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def methodFullName: String = get().methodFullName override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -719,21 +719,21 @@ class MethodRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def layoutInformation: NodeLayoutInformation = MethodRef.layoutInformation - private var _argumentIndex: Integer = MethodRef.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = MethodRef.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = MethodRef.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _methodFullName: String = MethodRef.PropertyDefaults.MethodFullName def methodFullName: String = _methodFullName - private var _order: Integer = MethodRef.PropertyDefaults.Order + private var _order: scala.Int = MethodRef.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -1037,7 +1037,7 @@ class MethodRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -1056,7 +1056,7 @@ class MethodRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "METHOD_FULL_NAME" => this._methodFullName = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => @@ -1094,20 +1094,14 @@ class MethodRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewMethodRef].argumentIndex - this._argumentName = newNode.asInstanceOf[NewMethodRef].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewMethodRef].argumentName.orNull this._code = newNode.asInstanceOf[NewMethodRef].code - this._columnNumber = newNode.asInstanceOf[NewMethodRef].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMethodRef].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewMethodRef].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewMethodRef].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewMethodRef].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewMethodRef].lineNumber.orNull this._methodFullName = newNode.asInstanceOf[NewMethodRef].methodFullName this._order = newNode.asInstanceOf[NewMethodRef].order this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala index 0d4673118..00589a008 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala @@ -32,10 +32,10 @@ object MethodReturn { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") val EvaluationStrategy = new overflowdb.PropertyKey[String]("EVALUATION_STRATEGY") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") val TypeFullName = new overflowdb.PropertyKey[String]("TYPE_FULL_NAME") @@ -85,10 +85,10 @@ trait MethodReturnBase extends AbstractNode with CfgNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] def evaluationStrategy: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def possibleTypes: IndexedSeq[String] def typeFullName: String @@ -101,10 +101,10 @@ class MethodReturn(graph_4762: Graph, id_4762: Long /*cf https://github.com/scal with StoredNode with CfgNode { override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName override def evaluationStrategy: String = get().evaluationStrategy - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes override def typeFullName: String = get().typeFullName @@ -351,14 +351,14 @@ class MethodReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w private var _code: String = MethodReturn.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _evaluationStrategy: String = MethodReturn.PropertyDefaults.EvaluationStrategy def evaluationStrategy: String = _evaluationStrategy private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = MethodReturn.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = MethodReturn.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -526,7 +526,7 @@ class MethodReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -546,7 +546,7 @@ class MethodReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w } else collection.immutable.ArraySeq.empty } case "EVALUATION_STRATEGY" => this._evaluationStrategy = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => this._possibleTypes = value match { @@ -583,17 +583,13 @@ class MethodReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewMethodReturn].code - this._columnNumber = newNode.asInstanceOf[NewMethodReturn].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewMethodReturn].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewMethodReturn].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewMethodReturn].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty this._evaluationStrategy = newNode.asInstanceOf[NewMethodReturn].evaluationStrategy - this._lineNumber = newNode.asInstanceOf[NewMethodReturn].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewMethodReturn].lineNumber.orNull this._order = newNode.asInstanceOf[NewMethodReturn].order this._possibleTypes = if (newNode.asInstanceOf[NewMethodReturn].possibleTypes != null) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala index a80c0dc73..abd4063a6 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala @@ -20,8 +20,8 @@ object Modifier { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val ModifierType = new overflowdb.PropertyKey[String]("MODIFIER_TYPE") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -59,8 +59,8 @@ trait ModifierBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def modifierType: String def order: scala.Int @@ -71,11 +71,11 @@ class Modifier(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bu with ModifierBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def modifierType: String = get().modifierType - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def modifierType: String = get().modifierType + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => Modifier.PropertyDefaults.Code @@ -152,16 +152,16 @@ class ModifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def layoutInformation: NodeLayoutInformation = Modifier.layoutInformation - private var _code: String = Modifier.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _modifierType: String = Modifier.PropertyDefaults.ModifierType - def modifierType: String = _modifierType - private var _order: Integer = Modifier.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = Modifier.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _modifierType: String = Modifier.PropertyDefaults.ModifierType + def modifierType: String = _modifierType + private var _order: scala.Int = Modifier.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -254,8 +254,8 @@ class ModifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "MODIFIER_TYPE" => this._modifierType = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -274,12 +274,8 @@ class ModifierDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewModifier].code - this._columnNumber = newNode.asInstanceOf[NewModifier].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewModifier].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewModifier].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewModifier].lineNumber.orNull this._modifierType = newNode.asInstanceOf[NewModifier].modifierType this._order = newNode.asInstanceOf[NewModifier].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala index b15f99752..493d98619 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala @@ -20,8 +20,8 @@ object Namespace { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -59,8 +59,8 @@ trait NamespaceBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -71,11 +71,11 @@ class Namespace(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/b with NamespaceBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => Namespace.PropertyDefaults.Code @@ -136,16 +136,16 @@ class NamespaceDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def layoutInformation: NodeLayoutInformation = Namespace.layoutInformation - private var _code: String = Namespace.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = Namespace.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = Namespace.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = Namespace.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = Namespace.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = Namespace.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -220,8 +220,8 @@ class NamespaceDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -240,12 +240,8 @@ class NamespaceDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewNamespace].code - this._columnNumber = newNode.asInstanceOf[NewNamespace].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewNamespace].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewNamespace].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewNamespace].lineNumber.orNull this._name = newNode.asInstanceOf[NewNamespace].name this._order = newNode.asInstanceOf[NewNamespace].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala index e93d62b02..fbd5b2c13 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala @@ -22,10 +22,10 @@ object NamespaceBlock { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val Filename = new overflowdb.PropertyKey[String]("FILENAME") val FullName = new overflowdb.PropertyKey[String]("FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -69,10 +69,10 @@ trait NamespaceBlockBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def filename: String def fullName: String - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -83,13 +83,13 @@ class NamespaceBlock(graph_4762: Graph, id_4762: Long /*cf https://github.com/sc with NamespaceBlockBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def filename: String = get().filename - override def fullName: String = get().fullName - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def filename: String = get().filename + override def fullName: String = get().fullName + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => NamespaceBlock.PropertyDefaults.Code @@ -181,20 +181,20 @@ class NamespaceBlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override def layoutInformation: NodeLayoutInformation = NamespaceBlock.layoutInformation - private var _code: String = NamespaceBlock.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _filename: String = NamespaceBlock.PropertyDefaults.Filename - def filename: String = _filename - private var _fullName: String = NamespaceBlock.PropertyDefaults.FullName - def fullName: String = _fullName - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = NamespaceBlock.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = NamespaceBlock.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = NamespaceBlock.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _filename: String = NamespaceBlock.PropertyDefaults.Filename + def filename: String = _filename + private var _fullName: String = NamespaceBlock.PropertyDefaults.FullName + def fullName: String = _fullName + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = NamespaceBlock.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = NamespaceBlock.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -292,10 +292,10 @@ class NamespaceBlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "FILENAME" => this._filename = value.asInstanceOf[String] case "FULL_NAME" => this._fullName = value.asInstanceOf[String] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -314,14 +314,10 @@ class NamespaceBlockDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewNamespaceBlock].code - this._columnNumber = newNode.asInstanceOf[NewNamespaceBlock].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewNamespaceBlock].columnNumber.orNull this._filename = newNode.asInstanceOf[NewNamespaceBlock].filename this._fullName = newNode.asInstanceOf[NewNamespaceBlock].fullName - this._lineNumber = newNode.asInstanceOf[NewNamespaceBlock].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewNamespaceBlock].lineNumber.orNull this._name = newNode.asInstanceOf[NewNamespaceBlock].name this._order = newNode.asInstanceOf[NewNamespaceBlock].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNodes.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNodes.scala index 378c1edd6..132299b55 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNodes.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNodes.scala @@ -1256,14 +1256,14 @@ object NewAnnotation { class NewAnnotation extends NewNode with AnnotationBase with ExpressionNew { type StoredType = Annotation - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var fullName: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var fullName: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "ANNOTATION" @@ -1280,19 +1280,17 @@ class NewAnnotation extends NewNode with AnnotationBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -1300,13 +1298,11 @@ class NewAnnotation extends NewNode with AnnotationBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def fullName(value: String): this.type = { this.fullName = value @@ -1314,20 +1310,18 @@ class NewAnnotation extends NewNode with AnnotationBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -2627,13 +2621,13 @@ object NewAnnotationLiteral { class NewAnnotationLiteral extends NewNode with AnnotationLiteralBase with ExpressionNew { type StoredType = AnnotationLiteral - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "ANNOTATION_LITERAL" @@ -2649,19 +2643,17 @@ class NewAnnotationLiteral extends NewNode with AnnotationLiteralBase with Expre newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -2669,29 +2661,25 @@ class NewAnnotationLiteral extends NewNode with AnnotationLiteralBase with Expre } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -3988,10 +3976,10 @@ object NewAnnotationParameter { class NewAnnotationParameter extends NewNode with AnnotationParameterBase with AstNodeNew { type StoredType = AnnotationParameter - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "ANNOTATION_PARAMETER" @@ -4010,24 +3998,20 @@ class NewAnnotationParameter extends NewNode with AnnotationParameterBase with A } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -5315,10 +5299,10 @@ object NewAnnotationParameterAssign { class NewAnnotationParameterAssign extends NewNode with AnnotationParameterAssignBase with AstNodeNew { type StoredType = AnnotationParameterAssign - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "ANNOTATION_PARAMETER_ASSIGN" @@ -5337,24 +5321,20 @@ class NewAnnotationParameterAssign extends NewNode with AnnotationParameterAssig } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -6642,12 +6622,12 @@ object NewArrayInitializer { class NewArrayInitializer extends NewNode with ArrayInitializerBase with AstNodeNew with ExpressionNew { type StoredType = ArrayInitializer - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "ARRAY_INITIALIZER" @@ -6662,19 +6642,17 @@ class NewArrayInitializer extends NewNode with ArrayInitializerBase with AstNode newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -6682,24 +6660,20 @@ class NewArrayInitializer extends NewNode with ArrayInitializerBase with AstNode } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -8074,9 +8048,9 @@ class NewBlock extends NewNode with BlockBase with ExpressionNew { var typeFullName: String = "" var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -8097,19 +8071,17 @@ class NewBlock extends NewNode with BlockBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -8117,13 +8089,11 @@ class NewBlock extends NewNode with BlockBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -8131,15 +8101,13 @@ class NewBlock extends NewNode with BlockBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -9460,10 +9428,10 @@ class NewCall extends NewNode with CallBase with CallReprNew with ExpressionNew var order: scala.Int = -1: Int var name: String = "" var methodFullName: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty var dispatchType: String = "" - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -9488,19 +9456,17 @@ class NewCall extends NewNode with CallBase with CallReprNew with ExpressionNew newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -9508,13 +9474,11 @@ class NewCall extends NewNode with CallBase with CallReprNew with ExpressionNew } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dispatchType(value: String): this.type = { this.dispatchType = value @@ -9527,13 +9491,11 @@ class NewCall extends NewNode with CallBase with CallReprNew with ExpressionNew } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def methodFullName(value: String): this.type = { this.methodFullName = value @@ -9545,7 +9507,7 @@ class NewCall extends NewNode with CallBase with CallReprNew with ExpressionNew this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -9662,22 +9624,18 @@ class NewClosureBinding extends NewNode with ClosureBindingBase { } def closureBindingId(value: String): this.type = { - this.closureBindingId = Option(value).asInstanceOf[Option[String]] + this.closureBindingId = Option(value) this } - def closureBindingId(value: Option[String]): this.type = closureBindingId(value match { - case None => null; case Some(value) => value: String - }) + def closureBindingId(value: Option[String]): this.type = closureBindingId(value.orNull) def closureOriginalName(value: String): this.type = { - this.closureOriginalName = Option(value).asInstanceOf[Option[String]] + this.closureOriginalName = Option(value) this } - def closureOriginalName(value: Option[String]): this.type = closureOriginalName(value match { - case None => null; case Some(value) => value: String - }) + def closureOriginalName(value: Option[String]): this.type = closureOriginalName(value.orNull) def evaluationStrategy(value: String): this.type = { this.evaluationStrategy = value @@ -10964,11 +10922,11 @@ object NewComment { class NewComment extends NewNode with CommentBase with AstNodeNew { type StoredType = Comment - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var filename: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var filename: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "COMMENT" @@ -10988,13 +10946,11 @@ class NewComment extends NewNode with CommentBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def filename(value: String): this.type = { this.filename = value @@ -11002,15 +10958,13 @@ class NewComment extends NewNode with CommentBase with AstNodeNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -12369,14 +12323,14 @@ object NewControlStructure { class NewControlStructure extends NewNode with ControlStructureBase with ExpressionNew { type StoredType = ControlStructure - var parserTypeName: String = "" - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var controlStructureType: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var parserTypeName: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var controlStructureType: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "CONTROL_STRUCTURE" @@ -12393,19 +12347,17 @@ class NewControlStructure extends NewNode with ControlStructureBase with Express newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -12413,13 +12365,11 @@ class NewControlStructure extends NewNode with ControlStructureBase with Express } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def controlStructureType(value: String): this.type = { this.controlStructureType = value @@ -12427,15 +12377,13 @@ class NewControlStructure extends NewNode with ControlStructureBase with Express } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -12524,13 +12472,11 @@ class NewDependency extends NewNode with DependencyBase { } def dependencyGroupId(value: String): this.type = { - this.dependencyGroupId = Option(value).asInstanceOf[Option[String]] + this.dependencyGroupId = Option(value) this } - def dependencyGroupId(value: Option[String]): this.type = dependencyGroupId(value match { - case None => null; case Some(value) => value: String - }) + def dependencyGroupId(value: Option[String]): this.type = dependencyGroupId(value.orNull) def name(value: String): this.type = { this.name = value @@ -13822,13 +13768,13 @@ object NewFieldIdentifier { class NewFieldIdentifier extends NewNode with FieldIdentifierBase with ExpressionNew { type StoredType = FieldIdentifier - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var canonicalName: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var canonicalName: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "FIELD_IDENTIFIER" @@ -13844,19 +13790,17 @@ class NewFieldIdentifier extends NewNode with FieldIdentifierBase with Expressio newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def canonicalName(value: String): this.type = { this.canonicalName = value @@ -13869,24 +13813,20 @@ class NewFieldIdentifier extends NewNode with FieldIdentifierBase with Expressio } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -15183,13 +15123,13 @@ object NewFile { class NewFile extends NewNode with FileBase with AstNodeNew { type StoredType = File - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var hash: Option[String] = None - var content: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var hash: Option[String] = None + var content: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "FILE" @@ -15211,13 +15151,11 @@ class NewFile extends NewNode with FileBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def content(value: String): this.type = { this.content = value @@ -15225,29 +15163,25 @@ class NewFile extends NewNode with FileBase with AstNodeNew { } def hash(value: String): this.type = { - this.hash = Option(value).asInstanceOf[Option[String]] + this.hash = Option(value) this } - def hash(value: Option[String]): this.type = hash(value match { - case None => null; case Some(value) => value: String - }) + def hash(value: Option[String]): this.type = hash(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -16616,9 +16550,9 @@ class NewIdentifier extends NewNode with IdentifierBase with ExpressionNew { var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int var name: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -16640,19 +16574,17 @@ class NewIdentifier extends NewNode with IdentifierBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -16660,13 +16592,11 @@ class NewIdentifier extends NewNode with IdentifierBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -16674,20 +16604,18 @@ class NewIdentifier extends NewNode with IdentifierBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -18005,15 +17933,15 @@ object NewImport { class NewImport extends NewNode with ImportBase with AstNodeNew { type StoredType = Import - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var isWildcard: Option[Boolean] = None - var isExplicit: Option[Boolean] = None - var importedEntity: Option[String] = None - var importedAs: Option[String] = None - var explicitAs: Option[Boolean] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var isWildcard: Option[java.lang.Boolean] = None + var isExplicit: Option[java.lang.Boolean] = None + var importedEntity: Option[String] = None + var importedAs: Option[String] = None + var explicitAs: Option[java.lang.Boolean] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "IMPORT" @@ -18037,69 +17965,55 @@ class NewImport extends NewNode with ImportBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def explicitAs(value: java.lang.Boolean): this.type = { - this.explicitAs = Option(value).asInstanceOf[Option[Boolean]] + this.explicitAs = Option(value) this } - def explicitAs(value: Option[Boolean]): this.type = explicitAs(value match { - case None => null; case Some(value) => value: java.lang.Boolean - }) + def explicitAs(value: Option[java.lang.Boolean]): this.type = explicitAs(value.orNull) def importedAs(value: String): this.type = { - this.importedAs = Option(value).asInstanceOf[Option[String]] + this.importedAs = Option(value) this } - def importedAs(value: Option[String]): this.type = importedAs(value match { - case None => null; case Some(value) => value: String - }) + def importedAs(value: Option[String]): this.type = importedAs(value.orNull) def importedEntity(value: String): this.type = { - this.importedEntity = Option(value).asInstanceOf[Option[String]] + this.importedEntity = Option(value) this } - def importedEntity(value: Option[String]): this.type = importedEntity(value match { - case None => null; case Some(value) => value: String - }) + def importedEntity(value: Option[String]): this.type = importedEntity(value.orNull) def isExplicit(value: java.lang.Boolean): this.type = { - this.isExplicit = Option(value).asInstanceOf[Option[Boolean]] + this.isExplicit = Option(value) this } - def isExplicit(value: Option[Boolean]): this.type = isExplicit(value match { - case None => null; case Some(value) => value: java.lang.Boolean - }) + def isExplicit(value: Option[java.lang.Boolean]): this.type = isExplicit(value.orNull) def isWildcard(value: java.lang.Boolean): this.type = { - this.isWildcard = Option(value).asInstanceOf[Option[Boolean]] + this.isWildcard = Option(value) this } - def isWildcard(value: Option[Boolean]): this.type = isWildcard(value match { - case None => null; case Some(value) => value: java.lang.Boolean - }) + def isWildcard(value: Option[java.lang.Boolean]): this.type = isWildcard(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -19402,12 +19316,12 @@ object NewJumpLabel { class NewJumpLabel extends NewNode with JumpLabelBase with AstNodeNew { type StoredType = JumpLabel - var parserTypeName: String = "" - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var parserTypeName: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "JUMP_LABEL" @@ -19428,29 +19342,25 @@ class NewJumpLabel extends NewNode with JumpLabelBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -20749,13 +20659,13 @@ object NewJumpTarget { class NewJumpTarget extends NewNode with JumpTargetBase with AstNodeNew with CfgNodeNew { type StoredType = JumpTarget - var parserTypeName: String = "" - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentIndex: scala.Int = -1: Int + var parserTypeName: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentIndex: scala.Int = -1: Int override def label: String = "JUMP_TARGET" @@ -20771,7 +20681,7 @@ class NewJumpTarget extends NewNode with JumpTargetBase with AstNodeNew with Cfg newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } @@ -20782,29 +20692,25 @@ class NewJumpTarget extends NewNode with JumpTargetBase with AstNodeNew with Cfg } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -22177,9 +22083,9 @@ class NewLiteral extends NewNode with LiteralBase with ExpressionNew { var typeFullName: String = "" var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -22200,19 +22106,17 @@ class NewLiteral extends NewNode with LiteralBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -22220,13 +22124,11 @@ class NewLiteral extends NewNode with LiteralBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -22234,15 +22136,13 @@ class NewLiteral extends NewNode with LiteralBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -23561,9 +23461,9 @@ class NewLocal extends NewNode with LocalBase with AstNodeNew with DeclarationNe var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int var name: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var closureBindingId: Option[String] = None @@ -23584,13 +23484,11 @@ class NewLocal extends NewNode with LocalBase with AstNodeNew with DeclarationNe } def closureBindingId(value: String): this.type = { - this.closureBindingId = Option(value).asInstanceOf[Option[String]] + this.closureBindingId = Option(value) this } - def closureBindingId(value: Option[String]): this.type = closureBindingId(value match { - case None => null; case Some(value) => value: String - }) + def closureBindingId(value: Option[String]): this.type = closureBindingId(value.orNull) def code(value: String): this.type = { this.code = value @@ -23598,13 +23496,11 @@ class NewLocal extends NewNode with LocalBase with AstNodeNew with DeclarationNe } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -23612,20 +23508,18 @@ class NewLocal extends NewNode with LocalBase with AstNodeNew with DeclarationNe } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -23709,16 +23603,16 @@ object NewLocation { class NewLocation extends NewNode with LocationBase { type StoredType = Location - var node: Option[AbstractNode] = None - var symbol: String = "" - var packageName: String = "" - var nodeLabel: String = "" - var methodShortName: String = "" - var methodFullName: String = "" - var lineNumber: Option[scala.Int] = None - var filename: String = "" - var classShortName: String = "" - var className: String = "" + var node: Option[AbstractNode] = None + var symbol: String = "" + var packageName: String = "" + var nodeLabel: String = "" + var methodShortName: String = "" + var methodFullName: String = "" + var lineNumber: Option[Integer] = None + var filename: String = "" + var classShortName: String = "" + var className: String = "" override def label: String = "LOCATION" @@ -23753,13 +23647,11 @@ class NewLocation extends NewNode with LocationBase { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def methodFullName(value: String): this.type = { this.methodFullName = value @@ -23787,13 +23679,11 @@ class NewLocation extends NewNode with LocationBase { } def node(value: AbstractNode): this.type = { - this.node = Option(value).asInstanceOf[Option[AbstractNode]] + this.node = Option(value) this } - def node(value: Option[AbstractNode]): this.type = node(value match { - case None => null; case Some(value) => value: AbstractNode - }) + def node(value: Option[AbstractNode]): this.type = node(value.orNull) override def properties: Map[String, Any] = { var res = Map[String, Any]() @@ -25100,9 +24990,9 @@ class NewMember extends NewNode with MemberBase with AstNodeNew with Declaration var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int var name: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var astParentType: String = "" var astParentFullName: String = "" @@ -25140,13 +25030,11 @@ class NewMember extends NewNode with MemberBase with AstNodeNew with Declaration } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -25154,20 +25042,18 @@ class NewMember extends NewNode with MemberBase with AstNodeNew with Declaration } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -25273,13 +25159,11 @@ class NewMetaData extends NewNode with MetaDataBase { } def hash(value: String): this.type = { - this.hash = Option(value).asInstanceOf[Option[String]] + this.hash = Option(value) this } - def hash(value: Option[String]): this.type = hash(value match { - case None => null; case Some(value) => value: String - }) + def hash(value: Option[String]): this.type = hash(value.orNull) def language(value: String): this.type = { this.language = value @@ -26587,22 +26471,22 @@ object NewMethod { class NewMethod extends NewNode with MethodBase with AstNodeNew with CfgNodeNew with DeclarationNew { type StoredType = Method - var signature: String = "" - var order: scala.Int = -1: Int - var offsetEnd: Option[scala.Int] = None - var offset: Option[scala.Int] = None - var name: String = "" - var lineNumberEnd: Option[scala.Int] = None - var lineNumber: Option[scala.Int] = None - var isExternal: Boolean = false - var hash: Option[String] = None - var fullName: String = "" - var filename: String = "" - var columnNumberEnd: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var astParentType: String = "" - var astParentFullName: String = "" + var signature: String = "" + var order: scala.Int = -1: Int + var offsetEnd: Option[Integer] = None + var offset: Option[Integer] = None + var name: String = "" + var lineNumberEnd: Option[Integer] = None + var lineNumber: Option[Integer] = None + var isExternal: Boolean = false + var hash: Option[String] = None + var fullName: String = "" + var filename: String = "" + var columnNumberEnd: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var astParentType: String = "" + var astParentFullName: String = "" override def label: String = "METHOD" @@ -26643,22 +26527,18 @@ class NewMethod extends NewNode with MethodBase with AstNodeNew with CfgNodeNew } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def columnNumberEnd(value: Integer): this.type = { - this.columnNumberEnd = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumberEnd = Option(value) this } - def columnNumberEnd(value: Option[scala.Int]): this.type = columnNumberEnd(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumberEnd(value: Option[Integer]): this.type = columnNumberEnd(value.orNull) def filename(value: String): this.type = { this.filename = value @@ -26671,36 +26551,30 @@ class NewMethod extends NewNode with MethodBase with AstNodeNew with CfgNodeNew } def hash(value: String): this.type = { - this.hash = Option(value).asInstanceOf[Option[String]] + this.hash = Option(value) this } - def hash(value: Option[String]): this.type = hash(value match { - case None => null; case Some(value) => value: String - }) + def hash(value: Option[String]): this.type = hash(value.orNull) - def isExternal(value: java.lang.Boolean): this.type = { + def isExternal(value: Boolean): this.type = { this.isExternal = value this } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def lineNumberEnd(value: Integer): this.type = { - this.lineNumberEnd = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumberEnd = Option(value) this } - def lineNumberEnd(value: Option[scala.Int]): this.type = lineNumberEnd(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumberEnd(value: Option[Integer]): this.type = lineNumberEnd(value.orNull) def name(value: String): this.type = { this.name = value @@ -26708,24 +26582,20 @@ class NewMethod extends NewNode with MethodBase with AstNodeNew with CfgNodeNew } def offset(value: Integer): this.type = { - this.offset = Option(value).asInstanceOf[Option[scala.Int]] + this.offset = Option(value) this } - def offset(value: Option[scala.Int]): this.type = offset(value match { - case None => null; case Some(value) => value: Integer - }) + def offset(value: Option[Integer]): this.type = offset(value.orNull) def offsetEnd(value: Integer): this.type = { - this.offsetEnd = Option(value).asInstanceOf[Option[scala.Int]] + this.offsetEnd = Option(value) this } - def offsetEnd(value: Option[scala.Int]): this.type = offsetEnd(value match { - case None => null; case Some(value) => value: Integer - }) + def offsetEnd(value: Option[Integer]): this.type = offsetEnd(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -28063,12 +27933,12 @@ class NewMethodParameterIn var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int var name: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var isVariadic: Boolean = false var index: scala.Int = -1: Int var evaluationStrategy: String = "" var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var closureBindingId: Option[String] = None @@ -28092,13 +27962,11 @@ class NewMethodParameterIn } def closureBindingId(value: String): this.type = { - this.closureBindingId = Option(value).asInstanceOf[Option[String]] + this.closureBindingId = Option(value) this } - def closureBindingId(value: Option[String]): this.type = closureBindingId(value match { - case None => null; case Some(value) => value: String - }) + def closureBindingId(value: Option[String]): this.type = closureBindingId(value.orNull) def code(value: String): this.type = { this.code = value @@ -28106,13 +27974,11 @@ class NewMethodParameterIn } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -28124,31 +27990,29 @@ class NewMethodParameterIn this } - def index(value: Integer): this.type = { + def index(value: scala.Int): this.type = { this.index = value this } - def isVariadic(value: java.lang.Boolean): this.type = { + def isVariadic(value: Boolean): this.type = { this.isVariadic = value this } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -29477,15 +29341,15 @@ class NewMethodParameterOut with DeclarationNew { type StoredType = MethodParameterOut - var typeFullName: String = "" - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var isVariadic: Boolean = false - var index: scala.Int = -1: Int - var evaluationStrategy: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" + var typeFullName: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var isVariadic: Boolean = false + var index: scala.Int = -1: Int + var evaluationStrategy: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "METHOD_PARAMETER_OUT" @@ -29509,44 +29373,40 @@ class NewMethodParameterOut } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def evaluationStrategy(value: String): this.type = { this.evaluationStrategy = value this } - def index(value: Integer): this.type = { + def index(value: scala.Int): this.type = { this.index = value this } - def isVariadic(value: java.lang.Boolean): this.type = { + def isVariadic(value: Boolean): this.type = { this.isVariadic = value this } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -30858,9 +30718,9 @@ class NewMethodRef extends NewNode with MethodRefBase with ExpressionNew { var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int var methodFullName: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -30882,19 +30742,17 @@ class NewMethodRef extends NewNode with MethodRefBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -30902,13 +30760,11 @@ class NewMethodRef extends NewNode with MethodRefBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -30916,20 +30772,18 @@ class NewMethodRef extends NewNode with MethodRefBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def methodFullName(value: String): this.type = { this.methodFullName = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -32250,10 +32104,10 @@ class NewMethodReturn extends NewNode with MethodReturnBase with CfgNodeNew { var typeFullName: String = "" var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var evaluationStrategy: String = "" var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" override def label: String = "METHOD_RETURN" @@ -32277,13 +32131,11 @@ class NewMethodReturn extends NewNode with MethodReturnBase with CfgNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -32296,15 +32148,13 @@ class NewMethodReturn extends NewNode with MethodReturnBase with CfgNodeNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -33616,11 +33466,11 @@ object NewModifier { class NewModifier extends NewNode with ModifierBase with AstNodeNew { type StoredType = Modifier - var order: scala.Int = -1: Int - var modifierType: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var modifierType: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "MODIFIER" @@ -33640,29 +33490,25 @@ class NewModifier extends NewNode with ModifierBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def modifierType(value: String): this.type = { this.modifierType = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -34953,11 +34799,11 @@ object NewNamespace { class NewNamespace extends NewNode with NamespaceBase with AstNodeNew { type StoredType = Namespace - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "NAMESPACE" @@ -34977,29 +34823,25 @@ class NewNamespace extends NewNode with NamespaceBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -36290,13 +36132,13 @@ object NewNamespaceBlock { class NewNamespaceBlock extends NewNode with NamespaceBlockBase with AstNodeNew { type StoredType = NamespaceBlock - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var fullName: String = "" - var filename: String = "" - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var fullName: String = "" + var filename: String = "" + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "NAMESPACE_BLOCK" @@ -36318,13 +36160,11 @@ class NewNamespaceBlock extends NewNode with NamespaceBlockBase with AstNodeNew } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def filename(value: String): this.type = { this.filename = value @@ -36337,20 +36177,18 @@ class NewNamespaceBlock extends NewNode with NamespaceBlockBase with AstNodeNew } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -37647,12 +37485,12 @@ object NewReturn { class NewReturn extends NewNode with ReturnBase with ExpressionNew { type StoredType = Return - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "RETURN" @@ -37667,19 +37505,17 @@ class NewReturn extends NewNode with ReturnBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -37687,24 +37523,20 @@ class NewReturn extends NewNode with ReturnBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -39159,13 +38991,13 @@ object NewTemplateDom { class NewTemplateDom extends NewNode with TemplateDomBase with ExpressionNew { type StoredType = TemplateDom - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" - var argumentName: Option[String] = None - var argumentIndex: scala.Int = -1: Int + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" + var argumentName: Option[String] = None + var argumentIndex: scala.Int = -1: Int override def label: String = "TEMPLATE_DOM" @@ -39181,19 +39013,17 @@ class NewTemplateDom extends NewNode with TemplateDomBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -39201,29 +39031,25 @@ class NewTemplateDom extends NewNode with TemplateDomBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -40618,10 +40444,10 @@ object NewTypeArgument { class NewTypeArgument extends NewNode with TypeArgumentBase with AstNodeNew { type StoredType = TypeArgument - var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "TYPE_ARGUMENT" @@ -40640,24 +40466,20 @@ class NewTypeArgument extends NewNode with TypeArgumentBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -41946,15 +41768,15 @@ class NewTypeDecl extends NewNode with TypeDeclBase with AstNodeNew { type StoredType = TypeDecl var order: scala.Int = -1: Int - var offsetEnd: Option[scala.Int] = None - var offset: Option[scala.Int] = None + var offsetEnd: Option[Integer] = None + var offset: Option[Integer] = None var name: String = "" - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var isExternal: Boolean = false var inheritsFromTypeFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty var fullName: String = "" var filename: String = "" - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var astParentType: String = "" var astParentFullName: String = "" @@ -41982,13 +41804,11 @@ class NewTypeDecl extends NewNode with TypeDeclBase with AstNodeNew { } def aliasTypeFullName(value: String): this.type = { - this.aliasTypeFullName = Option(value).asInstanceOf[Option[String]] + this.aliasTypeFullName = Option(value) this } - def aliasTypeFullName(value: Option[String]): this.type = aliasTypeFullName(value match { - case None => null; case Some(value) => value: String - }) + def aliasTypeFullName(value: Option[String]): this.type = aliasTypeFullName(value.orNull) def astParentFullName(value: String): this.type = { this.astParentFullName = value @@ -42006,13 +41826,11 @@ class NewTypeDecl extends NewNode with TypeDeclBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def filename(value: String): this.type = { this.filename = value @@ -42029,19 +41847,17 @@ class NewTypeDecl extends NewNode with TypeDeclBase with AstNodeNew { this } - def isExternal(value: java.lang.Boolean): this.type = { + def isExternal(value: Boolean): this.type = { this.isExternal = value this } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value @@ -42049,24 +41865,20 @@ class NewTypeDecl extends NewNode with TypeDeclBase with AstNodeNew { } def offset(value: Integer): this.type = { - this.offset = Option(value).asInstanceOf[Option[scala.Int]] + this.offset = Option(value) this } - def offset(value: Option[scala.Int]): this.type = offset(value match { - case None => null; case Some(value) => value: Integer - }) + def offset(value: Option[Integer]): this.type = offset(value.orNull) def offsetEnd(value: Integer): this.type = { - this.offsetEnd = Option(value).asInstanceOf[Option[scala.Int]] + this.offsetEnd = Option(value) this } - def offsetEnd(value: Option[scala.Int]): this.type = offsetEnd(value match { - case None => null; case Some(value) => value: Integer - }) + def offsetEnd(value: Option[Integer]): this.type = offsetEnd(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -43386,11 +43198,11 @@ object NewTypeParameter { class NewTypeParameter extends NewNode with TypeParameterBase with AstNodeNew { type StoredType = TypeParameter - var order: scala.Int = -1: Int - var name: String = "" - var lineNumber: Option[scala.Int] = None - var columnNumber: Option[scala.Int] = None - var code: String = "" + var order: scala.Int = -1: Int + var name: String = "" + var lineNumber: Option[Integer] = None + var columnNumber: Option[Integer] = None + var code: String = "" override def label: String = "TYPE_PARAMETER" @@ -43410,29 +43222,25 @@ class NewTypeParameter extends NewNode with TypeParameterBase with AstNodeNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) def name(value: String): this.type = { this.name = value this } - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -44726,9 +44534,9 @@ class NewTypeRef extends NewNode with TypeRefBase with ExpressionNew { var typeFullName: String = "" var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -44749,19 +44557,17 @@ class NewTypeRef extends NewNode with TypeRefBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -44769,13 +44575,11 @@ class NewTypeRef extends NewNode with TypeRefBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def dynamicTypeHintFullName(value: IterableOnce[String]): this.type = { this.dynamicTypeHintFullName = value.iterator.to(collection.immutable.ArraySeq) @@ -44783,15 +44587,13 @@ class NewTypeRef extends NewNode with TypeRefBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } @@ -46110,10 +45912,10 @@ class NewUnknown extends NewNode with UnknownBase with ExpressionNew { var possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty var parserTypeName: String = "" var order: scala.Int = -1: Int - var lineNumber: Option[scala.Int] = None + var lineNumber: Option[Integer] = None var dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty var containedRef: String = "" - var columnNumber: Option[scala.Int] = None + var columnNumber: Option[Integer] = None var code: String = "" var argumentName: Option[String] = None var argumentIndex: scala.Int = -1: Int @@ -46136,19 +45938,17 @@ class NewUnknown extends NewNode with UnknownBase with ExpressionNew { newInstance.asInstanceOf[this.type] } - def argumentIndex(value: Integer): this.type = { + def argumentIndex(value: scala.Int): this.type = { this.argumentIndex = value this } def argumentName(value: String): this.type = { - this.argumentName = Option(value).asInstanceOf[Option[String]] + this.argumentName = Option(value) this } - def argumentName(value: Option[String]): this.type = argumentName(value match { - case None => null; case Some(value) => value: String - }) + def argumentName(value: Option[String]): this.type = argumentName(value.orNull) def code(value: String): this.type = { this.code = value @@ -46156,13 +45956,11 @@ class NewUnknown extends NewNode with UnknownBase with ExpressionNew { } def columnNumber(value: Integer): this.type = { - this.columnNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.columnNumber = Option(value) this } - def columnNumber(value: Option[scala.Int]): this.type = columnNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def columnNumber(value: Option[Integer]): this.type = columnNumber(value.orNull) def containedRef(value: String): this.type = { this.containedRef = value @@ -46175,15 +45973,13 @@ class NewUnknown extends NewNode with UnknownBase with ExpressionNew { } def lineNumber(value: Integer): this.type = { - this.lineNumber = Option(value).asInstanceOf[Option[scala.Int]] + this.lineNumber = Option(value) this } - def lineNumber(value: Option[scala.Int]): this.type = lineNumber(value match { - case None => null; case Some(value) => value: Integer - }) + def lineNumber(value: Option[Integer]): this.type = lineNumber(value.orNull) - def order(value: Integer): this.type = { + def order(value: scala.Int): this.type = { this.order = value this } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala index b85853009..9279f3e2b 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala @@ -23,8 +23,8 @@ object Return { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -82,8 +82,8 @@ trait ReturnBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -93,12 +93,12 @@ class Return(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug/ with ReturnBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => Return.PropertyDefaults.ArgumentIndex @@ -634,18 +634,18 @@ class ReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ex override def layoutInformation: NodeLayoutInformation = Return.layoutInformation - private var _argumentIndex: Integer = Return.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _code: String = Return.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Return.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = Return.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _code: String = Return.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Return.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -898,8 +898,8 @@ class ReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ex case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -917,14 +917,10 @@ class ReturnDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with Ex override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewReturn].argumentIndex - this._argumentName = newNode.asInstanceOf[NewReturn].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewReturn].argumentName.orNull this._code = newNode.asInstanceOf[NewReturn].code - this._columnNumber = newNode.asInstanceOf[NewReturn].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewReturn].lineNumber match { case None => null; case Some(value) => value } + this._columnNumber = newNode.asInstanceOf[NewReturn].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewReturn].lineNumber.orNull this._order = newNode.asInstanceOf[NewReturn].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala index fdf6bcb54..39d2bf6ee 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala @@ -24,8 +24,8 @@ object TemplateDom { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -77,8 +77,8 @@ trait TemplateDomBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -89,13 +89,13 @@ class TemplateDom(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala with TemplateDomBase with StoredNode with Expression { - override def argumentIndex: scala.Int = get().argumentIndex - override def argumentName: Option[String] = get().argumentName - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def argumentIndex: scala.Int = get().argumentIndex + override def argumentName: Option[String] = get().argumentName + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "ARGUMENT_INDEX" => TemplateDom.PropertyDefaults.ArgumentIndex @@ -205,20 +205,20 @@ class TemplateDomDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wi override def layoutInformation: NodeLayoutInformation = TemplateDom.layoutInformation - private var _argumentIndex: Integer = TemplateDom.PropertyDefaults.ArgumentIndex - def argumentIndex: scala.Int = _argumentIndex - private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] - private var _code: String = TemplateDom.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = TemplateDom.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = TemplateDom.PropertyDefaults.Order - def order: scala.Int = _order + private var _argumentIndex: scala.Int = TemplateDom.PropertyDefaults.ArgumentIndex + def argumentIndex: scala.Int = _argumentIndex + private var _argumentName: String = null + def argumentName: Option[String] = Option(_argumentName) + private var _code: String = TemplateDom.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = TemplateDom.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = TemplateDom.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -334,8 +334,8 @@ class TemplateDomDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wi case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -354,16 +354,10 @@ class TemplateDomDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wi override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewTemplateDom].argumentIndex - this._argumentName = newNode.asInstanceOf[NewTemplateDom].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewTemplateDom].argumentName.orNull this._code = newNode.asInstanceOf[NewTemplateDom].code - this._columnNumber = newNode.asInstanceOf[NewTemplateDom].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewTemplateDom].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewTemplateDom].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewTemplateDom].lineNumber.orNull this._name = newNode.asInstanceOf[NewTemplateDom].name this._order = newNode.asInstanceOf[NewTemplateDom].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala index 87d716d52..b7f49d317 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala @@ -19,8 +19,8 @@ object TypeArgument { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -59,8 +59,8 @@ trait TypeArgumentBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def order: scala.Int } @@ -70,10 +70,10 @@ class TypeArgument(graph_4762: Graph, id_4762: Long /*cf https://github.com/scal with TypeArgumentBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => TypeArgument.PropertyDefaults.Code @@ -145,14 +145,14 @@ class TypeArgumentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w override def layoutInformation: NodeLayoutInformation = TypeArgument.layoutInformation - private var _code: String = TypeArgument.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = TypeArgument.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = TypeArgument.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = TypeArgument.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -230,8 +230,8 @@ class TypeArgumentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -249,12 +249,8 @@ class TypeArgumentDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode w override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewTypeArgument].code - this._columnNumber = newNode.asInstanceOf[NewTypeArgument].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewTypeArgument].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewTypeArgument].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewTypeArgument].lineNumber.orNull this._order = newNode.asInstanceOf[NewTypeArgument].order } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala index e1c5c9ef8..d1e442e40 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala @@ -47,15 +47,15 @@ object TypeDecl { val AstParentFullName = new overflowdb.PropertyKey[String]("AST_PARENT_FULL_NAME") val AstParentType = new overflowdb.PropertyKey[String]("AST_PARENT_TYPE") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val Filename = new overflowdb.PropertyKey[String]("FILENAME") val FullName = new overflowdb.PropertyKey[String]("FULL_NAME") val InheritsFromTypeFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("INHERITS_FROM_TYPE_FULL_NAME") val IsExternal = new overflowdb.PropertyKey[Boolean]("IS_EXTERNAL") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") - val Offset = new overflowdb.PropertyKey[scala.Int]("OFFSET") - val OffsetEnd = new overflowdb.PropertyKey[scala.Int]("OFFSET_END") + val Offset = new overflowdb.PropertyKey[Integer]("OFFSET") + val OffsetEnd = new overflowdb.PropertyKey[Integer]("OFFSET_END") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") } @@ -112,15 +112,15 @@ trait TypeDeclBase extends AbstractNode with AstNodeBase { def astParentFullName: String def astParentType: String def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def filename: String def fullName: String def inheritsFromTypeFullName: IndexedSeq[String] def isExternal: Boolean - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def name: String - def offset: Option[scala.Int] - def offsetEnd: Option[scala.Int] + def offset: Option[Integer] + def offsetEnd: Option[Integer] def order: scala.Int } @@ -134,15 +134,15 @@ class TypeDecl(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bu override def astParentFullName: String = get().astParentFullName override def astParentType: String = get().astParentType override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def filename: String = get().filename override def fullName: String = get().fullName override def inheritsFromTypeFullName: IndexedSeq[String] = get().inheritsFromTypeFullName override def isExternal: Boolean = get().isExternal - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def name: String = get().name - override def offset: Option[scala.Int] = get().offset - override def offsetEnd: Option[scala.Int] = get().offsetEnd + override def offset: Option[Integer] = get().offset + override def offsetEnd: Option[Integer] = get().offsetEnd override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { @@ -323,7 +323,7 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with override def layoutInformation: NodeLayoutInformation = TypeDecl.layoutInformation private var _aliasTypeFullName: String = null - def aliasTypeFullName: Option[String] = Option(_aliasTypeFullName).asInstanceOf[Option[String]] + def aliasTypeFullName: Option[String] = Option(_aliasTypeFullName) private var _astParentFullName: String = TypeDecl.PropertyDefaults.AstParentFullName def astParentFullName: String = _astParentFullName private var _astParentType: String = TypeDecl.PropertyDefaults.AstParentType @@ -331,24 +331,24 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with private var _code: String = TypeDecl.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _filename: String = TypeDecl.PropertyDefaults.Filename def filename: String = _filename private var _fullName: String = TypeDecl.PropertyDefaults.FullName def fullName: String = _fullName private var _inheritsFromTypeFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def inheritsFromTypeFullName: IndexedSeq[String] = _inheritsFromTypeFullName - private var _isExternal: java.lang.Boolean = TypeDecl.PropertyDefaults.IsExternal + private var _isExternal: Boolean = TypeDecl.PropertyDefaults.IsExternal def isExternal: Boolean = _isExternal private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] + def lineNumber: Option[Integer] = Option(_lineNumber) private var _name: String = TypeDecl.PropertyDefaults.Name def name: String = _name private var _offset: Integer = null - def offset: Option[scala.Int] = Option(_offset).asInstanceOf[Option[scala.Int]] + def offset: Option[Integer] = Option(_offset) private var _offsetEnd: Integer = null - def offsetEnd: Option[scala.Int] = Option(_offsetEnd).asInstanceOf[Option[scala.Int]] - private var _order: Integer = TypeDecl.PropertyDefaults.Order + def offsetEnd: Option[Integer] = Option(_offsetEnd) + private var _order: scala.Int = TypeDecl.PropertyDefaults.Order def order: scala.Int = _order /** faster than the default implementation */ @@ -520,7 +520,7 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with case "AST_PARENT_FULL_NAME" => this._astParentFullName = value.asInstanceOf[String] case "AST_PARENT_TYPE" => this._astParentType = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "FILENAME" => this._filename = value.asInstanceOf[String] case "FULL_NAME" => this._fullName = value.asInstanceOf[String] case "INHERITS_FROM_TYPE_FULL_NAME" => @@ -542,10 +542,10 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with } else collection.immutable.ArraySeq.empty } case "IS_EXTERNAL" => this._isExternal = value.asInstanceOf[Boolean] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] - case "OFFSET" => this._offset = value.asInstanceOf[scala.Int] - case "OFFSET_END" => this._offsetEnd = value.asInstanceOf[scala.Int] + case "OFFSET" => this._offset = value.asInstanceOf[Integer] + case "OFFSET_END" => this._offsetEnd = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case _ => PropertyErrorRegister.logPropertyErrorIfFirst(getClass, key) @@ -562,15 +562,11 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with fromNewNode(data.asInstanceOf[NewNode], nn => mapper.apply(nn).asInstanceOf[StoredNode]) override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { - this._aliasTypeFullName = newNode.asInstanceOf[NewTypeDecl].aliasTypeFullName match { - case None => null; case Some(value) => value - } + this._aliasTypeFullName = newNode.asInstanceOf[NewTypeDecl].aliasTypeFullName.orNull this._astParentFullName = newNode.asInstanceOf[NewTypeDecl].astParentFullName this._astParentType = newNode.asInstanceOf[NewTypeDecl].astParentType this._code = newNode.asInstanceOf[NewTypeDecl].code - this._columnNumber = newNode.asInstanceOf[NewTypeDecl].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewTypeDecl].columnNumber.orNull this._filename = newNode.asInstanceOf[NewTypeDecl].filename this._fullName = newNode.asInstanceOf[NewTypeDecl].fullName this._inheritsFromTypeFullName = @@ -578,12 +574,10 @@ class TypeDeclDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with newNode.asInstanceOf[NewTypeDecl].inheritsFromTypeFullName else collection.immutable.ArraySeq.empty this._isExternal = newNode.asInstanceOf[NewTypeDecl].isExternal - this._lineNumber = newNode.asInstanceOf[NewTypeDecl].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewTypeDecl].lineNumber.orNull this._name = newNode.asInstanceOf[NewTypeDecl].name - this._offset = newNode.asInstanceOf[NewTypeDecl].offset match { case None => null; case Some(value) => value } - this._offsetEnd = newNode.asInstanceOf[NewTypeDecl].offsetEnd match { case None => null; case Some(value) => value } + this._offset = newNode.asInstanceOf[NewTypeDecl].offset.orNull + this._offsetEnd = newNode.asInstanceOf[NewTypeDecl].offsetEnd.orNull this._order = newNode.asInstanceOf[NewTypeDecl].order graph.indexManager.putIfIndexed("FULL_NAME", newNode.asInstanceOf[NewTypeDecl].fullName, this.ref) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala index 4f55bcf82..f1b903627 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala @@ -20,8 +20,8 @@ object TypeParameter { object Properties { val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Name = new overflowdb.PropertyKey[String]("NAME") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") @@ -62,8 +62,8 @@ trait TypeParameterBase extends AbstractNode with AstNodeBase { def asStored: StoredNode = this.asInstanceOf[StoredNode] def code: String - def columnNumber: Option[scala.Int] - def lineNumber: Option[scala.Int] + def columnNumber: Option[Integer] + def lineNumber: Option[Integer] def name: String def order: scala.Int @@ -74,11 +74,11 @@ class TypeParameter(graph_4762: Graph, id_4762: Long /*cf https://github.com/sca with TypeParameterBase with StoredNode with AstNode { - override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber - override def lineNumber: Option[scala.Int] = get().lineNumber - override def name: String = get().name - override def order: scala.Int = get().order + override def code: String = get().code + override def columnNumber: Option[Integer] = get().columnNumber + override def lineNumber: Option[Integer] = get().lineNumber + override def name: String = get().name + override def order: scala.Int = get().order override def propertyDefaultValue(propertyKey: String) = { propertyKey match { case "CODE" => TypeParameter.PropertyDefaults.Code @@ -150,16 +150,16 @@ class TypeParameterDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override def layoutInformation: NodeLayoutInformation = TypeParameter.layoutInformation - private var _code: String = TypeParameter.PropertyDefaults.Code - def code: String = _code - private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] - private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _name: String = TypeParameter.PropertyDefaults.Name - def name: String = _name - private var _order: Integer = TypeParameter.PropertyDefaults.Order - def order: scala.Int = _order + private var _code: String = TypeParameter.PropertyDefaults.Code + def code: String = _code + private var _columnNumber: Integer = null + def columnNumber: Option[Integer] = Option(_columnNumber) + private var _lineNumber: Integer = null + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _name: String = TypeParameter.PropertyDefaults.Name + def name: String = _name + private var _order: scala.Int = TypeParameter.PropertyDefaults.Order + def order: scala.Int = _order /** faster than the default implementation */ override def propertiesMap: java.util.Map[String, Any] = { @@ -246,8 +246,8 @@ class TypeParameterDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override protected def updateSpecificProperty(key: String, value: Object): Unit = { key match { case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "NAME" => this._name = value.asInstanceOf[String] case "ORDER" => this._order = value.asInstanceOf[scala.Int] @@ -266,12 +266,8 @@ class TypeParameterDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._code = newNode.asInstanceOf[NewTypeParameter].code - this._columnNumber = newNode.asInstanceOf[NewTypeParameter].columnNumber match { - case None => null; case Some(value) => value - } - this._lineNumber = newNode.asInstanceOf[NewTypeParameter].lineNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewTypeParameter].columnNumber.orNull + this._lineNumber = newNode.asInstanceOf[NewTypeParameter].lineNumber.orNull this._name = newNode.asInstanceOf[NewTypeParameter].name this._order = newNode.asInstanceOf[NewTypeParameter].order diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala index 3db794123..8cc9c4be3 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala @@ -36,9 +36,9 @@ object TypeRef { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") val TypeFullName = new overflowdb.PropertyKey[String]("TYPE_FULL_NAME") @@ -113,9 +113,9 @@ trait TypeRefBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def possibleTypes: IndexedSeq[String] def typeFullName: String @@ -130,9 +130,9 @@ class TypeRef(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def order: scala.Int = get().order override def possibleTypes: IndexedSeq[String] = get().possibleTypes override def typeFullName: String = get().typeFullName @@ -681,19 +681,19 @@ class TypeRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def layoutInformation: NodeLayoutInformation = TypeRef.layoutInformation - private var _argumentIndex: Integer = TypeRef.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = TypeRef.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = TypeRef.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = TypeRef.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = TypeRef.PropertyDefaults.Order def order: scala.Int = _order private var _possibleTypes: IndexedSeq[String] = collection.immutable.ArraySeq.empty def possibleTypes: IndexedSeq[String] = _possibleTypes @@ -970,7 +970,7 @@ class TypeRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { case null => collection.immutable.ArraySeq.empty @@ -989,7 +989,7 @@ class TypeRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "POSSIBLE_TYPES" => this._possibleTypes = value match { @@ -1026,20 +1026,14 @@ class TypeRefDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewTypeRef].argumentIndex - this._argumentName = newNode.asInstanceOf[NewTypeRef].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewTypeRef].argumentName.orNull this._code = newNode.asInstanceOf[NewTypeRef].code - this._columnNumber = newNode.asInstanceOf[NewTypeRef].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewTypeRef].columnNumber.orNull this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewTypeRef].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewTypeRef].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewTypeRef].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewTypeRef].lineNumber.orNull this._order = newNode.asInstanceOf[NewTypeRef].order this._possibleTypes = if (newNode.asInstanceOf[NewTypeRef].possibleTypes != null) newNode.asInstanceOf[NewTypeRef].possibleTypes diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala index ff61ce2ec..2ed25ce6b 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala @@ -40,10 +40,10 @@ object Unknown { val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX") val ArgumentName = new overflowdb.PropertyKey[String]("ARGUMENT_NAME") val Code = new overflowdb.PropertyKey[String]("CODE") - val ColumnNumber = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER") + val ColumnNumber = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER") val ContainedRef = new overflowdb.PropertyKey[String]("CONTAINED_REF") val DynamicTypeHintFullName = new overflowdb.PropertyKey[IndexedSeq[String]]("DYNAMIC_TYPE_HINT_FULL_NAME") - val LineNumber = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER") + val LineNumber = new overflowdb.PropertyKey[Integer]("LINE_NUMBER") val Order = new overflowdb.PropertyKey[scala.Int]("ORDER") val ParserTypeName = new overflowdb.PropertyKey[String]("PARSER_TYPE_NAME") val PossibleTypes = new overflowdb.PropertyKey[IndexedSeq[String]]("POSSIBLE_TYPES") @@ -121,10 +121,10 @@ trait UnknownBase extends AbstractNode with ExpressionBase { def argumentIndex: scala.Int def argumentName: Option[String] def code: String - def columnNumber: Option[scala.Int] + def columnNumber: Option[Integer] def containedRef: String def dynamicTypeHintFullName: IndexedSeq[String] - def lineNumber: Option[scala.Int] + def lineNumber: Option[Integer] def order: scala.Int def parserTypeName: String def possibleTypes: IndexedSeq[String] @@ -140,10 +140,10 @@ class Unknown(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/bug override def argumentIndex: scala.Int = get().argumentIndex override def argumentName: Option[String] = get().argumentName override def code: String = get().code - override def columnNumber: Option[scala.Int] = get().columnNumber + override def columnNumber: Option[Integer] = get().columnNumber override def containedRef: String = get().containedRef override def dynamicTypeHintFullName: IndexedSeq[String] = get().dynamicTypeHintFullName - override def lineNumber: Option[scala.Int] = get().lineNumber + override def lineNumber: Option[Integer] = get().lineNumber override def order: scala.Int = get().order override def parserTypeName: String = get().parserTypeName override def possibleTypes: IndexedSeq[String] = get().possibleTypes @@ -696,21 +696,21 @@ class UnknownDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def layoutInformation: NodeLayoutInformation = Unknown.layoutInformation - private var _argumentIndex: Integer = Unknown.PropertyDefaults.ArgumentIndex + private var _argumentIndex: scala.Int = Unknown.PropertyDefaults.ArgumentIndex def argumentIndex: scala.Int = _argumentIndex private var _argumentName: String = null - def argumentName: Option[String] = Option(_argumentName).asInstanceOf[Option[String]] + def argumentName: Option[String] = Option(_argumentName) private var _code: String = Unknown.PropertyDefaults.Code def code: String = _code private var _columnNumber: Integer = null - def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]] + def columnNumber: Option[Integer] = Option(_columnNumber) private var _containedRef: String = Unknown.PropertyDefaults.ContainedRef def containedRef: String = _containedRef private var _dynamicTypeHintFullName: IndexedSeq[String] = collection.immutable.ArraySeq.empty def dynamicTypeHintFullName: IndexedSeq[String] = _dynamicTypeHintFullName private var _lineNumber: Integer = null - def lineNumber: Option[scala.Int] = Option(_lineNumber).asInstanceOf[Option[scala.Int]] - private var _order: Integer = Unknown.PropertyDefaults.Order + def lineNumber: Option[Integer] = Option(_lineNumber) + private var _order: scala.Int = Unknown.PropertyDefaults.Order def order: scala.Int = _order private var _parserTypeName: String = Unknown.PropertyDefaults.ParserTypeName def parserTypeName: String = _parserTypeName @@ -996,7 +996,7 @@ class UnknownDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int] case "ARGUMENT_NAME" => this._argumentName = value.asInstanceOf[String] case "CODE" => this._code = value.asInstanceOf[String] - case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[scala.Int] + case "COLUMN_NUMBER" => this._columnNumber = value.asInstanceOf[Integer] case "CONTAINED_REF" => this._containedRef = value.asInstanceOf[String] case "DYNAMIC_TYPE_HINT_FULL_NAME" => this._dynamicTypeHintFullName = value match { @@ -1016,7 +1016,7 @@ class UnknownDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E collection.immutable.ArraySeq.unsafeWrapArray(iter.asInstanceOf[Iterable[String]].toArray) } else collection.immutable.ArraySeq.empty } - case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[scala.Int] + case "LINE_NUMBER" => this._lineNumber = value.asInstanceOf[Integer] case "ORDER" => this._order = value.asInstanceOf[scala.Int] case "PARSER_TYPE_NAME" => this._parserTypeName = value.asInstanceOf[String] case "POSSIBLE_TYPES" => @@ -1054,21 +1054,15 @@ class UnknownDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode with E override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = { this._argumentIndex = newNode.asInstanceOf[NewUnknown].argumentIndex - this._argumentName = newNode.asInstanceOf[NewUnknown].argumentName match { - case None => null; case Some(value) => value - } + this._argumentName = newNode.asInstanceOf[NewUnknown].argumentName.orNull this._code = newNode.asInstanceOf[NewUnknown].code - this._columnNumber = newNode.asInstanceOf[NewUnknown].columnNumber match { - case None => null; case Some(value) => value - } + this._columnNumber = newNode.asInstanceOf[NewUnknown].columnNumber.orNull this._containedRef = newNode.asInstanceOf[NewUnknown].containedRef this._dynamicTypeHintFullName = if (newNode.asInstanceOf[NewUnknown].dynamicTypeHintFullName != null) newNode.asInstanceOf[NewUnknown].dynamicTypeHintFullName else collection.immutable.ArraySeq.empty - this._lineNumber = newNode.asInstanceOf[NewUnknown].lineNumber match { - case None => null; case Some(value) => value - } + this._lineNumber = newNode.asInstanceOf[NewUnknown].lineNumber.orNull this._order = newNode.asInstanceOf[NewUnknown].order this._parserTypeName = newNode.asInstanceOf[NewUnknown].parserTypeName this._possibleTypes = diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Annotation.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Annotation.scala index 2cfbb4f8a..6a5727f67 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Annotation.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Annotation.scala @@ -166,49 +166,49 @@ class AnnotationTraversalExtGen[NodeType <: Annotation](val traversal: Iterator[ } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -270,49 +270,49 @@ class AnnotationTraversalExtGen[NodeType <: Annotation](val traversal: Iterator[ } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationLiteral.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationLiteral.scala index 347fe9101..8b511187d 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationLiteral.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationLiteral.scala @@ -167,97 +167,97 @@ class AnnotationLiteralTraversalExtGen[NodeType <: AnnotationLiteral](val traver } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameter.scala index 93b3721ed..051fe8e4f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameter.scala @@ -64,97 +64,97 @@ class AnnotationParameterTraversalExtGen[NodeType <: AnnotationParameter](val tr } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameterAssign.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameterAssign.scala index 50c4dd93f..8701d0157 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameterAssign.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AnnotationParameterAssign.scala @@ -64,97 +64,97 @@ class AnnotationParameterAssignTraversalExtGen[NodeType <: AnnotationParameterAs } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ArrayInitializer.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ArrayInitializer.scala index 2540d1710..37055738a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ArrayInitializer.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ArrayInitializer.scala @@ -166,97 +166,97 @@ class ArrayInitializerTraversalExtGen[NodeType <: ArrayInitializer](val traversa } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AstNode.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AstNode.scala index 29f9b7737..4c86830d7 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AstNode.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/AstNode.scala @@ -63,97 +63,97 @@ class AstNodeTraversalExtGen[NodeType <: AstNode](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Block.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Block.scala index 2effd04f0..fa0700aff 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Block.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Block.scala @@ -173,49 +173,49 @@ class BlockTraversalExtGen[NodeType <: Block](val traversal: Iterator[NodeType]) } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -225,49 +225,49 @@ class BlockTraversalExtGen[NodeType <: Block](val traversal: Iterator[NodeType]) traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Call.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Call.scala index 1d010bc30..e4ab539c4 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Call.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Call.scala @@ -173,49 +173,49 @@ class CallTraversalExtGen[NodeType <: Call](val traversal: Iterator[NodeType]) e } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -282,49 +282,49 @@ class CallTraversalExtGen[NodeType <: Call](val traversal: Iterator[NodeType]) e traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CallRepr.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CallRepr.scala index c1e780a3e..c8d976893 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CallRepr.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CallRepr.scala @@ -63,97 +63,97 @@ class CallReprTraversalExtGen[NodeType <: CallRepr](val traversal: Iterator[Node } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CfgNode.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CfgNode.scala index dc74cb677..76a9a32a7 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CfgNode.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/CfgNode.scala @@ -63,97 +63,97 @@ class CfgNodeTraversalExtGen[NodeType <: CfgNode](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Comment.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Comment.scala index 2a96ead7f..edd079511 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Comment.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Comment.scala @@ -68,49 +68,49 @@ class CommentTraversalExtGen[NodeType <: Comment](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -172,49 +172,49 @@ class CommentTraversalExtGen[NodeType <: Comment](val traversal: Iterator[NodeTy } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ControlStructure.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ControlStructure.scala index 645029fda..63d78576b 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ControlStructure.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/ControlStructure.scala @@ -166,49 +166,49 @@ class ControlStructureTraversalExtGen[NodeType <: ControlStructure](val traversa } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -275,49 +275,49 @@ class ControlStructureTraversalExtGen[NodeType <: ControlStructure](val traversa } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Expression.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Expression.scala index d1590e601..9299079fa 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Expression.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Expression.scala @@ -166,97 +166,97 @@ class ExpressionTraversalExtGen[NodeType <: Expression](val traversal: Iterator[ } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/FieldIdentifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/FieldIdentifier.scala index 067ca5628..0b3d3e496 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/FieldIdentifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/FieldIdentifier.scala @@ -223,97 +223,97 @@ class FieldIdentifierTraversalExtGen[NodeType <: FieldIdentifier](val traversal: } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/File.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/File.scala index 8127170e7..a6bd76bd3 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/File.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/File.scala @@ -83,49 +83,49 @@ class FileTraversalExtGen[NodeType <: File](val traversal: Iterator[NodeType]) e } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -241,49 +241,49 @@ class FileTraversalExtGen[NodeType <: File](val traversal: Iterator[NodeType]) e } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Identifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Identifier.scala index 0a251f6f8..5a02f349e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Identifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Identifier.scala @@ -166,49 +166,49 @@ class IdentifierTraversalExtGen[NodeType <: Identifier](val traversal: Iterator[ } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -218,49 +218,49 @@ class IdentifierTraversalExtGen[NodeType <: Identifier](val traversal: Iterator[ traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Import.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Import.scala index 7b0cb936b..a585f337e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Import.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Import.scala @@ -63,65 +63,65 @@ class ImportTraversalExtGen[NodeType <: Import](val traversal: Iterator[NodeType } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to explicitAs property */ - def explicitAs: Iterator[Boolean] = + def explicitAs: Iterator[java.lang.Boolean] = traversal.flatMap(_.explicitAs) /** Traverse to nodes where the explicitAs equals the given `value` */ - def explicitAs(value: Boolean): Iterator[NodeType] = + def explicitAs(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => node.explicitAs.isDefined && node.explicitAs.get == value } /** Traverse to nodes where explicitAs is not equal to the given `value`. */ - def explicitAsNot(value: Boolean): Iterator[NodeType] = + def explicitAsNot(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => !node.explicitAs.isDefined || node.explicitAs.get == value } /** Traverse to importedAs property */ @@ -235,77 +235,77 @@ class ImportTraversalExtGen[NodeType <: Import](val traversal: Iterator[NodeType } /** Traverse to isExplicit property */ - def isExplicit: Iterator[Boolean] = + def isExplicit: Iterator[java.lang.Boolean] = traversal.flatMap(_.isExplicit) /** Traverse to nodes where the isExplicit equals the given `value` */ - def isExplicit(value: Boolean): Iterator[NodeType] = + def isExplicit(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => node.isExplicit.isDefined && node.isExplicit.get == value } /** Traverse to nodes where isExplicit is not equal to the given `value`. */ - def isExplicitNot(value: Boolean): Iterator[NodeType] = + def isExplicitNot(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => !node.isExplicit.isDefined || node.isExplicit.get == value } /** Traverse to isWildcard property */ - def isWildcard: Iterator[Boolean] = + def isWildcard: Iterator[java.lang.Boolean] = traversal.flatMap(_.isWildcard) /** Traverse to nodes where the isWildcard equals the given `value` */ - def isWildcard(value: Boolean): Iterator[NodeType] = + def isWildcard(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => node.isWildcard.isDefined && node.isWildcard.get == value } /** Traverse to nodes where isWildcard is not equal to the given `value`. */ - def isWildcardNot(value: Boolean): Iterator[NodeType] = + def isWildcardNot(value: java.lang.Boolean): Iterator[NodeType] = traversal.filter { node => !node.isWildcard.isDefined || node.isWildcard.get == value } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpLabel.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpLabel.scala index 3521961cf..bb018407d 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpLabel.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpLabel.scala @@ -63,97 +63,97 @@ class JumpLabelTraversalExtGen[NodeType <: JumpLabel](val traversal: Iterator[No } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpTarget.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpTarget.scala index 275ecc314..9d1f4c917 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpTarget.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/JumpTarget.scala @@ -111,97 +111,97 @@ class JumpTargetTraversalExtGen[NodeType <: JumpTarget](val traversal: Iterator[ } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Literal.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Literal.scala index ebe981051..dfa9770ef 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Literal.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Literal.scala @@ -166,49 +166,49 @@ class LiteralTraversalExtGen[NodeType <: Literal](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -218,49 +218,49 @@ class LiteralTraversalExtGen[NodeType <: Literal](val traversal: Iterator[NodeTy traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Local.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Local.scala index f1ff83b1d..cadf4e55f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Local.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Local.scala @@ -139,49 +139,49 @@ class LocalTraversalExtGen[NodeType <: Local](val traversal: Iterator[NodeType]) } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -191,49 +191,49 @@ class LocalTraversalExtGen[NodeType <: Local](val traversal: Iterator[NodeType]) traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Location.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Location.scala index 2be96d293..5fc0333ca 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Location.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Location.scala @@ -176,49 +176,49 @@ class LocationTraversalExtGen[NodeType <: Location](val traversal: Iterator[Node } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Member.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Member.scala index 8ac4cc801..cc1e2caeb 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Member.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Member.scala @@ -195,49 +195,49 @@ class MemberTraversalExtGen[NodeType <: Member](val traversal: Iterator[NodeType } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -247,49 +247,49 @@ class MemberTraversalExtGen[NodeType <: Member](val traversal: Iterator[NodeType traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Method.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Method.scala index cffc8d5e0..34a5ef63b 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Method.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Method.scala @@ -216,97 +216,97 @@ class MethodTraversalExtGen[NodeType <: Method](val traversal: Iterator[NodeType } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to columnNumberEnd property */ - def columnNumberEnd: Iterator[scala.Int] = + def columnNumberEnd: Iterator[Integer] = traversal.flatMap(_.columnNumberEnd) /** Traverse to nodes where the columnNumberEnd equals the given `value` */ - def columnNumberEnd(value: scala.Int): Iterator[NodeType] = + def columnNumberEnd(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumberEnd.isDefined && node.columnNumberEnd.get == value } /** Traverse to nodes where the columnNumberEnd equals at least one of the given `values` */ - def columnNumberEnd(values: scala.Int*): Iterator[NodeType] = { + def columnNumberEnd(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumberEnd.isDefined && vset.contains(node.columnNumberEnd.get) } } /** Traverse to nodes where the columnNumberEnd is greater than the given `value` */ - def columnNumberEndGt(value: scala.Int): Iterator[NodeType] = + def columnNumberEndGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumberEnd.isDefined && node.columnNumberEnd.get > value } /** Traverse to nodes where the columnNumberEnd is greater than or equal the given `value` */ - def columnNumberEndGte(value: scala.Int): Iterator[NodeType] = + def columnNumberEndGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumberEnd.isDefined && node.columnNumberEnd.get >= value } /** Traverse to nodes where the columnNumberEnd is less than the given `value` */ - def columnNumberEndLt(value: scala.Int): Iterator[NodeType] = + def columnNumberEndLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumberEnd.isDefined && node.columnNumberEnd.get < value } /** Traverse to nodes where the columnNumberEnd is less than or equal the given `value` */ - def columnNumberEndLte(value: scala.Int): Iterator[NodeType] = + def columnNumberEndLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumberEnd.isDefined && node.columnNumberEnd.get <= value } /** Traverse to nodes where columnNumberEnd is not equal to the given `value`. */ - def columnNumberEndNot(value: scala.Int): Iterator[NodeType] = + def columnNumberEndNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumberEnd.isDefined || node.columnNumberEnd.get != value } /** Traverse to nodes where columnNumberEnd is not equal to any of the given `values`. */ - def columnNumberEndNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberEndNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumberEnd.isDefined || !vset.contains(node.columnNumberEnd.get) } } @@ -492,97 +492,97 @@ class MethodTraversalExtGen[NodeType <: Method](val traversal: Iterator[NodeType traversal.filter { _.isExternal != value } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } /** Traverse to lineNumberEnd property */ - def lineNumberEnd: Iterator[scala.Int] = + def lineNumberEnd: Iterator[Integer] = traversal.flatMap(_.lineNumberEnd) /** Traverse to nodes where the lineNumberEnd equals the given `value` */ - def lineNumberEnd(value: scala.Int): Iterator[NodeType] = + def lineNumberEnd(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumberEnd.isDefined && node.lineNumberEnd.get == value } /** Traverse to nodes where the lineNumberEnd equals at least one of the given `values` */ - def lineNumberEnd(values: scala.Int*): Iterator[NodeType] = { + def lineNumberEnd(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumberEnd.isDefined && vset.contains(node.lineNumberEnd.get) } } /** Traverse to nodes where the lineNumberEnd is greater than the given `value` */ - def lineNumberEndGt(value: scala.Int): Iterator[NodeType] = + def lineNumberEndGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumberEnd.isDefined && node.lineNumberEnd.get > value } /** Traverse to nodes where the lineNumberEnd is greater than or equal the given `value` */ - def lineNumberEndGte(value: scala.Int): Iterator[NodeType] = + def lineNumberEndGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumberEnd.isDefined && node.lineNumberEnd.get >= value } /** Traverse to nodes where the lineNumberEnd is less than the given `value` */ - def lineNumberEndLt(value: scala.Int): Iterator[NodeType] = + def lineNumberEndLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumberEnd.isDefined && node.lineNumberEnd.get < value } /** Traverse to nodes where the lineNumberEnd is less than or equal the given `value` */ - def lineNumberEndLte(value: scala.Int): Iterator[NodeType] = + def lineNumberEndLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumberEnd.isDefined && node.lineNumberEnd.get <= value } /** Traverse to nodes where lineNumberEnd is not equal to the given `value`. */ - def lineNumberEndNot(value: scala.Int): Iterator[NodeType] = + def lineNumberEndNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumberEnd.isDefined || node.lineNumberEnd.get != value } /** Traverse to nodes where lineNumberEnd is not equal to any of the given `values`. */ - def lineNumberEndNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberEndNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumberEnd.isDefined || !vset.contains(node.lineNumberEnd.get) } } @@ -644,97 +644,97 @@ class MethodTraversalExtGen[NodeType <: Method](val traversal: Iterator[NodeType } /** Traverse to offset property */ - def offset: Iterator[scala.Int] = + def offset: Iterator[Integer] = traversal.flatMap(_.offset) /** Traverse to nodes where the offset equals the given `value` */ - def offset(value: scala.Int): Iterator[NodeType] = + def offset(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get == value } /** Traverse to nodes where the offset equals at least one of the given `values` */ - def offset(values: scala.Int*): Iterator[NodeType] = { + def offset(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.offset.isDefined && vset.contains(node.offset.get) } } /** Traverse to nodes where the offset is greater than the given `value` */ - def offsetGt(value: scala.Int): Iterator[NodeType] = + def offsetGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get > value } /** Traverse to nodes where the offset is greater than or equal the given `value` */ - def offsetGte(value: scala.Int): Iterator[NodeType] = + def offsetGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get >= value } /** Traverse to nodes where the offset is less than the given `value` */ - def offsetLt(value: scala.Int): Iterator[NodeType] = + def offsetLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get < value } /** Traverse to nodes where the offset is less than or equal the given `value` */ - def offsetLte(value: scala.Int): Iterator[NodeType] = + def offsetLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get <= value } /** Traverse to nodes where offset is not equal to the given `value`. */ - def offsetNot(value: scala.Int): Iterator[NodeType] = + def offsetNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.offset.isDefined || node.offset.get != value } /** Traverse to nodes where offset is not equal to any of the given `values`. */ - def offsetNot(values: scala.Int*): Iterator[NodeType] = { + def offsetNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.offset.isDefined || !vset.contains(node.offset.get) } } /** Traverse to offsetEnd property */ - def offsetEnd: Iterator[scala.Int] = + def offsetEnd: Iterator[Integer] = traversal.flatMap(_.offsetEnd) /** Traverse to nodes where the offsetEnd equals the given `value` */ - def offsetEnd(value: scala.Int): Iterator[NodeType] = + def offsetEnd(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get == value } /** Traverse to nodes where the offsetEnd equals at least one of the given `values` */ - def offsetEnd(values: scala.Int*): Iterator[NodeType] = { + def offsetEnd(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.offsetEnd.isDefined && vset.contains(node.offsetEnd.get) } } /** Traverse to nodes where the offsetEnd is greater than the given `value` */ - def offsetEndGt(value: scala.Int): Iterator[NodeType] = + def offsetEndGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get > value } /** Traverse to nodes where the offsetEnd is greater than or equal the given `value` */ - def offsetEndGte(value: scala.Int): Iterator[NodeType] = + def offsetEndGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get >= value } /** Traverse to nodes where the offsetEnd is less than the given `value` */ - def offsetEndLt(value: scala.Int): Iterator[NodeType] = + def offsetEndLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get < value } /** Traverse to nodes where the offsetEnd is less than or equal the given `value` */ - def offsetEndLte(value: scala.Int): Iterator[NodeType] = + def offsetEndLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get <= value } /** Traverse to nodes where offsetEnd is not equal to the given `value`. */ - def offsetEndNot(value: scala.Int): Iterator[NodeType] = + def offsetEndNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.offsetEnd.isDefined || node.offsetEnd.get != value } /** Traverse to nodes where offsetEnd is not equal to any of the given `values`. */ - def offsetEndNot(values: scala.Int*): Iterator[NodeType] = { + def offsetEndNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.offsetEnd.isDefined || !vset.contains(node.offsetEnd.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterIn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterIn.scala index d208f7ebd..9034675c0 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterIn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterIn.scala @@ -147,49 +147,49 @@ class MethodParameterInTraversalExtGen[NodeType <: MethodParameterIn](val traver } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -322,49 +322,49 @@ class MethodParameterInTraversalExtGen[NodeType <: MethodParameterIn](val traver traversal.filter { _.isVariadic != value } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterOut.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterOut.scala index 3cfe1180b..7a0a7369a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterOut.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodParameterOut.scala @@ -81,49 +81,49 @@ class MethodParameterOutTraversalExtGen[NodeType <: MethodParameterOut](val trav } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -252,49 +252,49 @@ class MethodParameterOutTraversalExtGen[NodeType <: MethodParameterOut](val trav traversal.filter { _.isVariadic != value } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodRef.scala index d4a4503d2..dd45372da 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodRef.scala @@ -173,49 +173,49 @@ class MethodRefTraversalExtGen[NodeType <: MethodRef](val traversal: Iterator[No } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -225,49 +225,49 @@ class MethodRefTraversalExtGen[NodeType <: MethodRef](val traversal: Iterator[No traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodReturn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodReturn.scala index a9ac1efb7..7e169c8a8 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodReturn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/MethodReturn.scala @@ -68,49 +68,49 @@ class MethodReturnTraversalExtGen[NodeType <: MethodReturn](val traversal: Itera } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -181,49 +181,49 @@ class MethodReturnTraversalExtGen[NodeType <: MethodReturn](val traversal: Itera } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Modifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Modifier.scala index dd078e944..f072f7775 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Modifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Modifier.scala @@ -63,97 +63,97 @@ class ModifierTraversalExtGen[NodeType <: Modifier](val traversal: Iterator[Node } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Namespace.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Namespace.scala index 0fabc52a6..35e8d112d 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Namespace.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Namespace.scala @@ -63,97 +63,97 @@ class NamespaceTraversalExtGen[NodeType <: Namespace](val traversal: Iterator[No } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/NamespaceBlock.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/NamespaceBlock.scala index 879e330ae..14b2abe4c 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/NamespaceBlock.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/NamespaceBlock.scala @@ -63,49 +63,49 @@ class NamespaceBlockTraversalExtGen[NodeType <: NamespaceBlock](val traversal: I } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -223,49 +223,49 @@ class NamespaceBlockTraversalExtGen[NodeType <: NamespaceBlock](val traversal: I } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Return.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Return.scala index 9b78b0f81..0bcb31073 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Return.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Return.scala @@ -166,97 +166,97 @@ class ReturnTraversalExtGen[NodeType <: Return](val traversal: Iterator[NodeType } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TemplateDom.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TemplateDom.scala index b79dc464f..1186dcda2 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TemplateDom.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TemplateDom.scala @@ -166,97 +166,97 @@ class TemplateDomTraversalExtGen[NodeType <: TemplateDom](val traversal: Iterato } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeArgument.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeArgument.scala index 741d85be4..5553045a9 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeArgument.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeArgument.scala @@ -63,97 +63,97 @@ class TypeArgumentTraversalExtGen[NodeType <: TypeArgument](val traversal: Itera } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeDecl.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeDecl.scala index c779a9cc7..72964f9d5 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeDecl.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeDecl.scala @@ -246,49 +246,49 @@ class TypeDeclTraversalExtGen[NodeType <: TypeDecl](val traversal: Iterator[Node } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -424,49 +424,49 @@ class TypeDeclTraversalExtGen[NodeType <: TypeDecl](val traversal: Iterator[Node traversal.filter { _.isExternal != value } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } @@ -528,97 +528,97 @@ class TypeDeclTraversalExtGen[NodeType <: TypeDecl](val traversal: Iterator[Node } /** Traverse to offset property */ - def offset: Iterator[scala.Int] = + def offset: Iterator[Integer] = traversal.flatMap(_.offset) /** Traverse to nodes where the offset equals the given `value` */ - def offset(value: scala.Int): Iterator[NodeType] = + def offset(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get == value } /** Traverse to nodes where the offset equals at least one of the given `values` */ - def offset(values: scala.Int*): Iterator[NodeType] = { + def offset(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.offset.isDefined && vset.contains(node.offset.get) } } /** Traverse to nodes where the offset is greater than the given `value` */ - def offsetGt(value: scala.Int): Iterator[NodeType] = + def offsetGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get > value } /** Traverse to nodes where the offset is greater than or equal the given `value` */ - def offsetGte(value: scala.Int): Iterator[NodeType] = + def offsetGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get >= value } /** Traverse to nodes where the offset is less than the given `value` */ - def offsetLt(value: scala.Int): Iterator[NodeType] = + def offsetLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get < value } /** Traverse to nodes where the offset is less than or equal the given `value` */ - def offsetLte(value: scala.Int): Iterator[NodeType] = + def offsetLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offset.isDefined && node.offset.get <= value } /** Traverse to nodes where offset is not equal to the given `value`. */ - def offsetNot(value: scala.Int): Iterator[NodeType] = + def offsetNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.offset.isDefined || node.offset.get != value } /** Traverse to nodes where offset is not equal to any of the given `values`. */ - def offsetNot(values: scala.Int*): Iterator[NodeType] = { + def offsetNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.offset.isDefined || !vset.contains(node.offset.get) } } /** Traverse to offsetEnd property */ - def offsetEnd: Iterator[scala.Int] = + def offsetEnd: Iterator[Integer] = traversal.flatMap(_.offsetEnd) /** Traverse to nodes where the offsetEnd equals the given `value` */ - def offsetEnd(value: scala.Int): Iterator[NodeType] = + def offsetEnd(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get == value } /** Traverse to nodes where the offsetEnd equals at least one of the given `values` */ - def offsetEnd(values: scala.Int*): Iterator[NodeType] = { + def offsetEnd(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.offsetEnd.isDefined && vset.contains(node.offsetEnd.get) } } /** Traverse to nodes where the offsetEnd is greater than the given `value` */ - def offsetEndGt(value: scala.Int): Iterator[NodeType] = + def offsetEndGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get > value } /** Traverse to nodes where the offsetEnd is greater than or equal the given `value` */ - def offsetEndGte(value: scala.Int): Iterator[NodeType] = + def offsetEndGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get >= value } /** Traverse to nodes where the offsetEnd is less than the given `value` */ - def offsetEndLt(value: scala.Int): Iterator[NodeType] = + def offsetEndLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get < value } /** Traverse to nodes where the offsetEnd is less than or equal the given `value` */ - def offsetEndLte(value: scala.Int): Iterator[NodeType] = + def offsetEndLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.offsetEnd.isDefined && node.offsetEnd.get <= value } /** Traverse to nodes where offsetEnd is not equal to the given `value`. */ - def offsetEndNot(value: scala.Int): Iterator[NodeType] = + def offsetEndNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.offsetEnd.isDefined || node.offsetEnd.get != value } /** Traverse to nodes where offsetEnd is not equal to any of the given `values`. */ - def offsetEndNot(values: scala.Int*): Iterator[NodeType] = { + def offsetEndNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.offsetEnd.isDefined || !vset.contains(node.offsetEnd.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeParameter.scala index b35240bcb..2f030d15e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeParameter.scala @@ -63,97 +63,97 @@ class TypeParameterTraversalExtGen[NodeType <: TypeParameter](val traversal: Ite } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeRef.scala index d5c8734a0..0bb8423e7 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/TypeRef.scala @@ -166,49 +166,49 @@ class TypeRefTraversalExtGen[NodeType <: TypeRef](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -218,49 +218,49 @@ class TypeRefTraversalExtGen[NodeType <: TypeRef](val traversal: Iterator[NodeTy traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Unknown.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Unknown.scala index 2d039fa50..3a59d7c30 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Unknown.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversal/Unknown.scala @@ -166,49 +166,49 @@ class UnknownTraversalExtGen[NodeType <: Unknown](val traversal: Iterator[NodeTy } /** Traverse to columnNumber property */ - def columnNumber: Iterator[scala.Int] = + def columnNumber: Iterator[Integer] = traversal.flatMap(_.columnNumber) /** Traverse to nodes where the columnNumber equals the given `value` */ - def columnNumber(value: scala.Int): Iterator[NodeType] = + def columnNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get == value } /** Traverse to nodes where the columnNumber equals at least one of the given `values` */ - def columnNumber(values: scala.Int*): Iterator[NodeType] = { + def columnNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.columnNumber.isDefined && vset.contains(node.columnNumber.get) } } /** Traverse to nodes where the columnNumber is greater than the given `value` */ - def columnNumberGt(value: scala.Int): Iterator[NodeType] = + def columnNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get > value } /** Traverse to nodes where the columnNumber is greater than or equal the given `value` */ - def columnNumberGte(value: scala.Int): Iterator[NodeType] = + def columnNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get >= value } /** Traverse to nodes where the columnNumber is less than the given `value` */ - def columnNumberLt(value: scala.Int): Iterator[NodeType] = + def columnNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get < value } /** Traverse to nodes where the columnNumber is less than or equal the given `value` */ - def columnNumberLte(value: scala.Int): Iterator[NodeType] = + def columnNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.columnNumber.isDefined && node.columnNumber.get <= value } /** Traverse to nodes where columnNumber is not equal to the given `value`. */ - def columnNumberNot(value: scala.Int): Iterator[NodeType] = + def columnNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.columnNumber.isDefined || node.columnNumber.get != value } /** Traverse to nodes where columnNumber is not equal to any of the given `values`. */ - def columnNumberNot(values: scala.Int*): Iterator[NodeType] = { + def columnNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.columnNumber.isDefined || !vset.contains(node.columnNumber.get) } } @@ -275,49 +275,49 @@ class UnknownTraversalExtGen[NodeType <: Unknown](val traversal: Iterator[NodeTy traversal.flatMap(_.dynamicTypeHintFullName) /** Traverse to lineNumber property */ - def lineNumber: Iterator[scala.Int] = + def lineNumber: Iterator[Integer] = traversal.flatMap(_.lineNumber) /** Traverse to nodes where the lineNumber equals the given `value` */ - def lineNumber(value: scala.Int): Iterator[NodeType] = + def lineNumber(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get == value } /** Traverse to nodes where the lineNumber equals at least one of the given `values` */ - def lineNumber(values: scala.Int*): Iterator[NodeType] = { + def lineNumber(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => node.lineNumber.isDefined && vset.contains(node.lineNumber.get) } } /** Traverse to nodes where the lineNumber is greater than the given `value` */ - def lineNumberGt(value: scala.Int): Iterator[NodeType] = + def lineNumberGt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get > value } /** Traverse to nodes where the lineNumber is greater than or equal the given `value` */ - def lineNumberGte(value: scala.Int): Iterator[NodeType] = + def lineNumberGte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get >= value } /** Traverse to nodes where the lineNumber is less than the given `value` */ - def lineNumberLt(value: scala.Int): Iterator[NodeType] = + def lineNumberLt(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get < value } /** Traverse to nodes where the lineNumber is less than or equal the given `value` */ - def lineNumberLte(value: scala.Int): Iterator[NodeType] = + def lineNumberLte(value: Integer): Iterator[NodeType] = traversal.filter { node => node.lineNumber.isDefined && node.lineNumber.get <= value } /** Traverse to nodes where lineNumber is not equal to the given `value`. */ - def lineNumberNot(value: scala.Int): Iterator[NodeType] = + def lineNumberNot(value: Integer): Iterator[NodeType] = traversal.filter { node => !node.lineNumber.isDefined || node.lineNumber.get != value } /** Traverse to nodes where lineNumber is not equal to any of the given `values`. */ - def lineNumberNot(values: scala.Int*): Iterator[NodeType] = { + def lineNumberNot(values: Integer*): Iterator[NodeType] = { val vset = values.toSet traversal.filter { node => !node.lineNumber.isDefined || !vset.contains(node.lineNumber.get) } } diff --git a/samples/pass/src/main/scala/io/shiftleft/passes/mypass/SamplePass.scala b/samples/pass/src/main/scala/io/shiftleft/passes/mypass/SamplePass.scala index b109811c7..609939a4e 100644 --- a/samples/pass/src/main/scala/io/shiftleft/passes/mypass/SamplePass.scala +++ b/samples/pass/src/main/scala/io/shiftleft/passes/mypass/SamplePass.scala @@ -1,7 +1,7 @@ package io.shiftleft.mypass import io.shiftleft.SerializedCpg -import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.Cpg import io.shiftleft.codepropertygraph.cpgloading.{CpgLoader, CpgLoaderConfig} import io.shiftleft.codepropertygraph.generated.nodes.NewFile import io.shiftleft.passes.SimpleCpgPass diff --git a/schema/build.sbt b/schema/build.sbt index 9f65eaff8..2be382556 100644 --- a/schema/build.sbt +++ b/schema/build.sbt @@ -1,7 +1,6 @@ name := "codepropertygraph-schema" -// TODO change back to io.shiftleft after official releases are fixed, this is only temporary! -libraryDependencies += "com.michaelpollmeier" %% "overflowdb-codegen" % Versions.overflowdbCodegen +libraryDependencies += "io.shiftleft" %% "overflowdb-codegen" % Versions.overflowdbCodegen lazy val generatedSrcDir = settingKey[File]("root for generated sources - we want to check those in") enablePlugins(OdbCodegenSbtPlugin)