Switch from DataAccessUtils.requiredSingleResult to nullableSingleResult.

mp911de · mp911de · commit 728a83bc747e · 2024-08-08T14:56:16.000+02:00
Closes #1514
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java b/spring-data-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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/spring-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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java b/spring-data-cassandra/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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplate.java b/spring-data-cassandra/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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplate.java b/spring-data-cassandra/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);
 		});
 

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ private <T> List<T> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {`
`846`	`846`	`}`
`847`	`847`
`848`	`848`	`private <T> T doQueryForObject(Statement<?> statement, Class<T> resultType) {`
`849`		`- return DataAccessUtils.requiredSingleResult(doQuery(statement, SingleColumnRowMapper.newInstance(resultType)));`
	`849`	`+ return DataAccessUtils.nullableSingleResult(doQuery(statement, SingleColumnRowMapper.newInstance(resultType)));`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`private <T> Stream<T> doQueryForStream(Statement<?> statement, RowMapper<T> rowMapper) {`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ Mono<Long> doCount(Query query, Class<?> entityClass, CqlIdentifier tableName) {`
`502`	`502`	`Mono<Long> mono = doExecuteAndFlatMap(count.build(), rs -> rs.rows() //`
`503`	`503`	`.map(it -> mapper.mapRow(it, 0)) //`
`504`	`504`	`.buffer() //`
`505`		`- .map(DataAccessUtils::requiredSingleResult).next());`
	`505`	`+ .map(DataAccessUtils::nullableSingleResult).next());`
`506`	`506`
`507`	`507`	`return mono.switchIfEmpty(Mono.just(0L));`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public <T> CompletableFuture<T> queryForObject(String cql, RowMapper<T> rowMappe`
`202`	`202`
`203`	`203`	`CompletableFuture<List<T>> results = query(cql, newAsyncResultSetExtractor(rowMapper));`
`204`	`204`
`205`		`- return results.thenApply(DataAccessUtils::requiredSingleResult);`
	`205`	`+ return results.thenApply(DataAccessUtils::nullableSingleResult);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`@Override`
`@@ -290,7 +290,7 @@ public <T> CompletableFuture<T> queryForObject(Statement<?> statement, RowMapper`
`290`	`290`
`291`	`291`	`CompletableFuture<List<T>> results = query(statement, newAsyncResultSetExtractor(rowMapper));`
`292`	`292`
`293`		`- return results.thenApply(DataAccessUtils::requiredSingleResult);`
	`293`	`+ return results.thenApply(DataAccessUtils::nullableSingleResult);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`@Override`
`@@ -518,7 +518,7 @@ public <T> CompletableFuture<T> queryForObject(String cql, RowMapper<T> rowMappe`
`518`	`518`	`CompletableFuture<List<T>> results = query(newAsyncPreparedStatementCreator(cql), newPreparedStatementBinder(args),`
`519`	`519`	`newAsyncResultSetExtractor(rowMapper));`
`520`	`520`
`521`		`- return results.thenApply(DataAccessUtils::requiredSingleResult);`
	`521`	`+ return results.thenApply(DataAccessUtils::nullableSingleResult);`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public <T> T queryForObject(String cql, Class<T> requiredType) throws DataAccess`
`202`	`202`
`203`	`203`	`@Override`
`204`	`204`	`public <T> T queryForObject(String cql, RowMapper<T> rowMapper) throws DataAccessException {`
`205`		`- return DataAccessUtils.requiredSingleResult(query(cql, newResultSetExtractor(rowMapper)));`
	`205`	`+ return DataAccessUtils.nullableSingleResult(query(cql, newResultSetExtractor(rowMapper)));`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`@Override`
`@@ -286,7 +286,7 @@ public <T> T queryForObject(Statement<?> statement, Class<T> requiredType) throw`
`286`	`286`
`287`	`287`	`@Override`
`288`	`288`	`public <T> T queryForObject(Statement<?> statement, RowMapper<T> rowMapper) throws DataAccessException {`
`289`		`- return DataAccessUtils.requiredSingleResult(query(statement, newResultSetExtractor(rowMapper)));`
	`289`	`+ return DataAccessUtils.nullableSingleResult(query(statement, newResultSetExtractor(rowMapper)));`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`@Override`
`@@ -501,7 +501,7 @@ public <T> T queryForObject(String cql, Class<T> requiredType, Object... args) t`
`501`	`501`
`502`	`502`	`@Override`
`503`	`503`	`public <T> T queryForObject(String cql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {`
`504`		`- return DataAccessUtils.requiredSingleResult(`
	`504`	`+ return DataAccessUtils.nullableSingleResult(`
`505`	`505`	`query(newPreparedStatementCreator(cql), newPreparedStatementBinder(args), newResultSetExtractor(rowMapper, 1)));`
`506`	`506`	`}`
`507`	`507`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ public <T> Flux<T> query(String cql, RowMapper<T> rowMapper) throws DataAccessEx`
`331`	`331`
`332`	`332`	`@Override`
`333`	`333`	`public <T> Mono<T> queryForObject(String cql, RowMapper<T> rowMapper) throws DataAccessException {`
`334`		`- return query(cql, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))`
	`334`	`+ return query(cql, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))`
`335`	`335`	`.next();`
`336`	`336`	`}`
`337`	`337`
`@@ -414,7 +414,7 @@ public <T> Flux<T> query(Statement<?> statement, RowMapper<T> rowMapper) throws`
`414`	`414`
`415`	`415`	`@Override`
`416`	`416`	`public <T> Mono<T> queryForObject(Statement<?> statement, RowMapper<T> rowMapper) throws DataAccessException {`
`417`		`- return query(statement, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))`
	`417`	`+ return query(statement, rowMapper).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))`
`418`	`418`	`.next();`
`419`	`419`	`}`
`420`	`420`
`@@ -562,7 +562,7 @@ public <T> Flux<T> query(String cql, RowMapper<T> rowMapper, Object... args) thr`
`562`	`562`
`563`	`563`	`@Override`
`564`	`564`	`public <T> Mono<T> queryForObject(String cql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {`
`565`		`- return query(cql, rowMapper, args).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.requiredSingleResult(list)))`
	`565`	`+ return query(cql, rowMapper, args).buffer(2).flatMap(list -> Mono.just(DataAccessUtils.nullableSingleResult(list)))`
`566`	`566`	`.next();`
`567`	`567`	`}`
`568`	`568`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> rowMapper`
`216`	`216`	`ListenableFuture<List<T>> results = query(cql, newAsyncResultSetExtractor(rowMapper));`
`217`	`217`
`218`	`218`	`return new ExceptionTranslatingListenableFutureAdapter<>(`
`219`		`- new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());`
	`219`	`+ new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`@Override`
`@@ -304,7 +304,7 @@ public <T> ListenableFuture<T> queryForObject(Statement<?> statement, RowMapper<`
`304`	`304`	`ListenableFuture<List<T>> results = query(statement, newAsyncResultSetExtractor(rowMapper));`
`305`	`305`
`306`	`306`	`return new ExceptionTranslatingListenableFutureAdapter<>(`
`307`		`- new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());`
	`307`	`+ new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`@Override`
`@@ -536,7 +536,7 @@ public <T> ListenableFuture<T> queryForObject(String cql, RowMapper<T> rowMapper`
`536`	`536`	`newAsyncResultSetExtractor(rowMapper));`
`537`	`537`
`538`	`538`	`return new ExceptionTranslatingListenableFutureAdapter<>(`
`539`		`- new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());`
	`539`	`+ new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`@Override`