GH-2884 - Add test for cyclic domain.

Author: meistermeier

src/test/java/org/springframework/data/neo4j/integration/issues/IssuesIT.java

@@ -744,12 +744,21 @@ void sortByCompositeProperty(@Autowired CityModelRepository repository) {
 		Sort sort = Sort.by(Sort.Order.asc("compositeProperty.language"));
 		List<CityModel> models = repository.findAll(sort);
 
-		assertThat(models).extracting("name").containsExactlyInAnyOrder("Utrecht", "Aachen");
+		assertThat(models).extracting("name").containsExactly("Utrecht", "Aachen");
 
 		Sort sortDesc = Sort.by(Sort.Order.desc("compositeProperty.language"));
 		models = repository.findAll(sortDesc);
 
-		assertThat(models).extracting("name").containsExactlyInAnyOrder("Aachen", "Utrecht");
+		assertThat(models).extracting("name").containsExactly("Aachen", "Utrecht");
+	}
+
+
+	@Test
+	@Tag("GH-2884")
+	void sortByCompositePropertyForCyclicDomainReturn(@Autowired SkuRORepository repository) {
+		List<SkuRO> result = repository.findAll(Sort.by("composite.a"));
+
+		assertThat(result).extracting("number").containsExactly(3L, 2L, 1L, 0L);
 	}
 
 	@Test

src/test/java/org/springframework/data/neo4j/integration/issues/TestBase.java

@@ -102,8 +102,8 @@ protected final void beforeEach(@Autowired BookmarkCapture bookmarkCapture) {
 	protected static void setupGH2289(QueryRunner queryRunner) {
 		queryRunner.run("MATCH (s:SKU_RO) DETACH DELETE s").consume();
 		for (int i = 0; i < 4; ++i) {
-			queryRunner.run("CREATE (s:SKU_RO {number: $i, name: $n})",
-					Values.parameters("i", i, "n", new String(new char[]{(char) ('A' + i)}))).consume();
+			queryRunner.run("CREATE (s:SKU_RO {number: $i, name: $n, `composite.a`: $a})",
+					Values.parameters("i", i, "n", new String(new char[]{(char) ('A' + i)}), "a", 10 - i)).consume();
 		}
 	}
 

src/test/java/org/springframework/data/neo4j/integration/issues/gh2289/SkuRO.java

@@ -16,13 +16,15 @@
 package org.springframework.data.neo4j.integration.issues.gh2289;
 
 import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.neo4j.core.schema.CompositeProperty;
 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;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -48,6 +50,9 @@ public class SkuRO {
 	@Relationship(type = "RANGE_RELATION_TO", direction = Relationship.Direction.INCOMING)
 	private Set<RangeRelationRO> rangeRelationsIn = new HashSet<>();
 
+	@CompositeProperty
+	private Map<String, Integer> composite;
+
 	public SkuRO(Long number, String name) {
 		this.number = number;
 		this.name = name;
@@ -99,6 +104,14 @@ public void setRangeRelationsIn(Set<RangeRelationRO> rangeRelationsIn) {
 		this.rangeRelationsIn = rangeRelationsIn;
 	}
 
+	public Map<String, Integer> getComposite() {
+		return composite;
+	}
+
+	public void setComposite(Map<String, Integer> composite) {
+		this.composite = composite;
+	}
+
 	public boolean equals(final Object o) {
 		if (o == this) {
 			return true;