From 82fd3cac27c7919dcc234278dd79ac9af97edd1a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 Sep 2021 14:04:36 +0200 Subject: [PATCH] Deprecate support for RxJava 2. Closes #2470 --- .../repository/reactive/RxJava2CrudRepository.java | 2 ++ .../repository/reactive/RxJava2SortingRepository.java | 2 ++ .../data/repository/util/ReactiveWrappers.java | 11 +++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/reactive/RxJava2CrudRepository.java b/src/main/java/org/springframework/data/repository/reactive/RxJava2CrudRepository.java index 275d944e0..53247d48f 100644 --- a/src/main/java/org/springframework/data/repository/reactive/RxJava2CrudRepository.java +++ b/src/main/java/org/springframework/data/repository/reactive/RxJava2CrudRepository.java @@ -33,8 +33,10 @@ import org.springframework.data.repository.Repository; * @see Single * @see Flowable * @see Completable + * @deprecated since 2.6, use {@link RxJava3CrudRepository RxJava 3} instead. To be removed with Spring Data 3.0. */ @NoRepositoryBean +@Deprecated public interface RxJava2CrudRepository extends Repository { /** diff --git a/src/main/java/org/springframework/data/repository/reactive/RxJava2SortingRepository.java b/src/main/java/org/springframework/data/repository/reactive/RxJava2SortingRepository.java index f98753a86..596c4de1f 100644 --- a/src/main/java/org/springframework/data/repository/reactive/RxJava2SortingRepository.java +++ b/src/main/java/org/springframework/data/repository/reactive/RxJava2SortingRepository.java @@ -29,8 +29,10 @@ import org.springframework.data.repository.NoRepositoryBean; * @see Sort * @see Flowable * @see RxJava2CrudRepository + * @deprecated since 2.6, use {@link RxJava3SortingRepository RxJava 3} instead. To be removed with Spring Data 3.0. */ @NoRepositoryBean +@Deprecated public interface RxJava2SortingRepository extends RxJava2CrudRepository { /** 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 af2841fd1..d30c464d8 100644 --- a/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java +++ b/src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java @@ -73,6 +73,7 @@ public abstract class ReactiveWrappers { && ClassUtils.isPresent("rx.RxReactiveStreams", ReactiveWrappers.class.getClassLoader()); + @Deprecated private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable", ReactiveWrappers.class.getClassLoader()); @@ -94,10 +95,16 @@ public abstract class ReactiveWrappers { PROJECT_REACTOR, /** - * @deprecated since 2.4, use RxJava 2 or 3 instead. + * @deprecated since 2.4, use RxJava 3 instead. To be removed with Spring Data 3.0. */ @Deprecated - RXJAVA1, RXJAVA2, RXJAVA3, KOTLIN_COROUTINES; + RXJAVA1, + + /** + * @deprecated since 2.6, use RxJava 3 instead. To be removed with Spring Data 3.0. + */ + @Deprecated + RXJAVA2, RXJAVA3, KOTLIN_COROUTINES; } /**