GH-2458 - Preserve ordered related node collection.

Closes #2458

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jEntityConverter.java

@@ -646,7 +646,7 @@ private Collection<Node> extractMatchingNodes(Collection<Node> allNodesInResult,
 		Predicate<Node> onlyWithMatchingLabels = n -> n.hasLabel(targetLabel);
 		return allNodesInResult.stream()
 				.filter(onlyWithMatchingLabels)
-				.collect(Collectors.toSet());
+				.collect(Collectors.toList());
 	}
 
 	private Collection<Node> extractNodes(MapAccessor allValues) {
@@ -671,7 +671,7 @@ private Collection<Relationship> extractMatchingRelationships(Collection<Relatio
 		Predicate<Relationship> onlyWithMatchingType = r -> r.type().equals(typeOfRelationship) || relationshipDescription.isDynamic();
 		return relationshipsFromResult.stream()
 				.filter(onlyWithMatchingType.and(relationshipPredicate))
-				.collect(Collectors.toSet());
+				.collect(Collectors.toList());
 	}
 
 	private Collection<Relationship> extractRelationships(MapAccessor allValues) {

src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java

@@ -149,6 +149,12 @@ interface MovieRepository extends Neo4jRepository<Movie, String> {
 		MovieWithSequelProjection findProjectionByTitleAndDescription(String title, String description);
 
 		MovieWithSequelEntity findByTitleAndDescription(String title, String description);
+
+		@Query("MATCH (m:Movie{title:'The Matrix'})<-[a:ACTED_IN]-(p:Person) WITH a,p,m order by p.name return m, collect(a), collect(p)")
+		Movie findMatrixWithSortedAscActors();
+
+		@Query("MATCH (m:Movie{title:'The Matrix'})<-[a:ACTED_IN]-(p:Person) WITH a,p,m order by p.name DESC return m, collect(a), collect(p)")
+		Movie findMatrixWithSortedDescActors();
 	}
 
 	@Test // GH-1906
@@ -457,6 +463,19 @@ void projectDirectCycleEntityReference(@Autowired MovieRepository movieRepositor
 		assertThat(secondSequel.getActors()).isNotEmpty();
 	}
 
+	@Test // GH-2458
+	void findPreservesOrderFromResultAscInRelationshipList(@Autowired MovieRepository repository) {
+		assertThat(repository.findMatrixWithSortedAscActors().getActors()).extracting("person").extracting("name")
+				.containsExactly("Carrie-Anne Moss", "Emil Eifrem", "Gloria Foster", "Hugo Weaving", "Keanu Reeves",
+						"Laurence Fishburne");
+	}
+	@Test // GH-2458
+	void findPreservesOrderFromResultDescInRelationshipList(@Autowired MovieRepository repository) {
+		assertThat(repository.findMatrixWithSortedDescActors().getActors()).extracting("person").extracting("name")
+				.containsExactly("Laurence Fishburne", "Keanu Reeves", "Hugo Weaving", "Gloria Foster", "Emil Eifrem",
+						"Carrie-Anne Moss");
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)