Explore returning Search Results.

Closes #1573

Author: mp911de

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

@@ -20,6 +20,7 @@
 import java.util.stream.Stream;
 
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.cassandra.core.convert.CassandraConverter;
 import org.springframework.data.cassandra.core.cql.CqlOperations;
@@ -92,7 +93,7 @@ default CassandraBatchOperations batchOps() {
 	/**
 	 * The table name used for the specified class by this template.
 	 *
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the {@link CqlIdentifier}
 	 */
 	CqlIdentifier getTableName(Class<?> entityClass);
@@ -105,7 +106,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting items to a {@link List} of entities.
 	 *
 	 * @param cql must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted results
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
@@ -129,7 +130,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting item to an entity.
 	 *
 	 * @param cql must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted object or {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
@@ -154,7 +155,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting items to a {@link List} of entities.
 	 *
 	 * @param statement must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted results
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
@@ -165,7 +166,7 @@ default CassandraBatchOperations batchOps() {
 	 * query translates the effective {@link Statement#getPageSize()} to the page size.
 	 *
 	 * @param statement the CQL statement, must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted results
 	 * @throws DataAccessException if there is any problem executing the query.
 	 * @since 2.0
@@ -190,7 +191,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting item to an entity.
 	 *
 	 * @param statement must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted object or {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
@@ -204,7 +205,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting items to a {@link List} of entities.
 	 *
 	 * @param query must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted results
 	 * @throws DataAccessException if there is any problem executing the query.
 	 * @since 2.0
@@ -215,7 +216,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query with paging and convert the result set to a {@link Slice} of entities.
 	 *
 	 * @param query the query object used to create a CQL statement, must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted results
 	 * @throws DataAccessException if there is any problem executing the query.
 	 * @since 2.0
@@ -241,7 +242,7 @@ default CassandraBatchOperations batchOps() {
 	 * Execute a {@code SELECT} query and convert the resulting item to an entity.
 	 *
 	 * @param query must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted object or {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 * @since 2.0
@@ -253,7 +254,7 @@ default CassandraBatchOperations batchOps() {
 	 *
 	 * @param query must not be {@literal null}.
 	 * @param update must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
 	boolean update(Query query, Update update, Class<?> entityClass) throws DataAccessException;
@@ -262,7 +263,7 @@ default CassandraBatchOperations batchOps() {
 	 * Remove entities (rows)/columns from the table by {@link Query}.
 	 *
 	 * @param query must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
 	boolean delete(Query query, Class<?> entityClass) throws DataAccessException;
@@ -322,7 +323,7 @@ default CassandraBatchOperations batchOps() {
 	 * @param id the Id value. For single primary keys it's the plain value. For composite primary keys either the
 	 *          {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyClass} or
 	 *          {@link org.springframework.data.cassandra.core.mapping.MapId}. Must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @return the converted object or {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
@@ -407,15 +408,15 @@ default WriteResult delete(Object entity, DeleteOptions options) throws DataAcce
 	 * @param id the Id value. For single primary keys it's the plain value. For composite primary keys either the
 	 *          {@link org.springframework.data.cassandra.core.mapping.PrimaryKeyClass} or
 	 *          {@link org.springframework.data.cassandra.core.mapping.MapId}. Must not be {@literal null}.
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
 	boolean deleteById(Object id, Class<?> entityClass) throws DataAccessException;
 
 	/**
 	 * Execute a {@code TRUNCATE} query to remove all entities of a given class.
 	 *
-	 * @param entityClass The entity type must not be {@literal null}.
+	 * @param entityClass the entity type must not be {@literal null}.
 	 * @throws DataAccessException if there is any problem executing the query.
 	 */
 	void truncate(Class<?> entityClass) throws DataAccessException;

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

@@ -354,7 +354,8 @@ public <T> List<T> select(Statement<?> statement, Class<T> entityClass) {
 		Assert.notNull(statement, "Statement must not be null");
 		Assert.notNull(entityClass, "Entity type must not be null");
 
-		return doSelect(statement, entityClass, getTableName(entityClass), entityClass, QueryResultConverter.entity());
+		return doSelect(statement, entityClass, EntityQueryUtils.getTableName(statement), entityClass,
+				QueryResultConverter.entity());
 	}
 
 	<T, R> List<R> doSelect(Statement<?> statement, Class<?> entityClass, CqlIdentifier tableName, Class<T> returnType,

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

@@ -767,12 +767,11 @@ private static com.datastax.oss.driver.api.querybuilder.select.Selector getSelec
 					.stream().map(param -> {
 
 						if (param instanceof ColumnSelector s) {
-
-							return com.datastax.oss.driver.api.querybuilder.select.Selector.column(s.getExpression());
+							return com.datastax.oss.driver.api.querybuilder.select.Selector.column(s.getIdentifier());
 						}
 
 						if (param instanceof CqlIdentifier i) {
-							return com.datastax.oss.driver.api.querybuilder.select.Selector.column(i.toString());
+							return com.datastax.oss.driver.api.querybuilder.select.Selector.column(i);
 						}
 
 						return new SimpleSelector(param.toString());

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java

@@ -73,11 +73,9 @@ static Collection<Object> getConvertersToRegister() {
 
 		converters.add(VectorToFloatArrayConverter.INSTANCE);
 		converters.add(VectorToDoubleArrayConverter.INSTANCE);
-		converters.add(VectorToFloatListConverter.INSTANCE);
 
 		converters.add(FloatArrayToVectorConverter.INSTANCE);
 		converters.add(DoubleArrayToVectorConverter.INSTANCE);
-		converters.add(NumberListToVectorConverter.INSTANCE);
 
 		converters.add(VectorToCqlVectorConverter.INSTANCE);
 		converters.add(CqlVectorToVectorConverter.INSTANCE);
@@ -307,17 +305,6 @@ public CqlVector<Float> convert(float[] source) {
 		}
 	}
 
-	@ReadingConverter
-	public enum NumberListToVectorConverter implements Converter<List<Number>, CqlVector<Number>> {
-
-		INSTANCE;
-
-		@Override
-		public CqlVector<Number> convert(List<Number> source) {
-			return CqlVector.newInstance(source);
-		}
-	}
-
 	@ReadingConverter
 	public enum VectorToFloatArrayConverter implements Converter<CqlVector<Number>, float[]> {
 
@@ -348,18 +335,4 @@ public double[] convert(CqlVector<Number> source) {
 		}
 	}
 
-	@ReadingConverter
-	public enum VectorToFloatListConverter implements Converter<CqlVector<Number>, List<Float>> {
-
-		INSTANCE;
-
-		@Override
-		public List<Float> convert(CqlVector<Number> source) {
-			List<Float> values = new ArrayList<>(source.size());
-			for (int i = 0; i < source.size(); i++) {
-				values.add(source.get(i).floatValue());
-			}
-			return values;
-		}
-	}
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java

@@ -199,7 +199,7 @@ public List<Selector> getMappedSelectors(Columns columns, CassandraPersistentEnt
 
 			Field field = createPropertyField(entity, column);
 
-			columns.getSelector(column).ifPresent(selector -> {
+			columns.getSelector(column).forEach(selector -> {
 
 				List<CqlIdentifier> mappedColumnNames = getCqlIdentifier(column, field);
 
@@ -301,8 +301,12 @@ public List<CqlIdentifier> getMappedColumnNames(Columns columns, CassandraPersis
 			Field field = createPropertyField(entity, column);
 			field.getProperty().ifPresent(seen::add);
 
-			columns.getSelector(column).filter(selector -> selector instanceof ColumnSelector)
-					.ifPresent(columnSelector -> columnNames.addAll(getCqlIdentifier(column, field)));
+			columns.getSelector(column).forEach(columnSelector -> {
+
+				if (columnSelector instanceof ColumnSelector) {
+					columnNames.addAll(getCqlIdentifier(column, field));
+				}
+			});
 		}
 
 		if (columns.isEmpty()) {

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

@@ -169,7 +169,7 @@ public Optional<CqlIdentifier> getCqlIdentifier() {
 
 		@Override
 		public String toCql() {
-			return this.cqlIdentifier.toString();
+			return this.cqlIdentifier.asInternal();
 		}
 
 		@Override