Switch from DataAccessUtils.requiredSingleResult to `nullableSingle…

…Result`. Closes #1514
spring-projects · Aug 8, 2024 · 728a83b · 728a83b
1 parent 55286db
commit 728a83b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/...ssandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/...ssandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java
@@ -504,7 +504,7 @@ CompletableFuture<Long> doCount(Query query, Class<?> entityClass, CqlIdentifier
 
 			SingleColumnRowMapper<Long> mapper = SingleColumnRowMapper.newInstance(Long.class);
 
-			Row row = DataAccessUtils.requiredSingleResult(Streamable.of(it.currentPage()).toList());
+			Row row = DataAccessUtils.nullableSingleResult(Streamable.of(it.currentPage()).toList());
 			return mapper.mapRow(row, 0);
 		});
 

diff --git a/...ta-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/...ta-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java
@@ -846,7 +846,7 @@ private <T> List<T> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {
 	}
 
 	private <T> T doQueryForObject(Statement<?> statement, Class<T> resultType) {
-		return DataAccessUtils.requiredSingleResult(doQuery(statement, SingleColumnRowMapper.newInstance(resultType)));
+		return DataAccessUtils.nullableSingleResult(doQuery(statement, SingleColumnRowMapper.newInstance(resultType)));
 	}
 
 	private <T> Stream<T> doQueryForStream(Statement<?> statement, RowMapper<T> rowMapper) {

diff --git a/...ndra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/...ndra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java
@@ -502,7 +502,7 @@ Mono<Long> doCount(Query query, Class<?> entityClass, CqlIdentifier tableName) {
 		Mono<Long> mono = doExecuteAndFlatMap(count.build(), rs -> rs.rows() //
 				.map(it -> mapper.mapRow(it, 0)) //
 				.buffer() //
-				.map(DataAccessUtils::requiredSingleResult).next());
+				.map(DataAccessUtils::nullableSingleResult).next());
 
 		return mono.switchIfEmpty(Mono.just(0L));
 	}

diff --git a/...cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java b/...cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java
@@ -202,7 +202,7 @@ public <T> CompletableFuture<T> queryForObject(String cql, RowMapper<T> rowMappe
 
 		CompletableFuture<List<T>> results = query(cql, newAsyncResultSetExtractor(rowMapper));
 
-		return results.thenApply(DataAccessUtils::requiredSingleResult);
+		return results.thenApply(DataAccessUtils::nullableSingleResult);
 	}
 
 	@Override
@@ -290,7 +290,7 @@ public <T> CompletableFuture<T> queryForObject(Statement<?> statement, RowMapper
 
 		CompletableFuture<List<T>> results = query(statement, newAsyncResultSetExtractor(rowMapper));
 
-		return results.thenApply(DataAccessUtils::requiredSingleResult);
+		return results.thenApply(DataAccessUtils::nullableSingleResult);
 	}
 
 	@Override
@@ -518,7 +518,7 @@ public <T> CompletableFuture<T> queryForObject(String cql, RowMapper<T> rowMappe
 		CompletableFuture<List<T>> results = query(newAsyncPreparedStatementCreator(cql), newPreparedStatementBinder(args),
 				newAsyncResultSetExtractor(rowMapper));
 
-		return results.thenApply(DataAccessUtils::requiredSingleResult);
+		return results.thenApply(DataAccessUtils::nullableSingleResult);
 	}
 
 	@Override

diff --git a/...data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/...data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java
@@ -202,7 +202,7 @@ public <T> T queryForObject(String cql, Class<T> requiredType) throws DataAccess
 
 	@Override
 	public <T> T queryForObject(String cql, RowMapper<T> rowMapper) throws DataAccessException {
-		return DataAccessUtils.requiredSingleResult(query(cql, newResultSetExtractor(rowMapper)));
+		return DataAccessUtils.nullableSingleResult(query(cql, newResultSetExtractor(rowMapper)));
 	}
 
 	@Override
@@ -286,7 +286,7 @@ public <T> T queryForObject(Statement<?> statement, Class<T> requiredType) throw
 
 	@Override
 	public <T> T queryForObject(Statement<?> statement, RowMapper<T> rowMapper) throws DataAccessException {
-		return DataAccessUtils.requiredSingleResult(query(statement, newResultSetExtractor(rowMapper)));
+		return DataAccessUtils.nullableSingleResult(query(statement, newResultSetExtractor(rowMapper)));
 	}
 
 	@Override
@@ -501,7 +501,7 @@ public <T> T queryForObject(String cql, Class<T> requiredType, Object... args) t
 
 	@Override
 	public <T> T queryForObject(String cql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {
-		return DataAccessUtils.requiredSingleResult(
+		return DataAccessUtils.nullableSingleResult(
 				query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newResultSetExtractor(rowMapper, 1)));
 	}
 

diff --git a/...sandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java b/...sandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java
@@ -331,7 +331,7 @@ public <T> Flux<T> query(String cql, RowMapper<T> rowMapper) throws DataAccessEx
 
 	@Override
 	public <T> Mono<T> queryForObject(String cql, RowMapper<T> rowMapper) throws DataAccessException {
-		return query(cql, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))
+		return query(cql, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))
 				.next();
 	}
 
@@ -414,7 +414,7 @@ public <T> Flux<T> query(Statement<?> statement, RowMapper<T> rowMapper) throws
 
 	@Override
 	public <T> Mono<T> queryForObject(Statement<?> statement, RowMapper<T> rowMapper) throws DataAccessException {
-		return query(statement, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))
+		return query(statement, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))
 				.next();
 	}
 
@@ -562,7 +562,7 @@ public <T> Flux<T> query(String cql, RowMapper<T> rowMapper, Object... args) thr
 
 	@Override
 	public <T> Mono<T> queryForObject(String cql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {
-		return query(cql, rowMapper, args).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))
+		return query(cql, rowMapper, args).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))
 				.next();
 	}
 

diff --git a/...ra/src/main/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplate.java b/...ra/src/main/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplate.java
@@ -216,7 +216,7 @@ public <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> rowMapper
 		ListenableFuture<List<T>> results = query(cql, newAsyncResultSetExtractor(rowMapper));
 
 		return new ExceptionTranslatingListenableFutureAdapter<>(
-				new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());
+				new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());
 	}
 
 	@Override
@@ -304,7 +304,7 @@ public <T> ListenableFuture<T> queryForObject(Statement<?> statement, RowMapper<
 		ListenableFuture<List<T>> results = query(statement, newAsyncResultSetExtractor(rowMapper));
 
 		return new ExceptionTranslatingListenableFutureAdapter<>(
-				new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());
+				new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());
 	}
 
 	@Override
@@ -536,7 +536,7 @@ public <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> rowMapper
 				newAsyncResultSetExtractor(rowMapper));
 
 		return new ExceptionTranslatingListenableFutureAdapter<>(
-				new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());
+				new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());
 	}
 
 	@Override

diff --git a/.../src/main/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplate.java b/.../src/main/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplate.java
@@ -533,7 +533,7 @@ ListenableFuture<Long> doCount(Query query, Class<?> entityClass, CqlIdentifier
 
 			SingleColumnRowMapper<Long> mapper = SingleColumnRowMapper.newInstance(Long.class);
 
-			Row row = DataAccessUtils.requiredSingleResult(Streamable.of(it.currentPage()).toList());
+			Row row = DataAccessUtils.nullableSingleResult(Streamable.of(it.currentPage()).toList());
 			return mapper.mapRow(row, 0);
 		});