From 30fcc2afac7fca5e8bd960191aeefb9350301210 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 4 Sep 2019 12:19:04 +0200 Subject: [PATCH] DATACASS-686 - Adapt to changes in Spring Framework's ClassUtils.isPrimitiveOrWrapper. Switch processing order to suppress element emission for query methods declaring Mono or Flux. --- .../query/ReactiveCassandraQueryExecution.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java index 8e6a38e4c..9dc611395 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactiveCassandraQueryExecution.java @@ -220,11 +220,8 @@ interface ReactiveCassandraQueryExecution { ReturnedType returnedType = processor.getReturnedType(); - if (ClassUtils.isPrimitiveOrWrapper(returnedType.getReturnedType())) { - return source; - } - if (returnedType.getReturnedType().equals(Void.class)) { + if (source instanceof Mono) { return ((Mono) source).then(); } @@ -234,6 +231,10 @@ interface ReactiveCassandraQueryExecution { } } + if (ClassUtils.isPrimitiveOrWrapper(returnedType.getReturnedType())) { + return source; + } + if (returnedType.isInstance(source)) { return source; }