From 849af2c085367fbc3482227c264bc1bf235c2f7e Mon Sep 17 00:00:00 2001 From: Mateusz Stefek Date: Wed, 6 Feb 2019 10:56:31 +0100 Subject: [PATCH] DATACASS-599 - Restore compatibility with Guava 26+. Guava has removed Futures#transform method without the Executor parameter in version 26.0-jre DefaultBridgeReactiveSession fails with NoSuchMethod exception when used with Guava 26.0-jre+. Original pull request: #137. --- .../core/cql/session/DefaultBridgedReactiveSession.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java index 0759e6dcf..54ea4f0d0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java @@ -44,6 +44,7 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; /** * Default implementation of a {@link ReactiveSession}. This implementation bridges asynchronous {@link Session} methods @@ -166,7 +167,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { ListenableFuture future = this.session.executeAsync(statement); ListenableFuture resultSetFuture = - Futures.transform(future, DefaultReactiveResultSet::new); + Futures.transform(future, DefaultReactiveResultSet::new, MoreExecutors.directExecutor()); adaptFuture(resultSetFuture, sink); }