Update Nullable constraints.

christophstrobl · christophstrobl · commit 48a6046eb5cd · 2026-02-26T11:19:09.000+01:00
See: #1549
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupport.java
@@ -117,6 +117,7 @@ public long count() {
 			}
 	}
 
+	@SuppressWarnings("unchecked")
 	class TypedSelectSupport<T> extends TerminatingSelectResultSupport<T, T> implements TerminatingResults<T> {
 
 		private final Class<T> domainType;
@@ -142,12 +143,12 @@ class TerminatingSelectResultSupport<S, T> implements TerminatingResults<T> {
 
 		final Statement<?> statement;
 
-		final @Nullable RowMapper<T> rowMapper;
+		final RowMapper<T> rowMapper;
 
 		TerminatingSelectResultSupport(Statement<?> statement,
 				@Nullable RowMapper<T> rowMapper) {
 			this.statement = statement;
-			this.rowMapper = rowMapper;
+			this.rowMapper = rowMapper != null ? rowMapper : NoOpRowMapper.INSTANCE;
 		}
 
 		TerminatingSelectResultSupport(Statement<?> statement, Class<S> domainType,
@@ -177,7 +178,7 @@ public <R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R
 		@Override
 		public @Nullable T oneValue() {
 
-			if (this.rowMapper == null) {
+			if (ObjectUtils.nullSafeEquals(NoOpRowMapper.INSTANCE, this.rowMapper)) {
 				return (T) template.queryForResultSet(this.statement);
 			}
 
@@ -210,6 +211,18 @@ public Stream<T> stream() {
 			return template.getCqlOperations().queryForStream(this.statement, this.rowMapper);
 		}
 
+		@SuppressWarnings("rawtypes")
+		enum NoOpRowMapper implements RowMapper {
+
+			INSTANCE;
+
+
+			@Override
+			public Object mapRow(Row row, int rowNum) {
+				return row;
+			}
+		}
+
 	}
 
 	class ExecutableSelectSupport<S, T> implements ExecutableSelect<T> {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryResultConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/QueryResultConverter.java
@@ -16,6 +16,7 @@
 package org.springframework.data.cassandra.core;
 
 import com.datastax.oss.driver.api.core.cql.Row;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Converter for Cassandra query results.
@@ -31,7 +32,7 @@
  * @since 5.0
  */
 @FunctionalInterface
-public interface QueryResultConverter<T, R> {
+public interface QueryResultConverter<T, R extends @Nullable Object> {
 
 	/**
 	 * Returns a function that returns the materialized entity.
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java
@@ -279,7 +279,7 @@ default ReactiveCassandraBatchOperations update(Object entity, WriteOptions opti
 	 * @throws IllegalStateException if the batch was already executed.
 	 * @see UpdateOptions
 	 */
-	@Contract("_ -> this")
+	@Contract("_, _ -> this")
 	ReactiveCassandraBatchOperations update(Mono<? extends Iterable<?>> entities, WriteOptions options);
 
 	/**
@@ -291,7 +291,7 @@ default ReactiveCassandraBatchOperations update(Object entity, WriteOptions opti
 	 * @throws IllegalStateException if the batch was already executed.
 	 * @since 3.2.2
 	 */
-	@Contract("_ -> this")
+	@Contract("_, _ -> this")
 	default ReactiveCassandraBatchOperations delete(Object entity, WriteOptions options) {
 
 		Assert.notNull(entity, "Entity must not be null");
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java
@@ -1624,7 +1624,7 @@ public Columns computeProjection(EntityProjection<?, ?> projection,
 							Predicates.negate(CassandraPersistentProperty::hasExplicitColumnName));
 
 					for (CassandraPersistentProperty property : mapped) {
-						columns = columns.include(translator.translate(property).getColumnName());
+						columns = columns.include(translator.translate(property).getRequiredColumnName());
 					}
 				}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverters.java
@@ -105,6 +105,7 @@ public enum RowToDateConverter implements Converter<Row, Date> {
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable Date convert(Row row) {
 
 			Instant instant = row.getInstant(0);
@@ -124,6 +125,7 @@ public enum RowToInstantConverter implements Converter<Row, Instant> {
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable Instant convert(Row row) {
 			return row.getInstant(0);
 		}
@@ -140,6 +142,7 @@ public enum RowToInetAddressConverter implements Converter<Row, InetAddress> {
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable InetAddress convert(Row row) {
 			return row.getInetAddress(0);
 		}
@@ -180,6 +183,7 @@ private static final class RowToNumber<T extends Number> implements Converter<Ro
 			}
 
 			@Override
+			@SuppressWarnings("NullAway")
 			public @Nullable T convert(Row source) {
 
 				Object object = source.getObject(0);
@@ -200,6 +204,7 @@ public enum RowToStringConverter implements Converter<Row, String> {
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable String convert(Row row) {
 			return row.getString(0);
 		}
@@ -216,6 +221,7 @@ public enum RowToUuidConverter implements Converter<Row, UUID> {
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable UUID convert(Row row) {
 			return row.getUuid(0);
 		}
@@ -232,6 +238,7 @@ public enum RowToCassandraLocalDateConverter implements Converter<Row, LocalDate
 		INSTANCE;
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable LocalDate convert(Row row) {
 			return row.getLocalDate(0);
 		}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/SerializationUtils.java
@@ -113,11 +113,13 @@ private static String toString(Map<?, ?> source) {
 				s -> String.format("%s : %s", serialize(s.getKey()), serialize(s.getValue())));
 	}
 
+	@SuppressWarnings("NullAway")
 	private static String toString(Set<?> source) {
 		return iterableToDelimitedString(source, "{", "}",
 				(Converter<Object, Object>) SerializationUtils::serializeToCqlSafely);
 	}
 
+	@SuppressWarnings("NullAway")
 	private static String toString(Collection<?> source) {
 		return iterableToDelimitedString(source, "[", "]",
 				(Converter<Object, Object>) SerializationUtils::serializeToCqlSafely);
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/aot/AotQueryCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/aot/AotQueryCreator.java
@@ -74,6 +74,7 @@ public AotPlaceholderParameterAccessor(CassandraParameters parameters, List<Para
 		}
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public CassandraScrollPosition getScrollPosition() {
 			return null;
 		}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java
@@ -115,6 +115,7 @@ private CassandraQueryExecution getExecution(CassandraParameterAccessor paramete
 		return new ResultProcessingExecution(getExecutionToWrap(parameterAccessor, resultProcessing), resultProcessing);
 	}
 
+	@SuppressWarnings("NullAway")
 	private CassandraQueryExecution getExecutionToWrap(CassandraParameterAccessor parameterAccessor,
 			Converter<Object, Object> resultProcessing) {
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractReactiveCassandraQuery.java
@@ -121,6 +121,7 @@ private ReactiveCassandraQueryExecution getExecution(ReactiveCassandraParameterA
 		return new ResultProcessingExecution(getExecutionToWrap(parameterAccessor), resultProcessing);
 	}
 
+	@SuppressWarnings("NullAway")
 	private ReactiveCassandraQueryExecution getExecutionToWrap(CassandraParameterAccessor parameterAccessor) {
 
 		if (getQueryMethod().isSliceQuery()) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryCreator.java
@@ -106,6 +106,7 @@ protected QueryBuilder getQueryBuilder() {
 	}
 
 	@Override
+	@SuppressWarnings("NullAway")
 	protected Filter create(Part part, Iterator<Object> iterator) {
 
 		PersistentPropertyPath<CassandraPersistentProperty> path = getMappingContext()
@@ -122,6 +123,7 @@ protected Filter create(Part part, Iterator<Object> iterator) {
 	}
 
 	@Override
+	@SuppressWarnings("NullAway")
 	protected Filter and(Part part, @Nullable Filter base, Iterator<Object> iterator) {
 
 		if (base != null) {
@@ -158,6 +160,7 @@ protected Query complete(@Nullable Filter criteria, Sort sort) {
 		return query;
 	}
 
+	@SuppressWarnings("NullAway")
 	private Sort getVectorSort() {
 		return VectorSort.ann(getVectorProperty().toDotPath(), parameterAccessor.getVector());
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryExecution.java
@@ -176,7 +176,7 @@ public Object execute(Statement<?> statement, Class<?> type) {
 
 			Limit limit = parameterAccessor.getLimit();
 			CassandraScrollPosition scrollPosition = parameterAccessor.getScrollPosition();
-			if (limit.isLimited() || !scrollPosition.isInitial()) {
+			if (limit.isLimited() || (scrollPosition != null && !scrollPosition.isInitial())) {
 				return new WindowExecution(operations, scrollPosition, limit).execute(statement, type).getContent();
 			}
 
@@ -362,6 +362,7 @@ final class ResultProcessingConverter implements Converter<Object, Object> {
 		}
 
 		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable Object convert(@Nullable Object source) {
 
 			ReturnedType returnedType = processor.getReturnedType();
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
@@ -57,11 +57,13 @@ public ConvertingParameterAccessor(CassandraConverter converter, CassandraParame
 	}
 
 	@Override
+	@SuppressWarnings("NullAway")
 	public CassandraScrollPosition getScrollPosition() {
 		return delegate.getScrollPosition();
 	}
 
 	@Override
+	@SuppressWarnings("NullAway")
 	public ScoringFunction getScoringFunction() {
 		return delegate.getScoringFunction();
 	}
@@ -82,6 +84,7 @@ public ScoringFunction getScoringFunction() {
 	}
 
 	@Override
+	@SuppressWarnings("NullAway")
 	public Pageable getPageable() {
 		return this.delegate.getPageable();
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/QueryStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/QueryStatementCreator.java
@@ -89,6 +89,7 @@ private CassandraPersistentEntity<?> getPersistentEntity() {
 	 * @param parameterAccessor must not be {@literal null}.
 	 * @return the {@literal SELECT} {@link Statement}.
 	 */
+	@SuppressWarnings("NullAway")
 	SimpleStatement select(StatementFactory statementFactory, PartTree tree, CassandraParameterAccessor parameterAccessor,
 			ResultProcessor processor) {
 

Original file line number	Diff line number	Diff line change
`@@ -1624,7 +1624,7 @@ public Columns computeProjection(EntityProjection<?, ?> projection,`
`1624`	`1624`	`Predicates.negate(CassandraPersistentProperty::hasExplicitColumnName));`
`1625`	`1625`
`1626`	`1626`	`for (CassandraPersistentProperty property : mapped) {`
`1627`		`- columns = columns.include(translator.translate(property).getColumnName());`
	`1627`	`+ columns = columns.include(translator.translate(property).getRequiredColumnName());`
`1628`	`1628`	`}`
`1629`	`1629`	`}`
`1630`	`1630`
Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,13 @@ private static String toString(Map<?, ?> source) {`
`113`	`113`	`s -> String.format("%s : %s", serialize(s.getKey()), serialize(s.getValue())));`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ @SuppressWarnings("NullAway")`
`116`	`117`	`private static String toString(Set<?> source) {`
`117`	`118`	`return iterableToDelimitedString(source, "{", "}",`
`118`	`119`	`(Converter<Object, Object>) SerializationUtils::serializeToCqlSafely);`
`119`	`120`	`}`
`120`	`121`
	`122`	`+ @SuppressWarnings("NullAway")`
`121`	`123`	`private static String toString(Collection<?> source) {`
`122`	`124`	`return iterableToDelimitedString(source, "[", "]",`
`123`	`125`	`(Converter<Object, Object>) SerializationUtils::serializeToCqlSafely);`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public AotPlaceholderParameterAccessor(CassandraParameters parameters, List<Para`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
	`77`	`+ @SuppressWarnings("NullAway")`
`77`	`78`	`public CassandraScrollPosition getScrollPosition() {`
`78`	`79`	`return null;`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ private CassandraQueryExecution getExecution(CassandraParameterAccessor paramete`
`115`	`115`	`return new ResultProcessingExecution(getExecutionToWrap(parameterAccessor, resultProcessing), resultProcessing);`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ @SuppressWarnings("NullAway")`
`118`	`119`	`private CassandraQueryExecution getExecutionToWrap(CassandraParameterAccessor parameterAccessor,`
`119`	`120`	`Converter<Object, Object> resultProcessing) {`
`120`	`121`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ private ReactiveCassandraQueryExecution getExecution(ReactiveCassandraParameterA`
`121`	`121`	`return new ResultProcessingExecution(getExecutionToWrap(parameterAccessor), resultProcessing);`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ @SuppressWarnings("NullAway")`
`124`	`125`	`private ReactiveCassandraQueryExecution getExecutionToWrap(CassandraParameterAccessor parameterAccessor) {`
`125`	`126`
`126`	`127`	`if (getQueryMethod().isSliceQuery()) {`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ protected QueryBuilder getQueryBuilder() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
	`109`	`+ @SuppressWarnings("NullAway")`
`109`	`110`	`protected Filter create(Part part, Iterator<Object> iterator) {`
`110`	`111`
`111`	`112`	`PersistentPropertyPath<CassandraPersistentProperty> path = getMappingContext()`
`@@ -122,6 +123,7 @@ protected Filter create(Part part, Iterator<Object> iterator) {`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`@Override`
	`126`	`+ @SuppressWarnings("NullAway")`
`125`	`127`	`protected Filter and(Part part, @Nullable Filter base, Iterator<Object> iterator) {`
`126`	`128`
`127`	`129`	`if (base != null) {`
`@@ -158,6 +160,7 @@ protected Query complete(@Nullable Filter criteria, Sort sort) {`
`158`	`160`	`return query;`
`159`	`161`	`}`
`160`	`162`
	`163`	`+ @SuppressWarnings("NullAway")`
`161`	`164`	`private Sort getVectorSort() {`
`162`	`165`	`return VectorSort.ann(getVectorProperty().toDotPath(), parameterAccessor.getVector());`
`163`	`166`	`}`