Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch from DataAccessUtils.requiredSingleResult to nullableSingleResult.

Browse Source 
Closes #1514
This commit is contained in:
Mark Paluch
2024-08-08 14:56:16 +02:00
parent 55286db588
commit 728a83bc74
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java
View File

@@ -504,7 +504,7 @@ public class AsyncCassandraTemplate
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);
});

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

@@ -846,7 +846,7 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP
}
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) {

2
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java
View File

@@ -502,7 +502,7 @@ public class ReactiveCassandraTemplate
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));
}

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java
View File

@@ -202,7 +202,7 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
CompletableFuture<List<T>> results = query(cql, newAsyncResultSetExtractor(rowMapper));
return results.thenApply(DataAccessUtils::requiredSingleResult);
return results.thenApply(DataAccessUtils::nullableSingleResult);
}
@Override
@@ -290,7 +290,7 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
CompletableFuture<List<T>> results = query(statement, newAsyncResultSetExtractor(rowMapper));
return results.thenApply(DataAccessUtils::requiredSingleResult);
return results.thenApply(DataAccessUtils::nullableSingleResult);
}
@Override
@@ -518,7 +518,7 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
CompletableFuture<List<T>> results = query(newAsyncPreparedStatementCreator(cql), newPreparedStatementBinder(args),
newAsyncResultSetExtractor(rowMapper));
return results.thenApply(DataAccessUtils::requiredSingleResult);
return results.thenApply(DataAccessUtils::nullableSingleResult);
}
@Override

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java
View File

@@ -202,7 +202,7 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations {
@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 class CqlTemplate extends CassandraAccessor implements CqlOperations {
@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 class CqlTemplate extends CassandraAccessor implements CqlOperations {
@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)));
}

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java
View File

@@ -331,7 +331,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
@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 class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
@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 class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re
@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();
}

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplate.java
View File

@@ -216,7 +216,7 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
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 class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
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 class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera
newAsyncResultSetExtractor(rowMapper));
return new ExceptionTranslatingListenableFutureAdapter<>(
new MappingListenableFutureAdapter<>(results, DataAccessUtils::requiredSingleResult), getExceptionTranslator());
new MappingListenableFutureAdapter<>(results, DataAccessUtils::nullableSingleResult), getExceptionTranslator());
}
@Override

2
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplate.java
View File

@@ -533,7 +533,7 @@ public class AsyncCassandraTemplate
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);
});