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

Persisting literal values more conservativly #1907

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Persisting literal values more conservativly #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c25f8
Persisting literal values more conservativly
oxisto Dec 18, 2024
b5388f9
Avoid toString() call for strings
oxisto Dec 18, 2024
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
12 changes: 8 additions & 4 deletions cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/expressions/Literal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@ class Literal<T> : Expression() {

class ValueConverter : AttributeConverter<Any?, Any?> {
override fun toGraphProperty(value: Any?): Any? {
return if (value is BigInteger) {
value.toString()
} else {
value
// Neo4J only supports a limited set of primitive values natively, everything else, we need
// to convert to a string.
return when (value) {
null -> null
(value is Number && value !is BigInteger) -> value
is Boolean -> value
is String -> value
else -> value.toString()
}
}

Expand Down
3 changes: 0 additions & 3 deletions cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/persistence/Common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import de.fraunhofer.aisec.cpg.graph.Persistable
import de.fraunhofer.aisec.cpg.graph.edges.collections.EdgeCollection
import de.fraunhofer.aisec.cpg.graph.edges.collections.EdgeList
import de.fraunhofer.aisec.cpg.helpers.neo4j.NameConverter
import java.math.BigInteger
import kotlin.reflect.KClass
import kotlin.reflect.KProperty1
import kotlin.reflect.KTypeProjection
Expand Down Expand Up @@ -134,8 +133,6 @@ fun Any.convert(
properties.put(originalKey, this.name)
} else if (this is Uuid) {
properties.put(originalKey, this.toString())
} else if (this is BigInteger) {
properties.put(originalKey, this.toString())
} else {
properties.put(originalKey, this)
}
Expand Down
Loading