upgrade to cypher-dsl 2023.0.0 (#287)

neo4j-graphql · Jan 25, 2023 · d3912f0 · d3912f0
1 parent 76b1b81
commit d3912f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>5.2.0</version>
+            <version>5.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-cypher-dsl</artifactId>
-            <version>2022.8.1</version>
+            <version>2023.0.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/core/src/main/kotlin/org/neo4j/graphql/handler/filter/OptimizedFilterHandler.kt b/core/src/main/kotlin/org/neo4j/graphql/handler/filter/OptimizedFilterHandler.kt
@@ -74,7 +74,7 @@ class OptimizedFilterHandler(val type: GraphQLFieldsContainer, schemaConfig: Sch
             private val matchQueryWithoutWhere: OngoingReading,
             private val type: GraphQLFieldsContainer,
             private val value: Map<*, *>,
-            private val parentPassThroughWiths: Collection<Expression>,
+            private val parentPassThroughWiths: Collection<IdentifiableElement>,
             private val variables: Map<String, Any>
     ) {
 
@@ -156,7 +156,7 @@ class OptimizedFilterHandler(val type: GraphQLFieldsContainer, schemaConfig: Sch
         private fun handleQuantifierPredicates(
                 query: OrderableOngoingReadingAndWithWithoutWhere,
                 relFilter: RelationPredicate,
-                levelPassThroughWiths: LinkedHashSet<Expression>
+                levelPassThroughWiths: LinkedHashSet<IdentifiableElement>
         ): OrderableOngoingReadingAndWithWithoutWhere {
             val objectField = relFilter.value
             val nestedParsedQuery = parseFilter(objectField as Map<*, *>, relFilter.fieldDefinition.type.getInnerFieldsContainer())
@@ -227,7 +227,7 @@ class OptimizedFilterHandler(val type: GraphQLFieldsContainer, schemaConfig: Sch
         private fun createAdditionalConditions(
                 query: ParsedQuery,
                 relVariable: Node,
-                passThroughWiths: LinkedHashSet<Expression>,
+                passThroughWiths: LinkedHashSet<IdentifiableElement>,
                 filter: List<Pair<SymbolicName, AliasedExpression>>,
                 whereClauseFactory: WhereClauseFactory
         ): ConditionBuilder {
@@ -249,7 +249,7 @@ class OptimizedFilterHandler(val type: GraphQLFieldsContainer, schemaConfig: Sch
 
         private fun withClauseWithOptionalDistinct(
                 exposesWith: ExposesWith,
-                withs: Collection<Expression>,
+                withs: Collection<IdentifiableElement>,
                 useDistinct: Boolean = true) = when {
             useDistinct && withs.size == 1 -> exposesWith.withDistinct(*withs.toTypedArray())
             else -> exposesWith.with(*withs.toTypedArray())

diff --git a/core/src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt b/core/src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt
@@ -401,7 +401,7 @@ open class ProjectionBase(
     }
 
     fun cypherDirective(ctxVariable: SymbolicName, fieldDefinition: GraphQLFieldDefinition, arguments: Map<String, Any>, cypherDirective: CypherDirective, thisValue: SymbolicName?): ResultStatement {
-        val args = sortedMapOf<String, Expression>()
+        val args = sortedMapOf<String, IdentifiableElement>()
         if (thisValue != null) args["this"] = thisValue.`as`("this")
         arguments
             .filterNot { (name, _) -> SPECIAL_FIELDS.contains(name) }