From c85b524508645b5b8b3ed83c1c41bdee9674123f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 10 Sep 2020 10:35:13 +0200 Subject: [PATCH] DATACMNS-1795 - Align checks in ReactiveWrappers with checks in ReactiveAdapterRegistry. Checks in ReactiveWrappers align now with checks in ReactiveAdapterRegistry for a consistent configuration experience. --- .../data/repository/util/ReactiveWrappers.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java b/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java index 3f01b4997..e70fb7423 100644 --- a/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java +++ b/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java @@ -64,11 +64,13 @@ import org.springframework.util.ClassUtils; */ public abstract class ReactiveWrappers { - private static final boolean PROJECT_REACTOR_PRESENT = ClassUtils.isPresent("reactor.core.publisher.Mono", + private static final boolean PROJECT_REACTOR_PRESENT = ClassUtils.isPresent("reactor.core.publisher.Flux", ReactiveWrappers.class.getClassLoader()); @Deprecated - private static final boolean RXJAVA1_PRESENT = ClassUtils.isPresent("rx.Completable", + private static final boolean RXJAVA1_PRESENT = ClassUtils.isPresent("rx.Observable", + ReactiveWrappers.class.getClassLoader()) + && ClassUtils.isPresent("rx.RxReactiveStreams", ReactiveWrappers.class.getClassLoader()); private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable", @@ -77,10 +79,8 @@ public abstract class ReactiveWrappers { private static final boolean RXJAVA3_PRESENT = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", ReactiveWrappers.class.getClassLoader()); - private static final boolean KOTLIN_COROUTINES_PRESENT = ClassUtils.isPresent("kotlinx.coroutines.flow.Flow", - ReactiveWrappers.class.getClassLoader()) - && ClassUtils.isPresent("kotlinx.coroutines.reactive.ReactiveFlowKt", ReactiveWrappers.class.getClassLoader()) - && ClassUtils.isPresent("kotlinx.coroutines.reactor.ReactorFlowKt", ReactiveWrappers.class.getClassLoader()); + private static final boolean KOTLIN_COROUTINES_PRESENT = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", + ReactiveWrappers.class.getClassLoader()); private ReactiveWrappers() {}