Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implicits trait hierarchy: mix in flatgraph implicits in generated.Language trait #95

Merged
merged 1 commit into from
Nov 9, 2023
Merged

implicits trait hierarchy: mix in flatgraph implicits in generated.Language trait #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions domain-classes-generator/src/main/scala/io/joern/odb2/schemagen/DomainClassesGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,9 @@ class DomainClassesGenerator(schema: Schema) {
|trait Language
| extends accessors.ConcreteStoredConversions
| with traversals.ConcreteStoredConversions
| with neighboraccessors.Conversions {
| with neighboraccessors.Conversions
| with io.joern.odb2.traversal.Language
| with io.joern.odb2.Implicits {
| implicit def cpgToGeneratedNodeStarters(cpg: Cpg): CpgNodeStarters = CpgNodeStarters(cpg)
| }
|
Expand Down Expand Up @@ -867,7 +869,6 @@ class DomainClassesGenerator(schema: Schema) {
s"""
|package $basePackage.neighboraccessors
|
|import io.joern.odb2.traversal.Language.*
|import $basePackage.nodes
|import $basePackage.Language.*
|
Expand Down
7 changes: 6 additions & 1 deletion joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/v2/Language.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
package io.shiftleft.codepropertygraph.generated.v2

/** combining all implicits into one trait that can be mixed in further downstream */
trait Language extends accessors.ConcreteStoredConversions with traversals.ConcreteStoredConversions with neighboraccessors.Conversions {
trait Language
extends accessors.ConcreteStoredConversions
with traversals.ConcreteStoredConversions
with neighboraccessors.Conversions
with io.joern.odb2.traversal.Language
with io.joern.odb2.Implicits {
implicit def cpgToGeneratedNodeStarters(cpg: Cpg): CpgNodeStarters = CpgNodeStarters(cpg)
}

Expand Down
1 change: 0 additions & 1 deletion ...main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Annotation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...ala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/AnnotationLiteral.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...a/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/AnnotationParameter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...hiftleft/codepropertygraph/generated/v2/neighboraccessors/AnnotationParameterAssign.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...cala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/ArrayInitializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Binding.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Block.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...d/src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Call.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/CfgNode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/ClosureBinding.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Comment.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...cala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/ControlStructure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Dependency.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Expression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/FieldIdentifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...d/src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/File.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Identifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Import.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/JumpLabel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/JumpTarget.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Literal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Local.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Member.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Method.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...ala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/MethodParameterIn.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...la/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/MethodParameterOut.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/MethodRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...in/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/MethodReturn.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...c/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Modifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Namespace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion .../scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/NamespaceBlock.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Return.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...ed/src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Tag.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...ain/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/TemplateDom.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...d/src/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Type.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...in/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/TypeArgument.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...c/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/TypeDecl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...n/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/TypeParameter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/TypeRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/io/shiftleft/codepropertygraph/generated/v2/neighboraccessors/Unknown.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.shiftleft.codepropertygraph.generated.v2.neighboraccessors

import io.joern.odb2.traversal.Language.*
import io.shiftleft.codepropertygraph.generated.v2.nodes
import io.shiftleft.codepropertygraph.generated.v2.Language.*

Expand Down
Loading