GH-2386 - Upgrade CypherDSL to 2021.2.4.

Add also a test case provided by the reporting user.

Closes #2386

Author: meistermeier

pom.xml

@@ -76,7 +76,7 @@
 		<cdi>2.0.SP1</cdi>
 		<changelist>-SNAPSHOT</changelist>
 		<checkstyle.version>8.40</checkstyle.version>
-		<cypher-dsl.version>2021.2.3</cypher-dsl.version>
+		<cypher-dsl.version>2021.2.4</cypher-dsl.version>
 		<dist.id>spring-data-neo4j</dist.id>
 		<dist.key>SDNEO4J</dist.key>
 		<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>

src/test/java/org/springframework/data/neo4j/integration/issues/gh2323/GH2323IT.java

@@ -22,6 +22,7 @@
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Session;
@@ -79,6 +80,27 @@ void listOfRelationshipPropertiesShouldBeUnwindable(@Autowired PersonService per
 		});
 	}
 
+	@RepeatedTest(20) // GH-2386
+	void dontMixRelatedNodes(@Autowired PersonRepository repository, @Autowired BookmarkCapture bookmarkCapture) {
+		String id;
+		try (Session session = neo4jConnectionSupport.getDriver().session(bookmarkCapture.createSessionConfig());
+			 Transaction transaction = session.beginTransaction();
+		) {
+			id = transaction.run("CREATE (n:Person {id:randomUUID(), name: 'Gerrit'})-[:KNOWS]->(:Language{name:'English'}) return n.id").single().get(0).asString();
+			transaction.run("MATCH (n:Person {name: 'Gerrit'}) MERGE (n)-[:MOTHER_TONGUE_IS]->(:Language{name:'German'})").consume();
+			transaction.commit();
+			bookmarkCapture.seedWith(session.lastBookmark());
+
+			Person gerrit = repository.findById(id).get();
+			List<Knows> knownLanguages = gerrit.getKnownLanguages();
+			assertThat(knownLanguages).hasSize(1);
+			assertThat(knownLanguages.get(0).getLanguage().getName()).isEqualTo("English");
+			KnowsMtEntity motherTongue = gerrit.getMotherTongue();
+			assertThat(motherTongue).isNotNull();
+			assertThat(motherTongue.getLanguage().getName()).isEqualTo("German");
+		}
+	}
+
 	@Repository
 	public interface PersonRepository extends Neo4jRepository<Person, String> {
 

src/test/java/org/springframework/data/neo4j/integration/issues/gh2323/KnowsMtEntity.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2011-2021 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.gh2323;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+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;
+
+/**
+ * another relationship property for {@link Language}
+ */
+@RelationshipProperties
+@EqualsAndHashCode
+@Data
+public class KnowsMtEntity {
+
+    @Id
+    @GeneratedValue
+	private Long id;
+
+	private String blubb;
+
+    @TargetNode
+	private Language language;
+
+}

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

@@ -21,6 +21,7 @@
 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.Property;
 import org.springframework.data.neo4j.core.schema.Relationship;
 
 /**
@@ -52,4 +53,12 @@ public String getName() {
 	public List<Knows> getKnownLanguages() {
 		return knownLanguages;
 	}
+
+	@Relationship(type = "MOTHER_TONGUE_IS", direction = Relationship.Direction.OUTGOING)
+	@Property("motherTongue")
+	private KnowsMtEntity motherTongue;
+
+	public KnowsMtEntity getMotherTongue() {
+		return motherTongue;
+	}
 }