Use LinkedHashMap to ensure a stable iteration order using Columns.from(…).

Closes #1196

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java

@@ -17,7 +17,6 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -70,10 +69,11 @@ public static Columns from(String... columnNames) {
 
 		Assert.notNull(columnNames, "Column names must not be null");
 
-		Map<ColumnName, Selector> columns = new HashMap<>(columnNames.length, 1);
+		Map<ColumnName, Selector> columns = new LinkedHashMap<>(columnNames.length, 1);
 
-		Arrays.stream(columnNames)
-				.forEach(columnName -> columns.put(ColumnName.from(columnName), ColumnSelector.from(columnName)));
+		for (String columnName : columnNames) {
+			columns.put(ColumnName.from(columnName), ColumnSelector.from(columnName));
+		}
 
 		return new Columns(columns);
 	}
@@ -88,9 +88,11 @@ public static Columns from(CqlIdentifier... columnNames) {
 
 		Assert.notNull(columnNames, "Column names must not be null");
 
-		Map<ColumnName, Selector> columns = new HashMap<>(columnNames.length, 1);
+		Map<ColumnName, Selector> columns = new LinkedHashMap<>(columnNames.length, 1);
 
-		Arrays.stream(columnNames).forEach(cqlId -> columns.put(ColumnName.from(cqlId), ColumnSelector.from(cqlId)));
+		for (CqlIdentifier cqlId : columnNames) {
+			columns.put(ColumnName.from(cqlId), ColumnSelector.from(cqlId));
+		}
 
 		return new Columns(columns);
 	}

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java

@@ -142,15 +142,15 @@ void usesDynamicProjection() {
 
 		String query = deriveQueryFromMethod("findDynamicallyProjectedBy", PersonProjection.class);
 
-		assertThat(query).isEqualTo("SELECT lastname,firstname FROM person");
+		assertThat(query).isEqualTo("SELECT firstname,lastname FROM person");
 	}
 
 	@Test // DATACASS-479, DATACASS-313
 	void usesProjectionQueryHiddenField() {
 
 		String query = deriveQueryFromMethod("findPersonProjectedByNickname", "foo");
 
-		assertThat(query).isEqualTo("SELECT lastname,firstname FROM person WHERE nickname='foo'");
+		assertThat(query).isEqualTo("SELECT firstname,lastname FROM person WHERE nickname='foo'");
 	}
 
 	@Test // DATACASS-357

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQueryUnitTests.java

@@ -109,7 +109,7 @@ void usesDynamicProjection() {
 
 		String query = deriveQueryFromMethod("findDynamicallyProjectedBy", PersonProjection.class);
 
-		assertThat(query).isEqualTo("SELECT lastname,firstname FROM person");
+		assertThat(query).isEqualTo("SELECT firstname,lastname FROM person");
 	}
 
 	@Test // DATACASS-146