GH-2498 - Apply actual parameters to the nested queries.

This fixes #2498.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

@@ -1091,7 +1091,7 @@ private NodesAndRelationshipsByIdStatementProvider createNodesAndRelationshipsBy
 				usedParameters = new HashMap<>(parameters);
 				usedParameters.putAll(statement.getParameters());
 				neo4jClient.query(renderer.render(statement))
-						.bindAll(parameters)
+						.bindAll(usedParameters)
 						.fetch()
 						.one()
 						.ifPresent(iterateAndMapNextLevel(relationshipIds, relatedNodeIds, relationshipDescription, PropertyPathWalkStep.empty()));

src/test/java/org/springframework/data/neo4j/integration/issues/gh2498/GH2498IT.java

@@ -15,11 +15,12 @@
  */
 package org.springframework.data.neo4j.integration.issues.gh2498;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.neo4j.cypherdsl.core.Condition;
@@ -59,6 +60,10 @@ void setupData(@Autowired Driver driver, @Autowired BookmarkCapture bookmarkCapt
 			session.writeTransaction(tx -> tx.run(
 							"UNWIND ['A', 'B', 'C'] AS name WITH name CREATE (n:DomainModel {id: randomUUID(), name: name})")
 					.consume());
+			session.writeTransaction(tx -> tx.run("MATCH (n:Person) DETACH DELETE n").consume());
+			session.writeTransaction(tx -> tx.run(
+							"CREATE (n:Person {name: 'a'}) -[:KNOWS] ->(m:Person {name: 'b'})")
+					.consume());
 			bookmarkCapture.seedWith(session.lastBookmark());
 		}
 	}
@@ -71,11 +76,23 @@ void cypherdslConditionExecutorShouldWorkWithAnonParameters(@Autowired DomainMod
 		Parameter<List<String>> parameters = Cypher.anonParameter(Arrays.asList("A", "C"));
 		Condition in = name.in(parameters);
 		Collection<DomainModel> result = repository.findAll(in, Cypher.sort(name).descending());
-		Assertions.assertThat(result).hasSize(2)
+		assertThat(result).hasSize(2)
 				.map(DomainModel::getName)
 				.containsExactly("C", "A");
 	}
 
+	@Test // GH-2498
+	void cypherdslConditionExecutorMustApplyParametersToNestedStatementsToo(@Autowired PersonRepository repository) {
+		Node personNode = Cypher.node("Person").named("person");
+		Property name = personNode.property("name");
+		Parameter<List<String>> param = Cypher.anonParameter(Arrays.asList("a", "b"));
+		Condition in = name.in(param);
+		Collection<Person> people = repository.findAll(in);
+		assertThat(people)
+				.extracting(Person::getName)
+				.containsExactlyInAnyOrder("a", "b");
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories

src/test/java/org/springframework/data/neo4j/integration/issues/gh2498/Know.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2011-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.neo4j.integration.issues.gh2498;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.RelationshipProperties;
+import org.springframework.data.neo4j.core.schema.TargetNode;
+
+/**
+ * @author Michael J. Simons
+ */
+@RelationshipProperties
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder(toBuilder = true)
+public class Know {
+	@Id
+	@GeneratedValue
+	Long id;
+	@TargetNode
+	Person person;
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh2498/Person.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.neo4j.integration.issues.gh2498;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Relationship;
+
+/**
+ * @author Michael J. Simons
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Node("Person")
+@Builder(toBuilder = true)
+public class Person {
+    @Id
+    @GeneratedValue
+    Long id;
+    String name;
+    @Relationship(type = "KNOW", direction = Relationship.Direction.INCOMING)
+	List<Know> knows;
+}

src/test/java/org/springframework/data/neo4j/integration/issues/gh2498/PersonRepository.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.neo4j.integration.issues.gh2498;
+
+import org.springframework.data.neo4j.repository.Neo4jRepository;
+import org.springframework.data.neo4j.repository.support.CypherdslConditionExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Michael J. Simons
+ */
+@Repository
+public interface PersonRepository extends Neo4jRepository<Person, Long>, CypherdslConditionExecutor<Person> {
+}