Support Streamable return type in AOT repositories.

Author: christophstrobl

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/aot/CassandraCodeBlocks.java

@@ -42,6 +42,7 @@
 import org.springframework.data.javapoet.TypeNames;
 import org.springframework.data.repository.aot.generate.AotQueryMethodGenerationContext;
 import org.springframework.data.repository.aot.generate.MethodReturn;
+import org.springframework.data.util.Streamable;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
 import org.springframework.javapoet.TypeName;
@@ -706,16 +707,22 @@ CodeBlock build() {
 					conversionMethod = "convertOne";
 				}
 
+				CodeBlock result = CodeBlock.of("$L($L, $T.class)", conversionMethod, execution.build(), actualReturnType);
+				if (queryMethod.getReturnType().getType().equals(Streamable.class)) {
+					result = CodeBlock.of("$T.of($L)", Streamable.class, result);
+				}
+
 				builder.addStatement(returnBuilder //
-						.optional("($T) $L($L, $T.class)", methodReturn.getTypeName(), conversionMethod, execution.build(),
-								actualReturnType) //
+						.optional("($T) $L", methodReturn.getTypeName(), result) //
 						.build());
 			} else {
 
 				CodeBlock executionBlock = execution.build();
 
 				if (query.isCount()) {
 					returnBuilder.whenPrimitiveOrBoxed(Integer.class, "(int) $L", executionBlock);
+				} else if (queryMethod.getReturnType().getType().equals(Streamable.class)) {
+					executionBlock = CodeBlock.of("$T.of($L)", Streamable.class, executionBlock);
 				}
 
 				builder.addStatement(returnBuilder.optional(executionBlock) //

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/aot/CassandraRepositoryContributorIntegrationTests.java

@@ -51,6 +51,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Vector;
 import org.springframework.data.domain.Window;
+import org.springframework.data.util.Streamable;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
@@ -196,6 +197,15 @@ void shouldApplySorting() {
 				.containsSequence("Flynn (Walter Jr.)", "Skyler", "Walter");
 	}
 
+	@Test // GH-1620
+	void shouldConvertResultToStreamable() {
+
+		assertThat(fragment.streamByLastname("White", Sort.by("firstname")))
+			.isInstanceOf(Streamable.class) //
+			.extracting(Person::getFirstname) //
+			.containsSequence("Flynn (Walter Jr.)", "Skyler", "Walter");
+	}
+
 	@Test // GH-1566
 	void shouldFindByFirstnameContains() {
 

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/aot/PersonRepository.java

@@ -41,6 +41,7 @@
 
 import com.datastax.oss.driver.api.core.DefaultConsistencyLevel;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
+import org.springframework.data.util.Streamable;
 
 /**
  * AOT repository interface for {@link Person} entities.
@@ -63,6 +64,8 @@ public interface PersonRepository extends CrudRepository<Person, String> {
 
 	List<Person> findByLastname(String lastname, Sort sort);
 
+	Streamable<Person> streamByLastname(String lastname, Sort sort);
+
 	List<Person> findByLastnameOrderByFirstnameAsc(String lastname);
 
 	Person findByFirstnameStartsWith(String prefix);