Skip to content

Commit 82fd3ca

Browse files
committed
Deprecate support for RxJava 2.
Closes #2470
1 parent a11340b commit 82fd3ca

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/main/java/org/springframework/data/repository/reactive/RxJava2CrudRepository.java

+2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
* @see Single
3434
* @see Flowable
3535
* @see Completable
36+
* @deprecated since 2.6, use {@link RxJava3CrudRepository RxJava 3} instead. To be removed with Spring Data 3.0.
3637
*/
3738
@NoRepositoryBean
39+
@Deprecated
3840
public interface RxJava2CrudRepository<T, ID> extends Repository<T, ID> {
3941

4042
/**

src/main/java/org/springframework/data/repository/reactive/RxJava2SortingRepository.java

+2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
* @see Sort
3030
* @see Flowable
3131
* @see RxJava2CrudRepository
32+
* @deprecated since 2.6, use {@link RxJava3SortingRepository RxJava 3} instead. To be removed with Spring Data 3.0.
3233
*/
3334
@NoRepositoryBean
35+
@Deprecated
3436
public interface RxJava2SortingRepository<T, ID> extends RxJava2CrudRepository<T, ID> {
3537

3638
/**

src/main/java/org/springframework/data/repository/util/ReactiveWrappers.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public abstract class ReactiveWrappers {
7373
&& ClassUtils.isPresent("rx.RxReactiveStreams",
7474
ReactiveWrappers.class.getClassLoader());
7575

76+
@Deprecated
7677
private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable",
7778
ReactiveWrappers.class.getClassLoader());
7879

@@ -94,10 +95,16 @@ public enum ReactiveLibrary {
9495
PROJECT_REACTOR,
9596

9697
/**
97-
* @deprecated since 2.4, use RxJava 2 or 3 instead.
98+
* @deprecated since 2.4, use RxJava 3 instead. To be removed with Spring Data 3.0.
99+
*/
100+
@Deprecated
101+
RXJAVA1,
102+
103+
/**
104+
* @deprecated since 2.6, use RxJava 3 instead. To be removed with Spring Data 3.0.
98105
*/
99106
@Deprecated
100-
RXJAVA1, RXJAVA2, RXJAVA3, KOTLIN_COROUTINES;
107+
RXJAVA2, RXJAVA3, KOTLIN_COROUTINES;
101108
}
102109

103110
/**

0 commit comments

Comments
 (0)