Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1e04380

Browse files
mp911demp911de
committedNov 16, 2021
Drop support for RxJava 2.
Closes #2469
1 parent 42d9bb7 commit 1e04380

12 files changed

+14
-554
lines changed
 

‎pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@
112112

113113
<!-- RxJava -->
114114

115-
<dependency>
116-
<groupId>io.reactivex.rxjava2</groupId>
117-
<artifactId>rxjava</artifactId>
118-
<version>${rxjava2}</version>
119-
<optional>true</optional>
120-
</dependency>
121-
122115
<dependency>
123116
<groupId>io.reactivex.rxjava3</groupId>
124117
<artifactId>rxjava</artifactId>

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

Lines changed: 0 additions & 202 deletions
This file was deleted.

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/main/java/org/springframework/data/repository/reactive/RxJava3SortingRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* @since 2.4
2929
* @see Sort
3030
* @see Flowable
31-
* @see RxJava2CrudRepository
3231
*/
3332
@NoRepositoryBean
3433
public interface RxJava3SortingRepository<T, ID> extends RxJava3CrudRepository<T, ID> {

‎src/main/java/org/springframework/data/repository/util/ReactiveWrapperConverters.java

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.data.repository.util;
1717

18-
import io.reactivex.Flowable;
19-
import io.reactivex.Maybe;
2018
import kotlinx.coroutines.flow.Flow;
2119
import kotlinx.coroutines.flow.FlowKt;
2220
import kotlinx.coroutines.reactive.ReactiveFlowKt;
@@ -68,14 +66,6 @@ public abstract class ReactiveWrapperConverters {
6866

6967
static {
7068

71-
if (ReactiveWrappers.isAvailable(ReactiveLibrary.RXJAVA2)) {
72-
73-
REACTIVE_WRAPPERS.add(RxJava2SingleWrapper.INSTANCE);
74-
REACTIVE_WRAPPERS.add(RxJava2MaybeWrapper.INSTANCE);
75-
REACTIVE_WRAPPERS.add(RxJava2ObservableWrapper.INSTANCE);
76-
REACTIVE_WRAPPERS.add(RxJava2FlowableWrapper.INSTANCE);
77-
}
78-
7969
if (ReactiveWrappers.isAvailable(ReactiveLibrary.RXJAVA3)) {
8070

8171
REACTIVE_WRAPPERS.add(RxJava3SingleWrapper.INSTANCE);
@@ -331,82 +321,6 @@ public Publisher<?> map(Object wrapper, Function<Object, Object> function) {
331321
}
332322
}
333323

334-
// -------------------------------------------------------------------------
335-
// RxJava 2 converters
336-
// -------------------------------------------------------------------------
337-
338-
/**
339-
* Wrapper for RxJava 2's {@link io.reactivex.Single}.
340-
*/
341-
private enum RxJava2SingleWrapper implements ReactiveTypeWrapper<io.reactivex.Single<?>> {
342-
343-
INSTANCE;
344-
345-
@Override
346-
public Class<? super io.reactivex.Single<?>> getWrapperClass() {
347-
return io.reactivex.Single.class;
348-
}
349-
350-
@Override
351-
public io.reactivex.Single<?> map(Object wrapper, Function<Object, Object> function) {
352-
return ((io.reactivex.Single<?>) wrapper).map(function::apply);
353-
}
354-
}
355-
356-
/**
357-
* Wrapper for RxJava 2's {@link io.reactivex.Maybe}.
358-
*/
359-
private enum RxJava2MaybeWrapper implements ReactiveTypeWrapper<Maybe<?>> {
360-
361-
INSTANCE;
362-
363-
@Override
364-
public Class<? super io.reactivex.Maybe<?>> getWrapperClass() {
365-
return io.reactivex.Maybe.class;
366-
}
367-
368-
@Override
369-
public io.reactivex.Maybe<?> map(Object wrapper, Function<Object, Object> function) {
370-
return ((io.reactivex.Maybe<?>) wrapper).map(function::apply);
371-
}
372-
}
373-
374-
/**
375-
* Wrapper for RxJava 2's {@link io.reactivex.Observable}.
376-
*/
377-
private enum RxJava2ObservableWrapper implements ReactiveTypeWrapper<io.reactivex.Observable<?>> {
378-
379-
INSTANCE;
380-
381-
@Override
382-
public Class<? super io.reactivex.Observable<?>> getWrapperClass() {
383-
return io.reactivex.Observable.class;
384-
}
385-
386-
@Override
387-
public io.reactivex.Observable<?> map(Object wrapper, Function<Object, Object> function) {
388-
return ((io.reactivex.Observable<?>) wrapper).map(function::apply);
389-
}
390-
}
391-
392-
/**
393-
* Wrapper for RxJava 2's {@link io.reactivex.Flowable}.
394-
*/
395-
private enum RxJava2FlowableWrapper implements ReactiveTypeWrapper<Flowable<?>> {
396-
397-
INSTANCE;
398-
399-
@Override
400-
public Class<? super Flowable<?>> getWrapperClass() {
401-
return io.reactivex.Flowable.class;
402-
}
403-
404-
@Override
405-
public io.reactivex.Flowable<?> map(Object wrapper, Function<Object, Object> function) {
406-
return ((io.reactivex.Flowable<?>) wrapper).map(function::apply);
407-
}
408-
}
409-
410324
// -------------------------------------------------------------------------
411325
// RxJava 3 converters
412326
// -------------------------------------------------------------------------

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
* @author Hantsy Bai
4444
* @since 2.0
4545
* @see org.reactivestreams.Publisher
46-
* @see io.reactivex.Single
47-
* @see io.reactivex.Maybe
48-
* @see io.reactivex.Observable
49-
* @see io.reactivex.Completable
50-
* @see io.reactivex.Flowable
5146
* @see io.reactivex.rxjava3.core.Single
5247
* @see io.reactivex.rxjava3.core.Maybe
5348
* @see io.reactivex.rxjava3.core.Observable
@@ -63,10 +58,6 @@ public abstract class ReactiveWrappers {
6358
private static final boolean PROJECT_REACTOR_PRESENT = ClassUtils.isPresent("reactor.core.publisher.Flux",
6459
ReactiveWrappers.class.getClassLoader());
6560

66-
@Deprecated
67-
private static final boolean RXJAVA2_PRESENT = ClassUtils.isPresent("io.reactivex.Flowable",
68-
ReactiveWrappers.class.getClassLoader());
69-
7061
private static final boolean RXJAVA3_PRESENT = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable",
7162
ReactiveWrappers.class.getClassLoader());
7263

@@ -85,13 +76,7 @@ private ReactiveWrappers() {}
8576
*/
8677
public enum ReactiveLibrary {
8778

88-
PROJECT_REACTOR,
89-
90-
/**
91-
* @deprecated since 2.6, use RxJava 3 instead. To be removed with Spring Data 3.0.
92-
*/
93-
@Deprecated
94-
RXJAVA2, RXJAVA3, KOTLIN_COROUTINES;
79+
PROJECT_REACTOR, RXJAVA3, KOTLIN_COROUTINES, MUTINY;
9580
}
9681

9782
/**
@@ -117,8 +102,6 @@ public static boolean isAvailable(ReactiveLibrary reactiveLibrary) {
117102
switch (reactiveLibrary) {
118103
case PROJECT_REACTOR:
119104
return PROJECT_REACTOR_PRESENT;
120-
case RXJAVA2:
121-
return RXJAVA2_PRESENT;
122105
case RXJAVA3:
123106
return RXJAVA3_PRESENT;
124107
case KOTLIN_COROUTINES:

‎src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20-
import io.reactivex.Flowable;
20+
import io.reactivex.rxjava3.core.Flowable;
2121
import reactor.core.publisher.Flux;
2222

2323
import java.lang.reflect.Method;
@@ -30,7 +30,7 @@
3030
import org.springframework.data.repository.core.RepositoryMetadata;
3131
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
3232
import org.springframework.data.repository.reactive.ReactiveSortingRepository;
33-
import org.springframework.data.repository.reactive.RxJava2CrudRepository;
33+
import org.springframework.data.repository.reactive.RxJava3CrudRepository;
3434

3535
/**
3636
* Unit tests for {@link ReactiveRepositoryInformation}.
@@ -45,18 +45,18 @@ class ReactiveRepositoryInformationUnitTests {
4545
static final Class<ReactiveJavaInterfaceWithGenerics> BASE_CLASS = ReactiveJavaInterfaceWithGenerics.class;
4646

4747
@Test // DATACMNS-988
48-
void discoversRxJava2MethodWithoutComparingReturnType() throws Exception {
48+
void discoversRxJava3MethodWithoutComparingReturnType() throws Exception {
4949

50-
Method reference = extractTargetMethodFromRepository(RxJava2InterfaceWithGenerics.class, "deleteAll");
50+
Method reference = extractTargetMethodFromRepository(RxJava3InterfaceWithGenerics.class, "deleteAll");
5151

5252
assertThat(reference.getDeclaringClass()).isEqualTo(ReactiveCrudRepository.class);
5353
assertThat(reference.getName()).isEqualTo("deleteAll");
5454
}
5555

5656
@Test // DATACMNS-988
57-
void discoversRxJava2MethodWithConvertibleArguments() throws Exception {
57+
void discoversRxJava3MethodWithConvertibleArguments() throws Exception {
5858

59-
Method reference = extractTargetMethodFromRepository(RxJava2InterfaceWithGenerics.class, "saveAll", Flowable.class);
59+
Method reference = extractTargetMethodFromRepository(RxJava3InterfaceWithGenerics.class, "saveAll", Flowable.class);
6060

6161
assertThat(reference.getDeclaringClass()).isEqualTo(ReactiveCrudRepository.class);
6262
assertThat(reference.getName()).isEqualTo("saveAll");
@@ -113,7 +113,7 @@ private Method extractTargetMethodFromRepository(Class<?> repositoryType, String
113113
return composition.findMethod(repositoryType.getMethod(methodName, args)).get();
114114
}
115115

116-
interface RxJava2InterfaceWithGenerics extends RxJava2CrudRepository<User, String> {}
116+
interface RxJava3InterfaceWithGenerics extends RxJava3CrudRepository<User, String> {}
117117

118118
interface ReactiveJavaInterfaceWithGenerics extends ReactiveCrudRepository<User, String> {}
119119

‎src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.mockito.Mockito.*;
1919

20-
import io.reactivex.Completable;
21-
import io.reactivex.Maybe;
20+
import io.reactivex.rxjava3.core.Completable;
21+
import io.reactivex.rxjava3.core.Maybe;
2222
import io.reactivex.rxjava3.core.Single;
2323
import reactor.core.publisher.Mono;
2424

@@ -72,7 +72,7 @@ void callsRxJava2MethodOnBaseImplementationWithExactArguments() {
7272
Long id = 1L;
7373
when(backingRepo.findById(id)).thenReturn(Mono.just(true));
7474

75-
RxJava2ConvertingRepository repository = factory.getRepository(RxJava2ConvertingRepository.class);
75+
RxJava3ConvertingRepository repository = factory.getRepository(RxJava3ConvertingRepository.class);
7676
repository.findById(id);
7777

7878
verify(backingRepo, times(1)).findById(id);
@@ -84,14 +84,14 @@ void callsRxJava2MethodOnBaseImplementationWithTypeConversion() {
8484
Serializable id = 1L;
8585
when(backingRepo.deleteById(id)).thenReturn(Mono.empty());
8686

87-
RxJava2ConvertingRepository repository = factory.getRepository(RxJava2ConvertingRepository.class);
87+
RxJava3ConvertingRepository repository = factory.getRepository(RxJava3ConvertingRepository.class);
8888
repository.deleteById(id);
8989

9090
verify(backingRepo, times(1)).deleteById(id);
9191
}
9292

9393

94-
interface RxJava2ConvertingRepository extends Repository<Object, Long> {
94+
interface RxJava3ConvertingRepository extends Repository<Object, Long> {
9595

9696
Maybe<Boolean> findById(Serializable id);
9797

‎src/test/java/org/springframework/data/repository/query/ResultProcessorUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21-
import io.reactivex.Flowable;
21+
import io.reactivex.rxjava3.core.Flowable;
2222
import io.reactivex.rxjava3.core.Observable;
2323
import io.reactivex.rxjava3.core.Single;
2424
import lombok.Getter;

‎src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@ void doesNotRegisterReactiveUnwrapperTypes() {
102102
assertThat(QueryExecutionConverters.supportsUnwrapping(Single.class)).isFalse();
103103
assertThat(QueryExecutionConverters.supportsUnwrapping(Completable.class)).isFalse();
104104
assertThat(QueryExecutionConverters.supportsUnwrapping(Observable.class)).isFalse();
105-
assertThat(QueryExecutionConverters.supportsUnwrapping(io.reactivex.Single.class)).isFalse();
106-
assertThat(QueryExecutionConverters.supportsUnwrapping(io.reactivex.Maybe.class)).isFalse();
107-
assertThat(QueryExecutionConverters.supportsUnwrapping(io.reactivex.Completable.class)).isFalse();
108-
assertThat(QueryExecutionConverters.supportsUnwrapping(io.reactivex.Flowable.class)).isFalse();
109-
assertThat(QueryExecutionConverters.supportsUnwrapping(io.reactivex.Observable.class)).isFalse();
110105
}
111106

112107
@Test // DATACMNS-714

‎src/test/java/org/springframework/data/repository/util/ReactiveWrapperConvertersUnitTests.java

Lines changed: 0 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static org.assertj.core.api.AssertionsForClassTypes.*;
1919

20-
import io.reactivex.Maybe;
2120
import io.smallrye.mutiny.Multi;
2221
import io.smallrye.mutiny.Uni;
2322
import kotlinx.coroutines.flow.Flow;
@@ -47,16 +46,6 @@ void shouldSupportReactorTypes() {
4746
assertThat(ReactiveWrapperConverters.supports(Object.class)).isFalse();
4847
}
4948

50-
@Test // DATACMNS-836
51-
void shouldSupportRxJava2Types() {
52-
53-
assertThat(ReactiveWrapperConverters.supports(io.reactivex.Single.class)).isTrue();
54-
assertThat(ReactiveWrapperConverters.supports(io.reactivex.Maybe.class)).isTrue();
55-
assertThat(ReactiveWrapperConverters.supports(io.reactivex.Observable.class)).isTrue();
56-
assertThat(ReactiveWrapperConverters.supports(io.reactivex.Flowable.class)).isTrue();
57-
assertThat(ReactiveWrapperConverters.supports(io.reactivex.Completable.class)).isTrue();
58-
}
59-
6049
@Test // DATACMNS-1653
6150
void shouldSupportRxJava3Types() {
6251

@@ -88,122 +77,6 @@ void toWrapperShouldCastMonoToMono() {
8877
assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isSameAs(foo);
8978
}
9079

91-
@Test // DATACMNS-836
92-
void toWrapperShouldConvertMonoToRxJava2Single() {
93-
94-
Mono<String> foo = Mono.just("foo");
95-
assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Single.class))
96-
.isInstanceOf(io.reactivex.Single.class);
97-
}
98-
99-
@Test // DATACMNS-836
100-
void toWrapperShouldConvertRxJava2SingleToMono() {
101-
102-
io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
103-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class);
104-
}
105-
106-
@Test // DATACMNS-836
107-
void toWrapperShouldConvertRxJava2SingleToPublisher() {
108-
109-
io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
110-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class);
111-
}
112-
113-
@Test // DATACMNS-836
114-
void toWrapperShouldConvertRxJava2MaybeToMono() {
115-
116-
io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
117-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class);
118-
}
119-
120-
@Test // DATACMNS-836
121-
void toWrapperShouldConvertRxJava2MaybeToFlux() {
122-
123-
io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
124-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class);
125-
}
126-
127-
@Test // DATACMNS-836
128-
void toWrapperShouldConvertRxJava2MaybeToPublisher() {
129-
130-
io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
131-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class);
132-
}
133-
134-
@Test // DATACMNS-836
135-
void toWrapperShouldConvertRxJava2FlowableToMono() {
136-
137-
io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
138-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class);
139-
}
140-
141-
@Test // DATACMNS-836
142-
void toWrapperShouldConvertRxJava2FlowableToFlux() {
143-
144-
io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
145-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class);
146-
}
147-
148-
@Test // DATACMNS-836
149-
void toWrapperShouldCastRxJava2FlowableToPublisher() {
150-
151-
io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
152-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isSameAs(foo);
153-
}
154-
155-
@Test // DATACMNS-836
156-
void toWrapperShouldConvertRxJava2ObservableToMono() {
157-
158-
io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
159-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Mono.class)).isInstanceOf(Mono.class);
160-
}
161-
162-
@Test // DATACMNS-836
163-
void toWrapperShouldConvertRxJava2ObservableToFlux() {
164-
165-
io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
166-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Flux.class)).isInstanceOf(Flux.class);
167-
}
168-
169-
@Test // DATACMNS-836
170-
void toWrapperShouldConvertRxJava2ObservableToSingle() {
171-
172-
io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
173-
assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Single.class))
174-
.isInstanceOf(io.reactivex.Single.class);
175-
}
176-
177-
@Test // DATACMNS-836
178-
void toWrapperShouldConvertRxJava2ObservableToMaybe() {
179-
180-
io.reactivex.Observable<String> foo = io.reactivex.Observable.empty();
181-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Maybe.class)).isInstanceOf(Maybe.class);
182-
}
183-
184-
@Test // DATACMNS-836
185-
void toWrapperShouldConvertRxJava2ObservableToPublisher() {
186-
187-
io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
188-
assertThat(ReactiveWrapperConverters.toWrapper(foo, Publisher.class)).isInstanceOf(Publisher.class);
189-
}
190-
191-
@Test // DATACMNS-988
192-
void toWrapperShouldConvertPublisherToRxJava2Observable() {
193-
194-
Flux<String> foo = Flux.just("foo");
195-
assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Observable.class))
196-
.isInstanceOf(io.reactivex.Observable.class);
197-
}
198-
199-
@Test // DATACMNS-988
200-
void toWrapperShouldConvertPublisherToRxJava2Flowable() {
201-
202-
Flux<String> foo = Flux.just("foo");
203-
assertThat(ReactiveWrapperConverters.toWrapper(foo, io.reactivex.Flowable.class))
204-
.isInstanceOf(io.reactivex.Flowable.class);
205-
}
206-
20780
@Test // DATACMNS-836
20881
void toWrapperShouldConvertMonoToFlux() {
20982

@@ -227,38 +100,6 @@ void shouldMapFlux() {
227100
assertThat(map.next().block()).isEqualTo(1L);
228101
}
229102

230-
@Test // DATACMNS-836
231-
void shouldMapRxJava2Single() {
232-
233-
io.reactivex.Single<String> foo = io.reactivex.Single.just("foo");
234-
io.reactivex.Single<Long> map = ReactiveWrapperConverters.map(foo, source -> 1L);
235-
assertThat(map.blockingGet()).isEqualTo(1L);
236-
}
237-
238-
@Test // DATACMNS-836
239-
void shouldMapRxJava2Maybe() {
240-
241-
io.reactivex.Maybe<String> foo = io.reactivex.Maybe.just("foo");
242-
io.reactivex.Maybe<Long> map = ReactiveWrapperConverters.map(foo, source -> 1L);
243-
assertThat(map.toSingle().blockingGet()).isEqualTo(1L);
244-
}
245-
246-
@Test // DATACMNS-836
247-
void shouldMapRxJava2Observable() {
248-
249-
io.reactivex.Observable<String> foo = io.reactivex.Observable.just("foo");
250-
io.reactivex.Observable<Long> map = ReactiveWrapperConverters.map(foo, source -> 1L);
251-
assertThat(map.blockingFirst()).isEqualTo(1L);
252-
}
253-
254-
@Test // DATACMNS-836
255-
void shouldMapRxJava2Flowable() {
256-
257-
io.reactivex.Flowable<String> foo = io.reactivex.Flowable.just("foo");
258-
io.reactivex.Flowable<Long> map = ReactiveWrapperConverters.map(foo, source -> 1L);
259-
assertThat(map.blockingFirst()).isEqualTo(1L);
260-
}
261-
262103
@Test // DATACMNS-1653
263104
void shouldMapRxJava3Single() {
264105

‎src/test/java/org/springframework/data/repository/util/ReactiveWrappersUnitTests.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20-
import io.reactivex.Completable;
21-
import io.reactivex.Flowable;
2220
import reactor.core.publisher.Flux;
2321
import reactor.core.publisher.Mono;
2422

@@ -41,13 +39,8 @@ void isSingleLikeShouldReportCorrectNoTypes() {
4139

4240
assertThat(ReactiveWrappers.isNoValueType(Mono.class)).isFalse();
4341
assertThat(ReactiveWrappers.isNoValueType(Flux.class)).isFalse();
44-
assertThat(ReactiveWrappers.isNoValueType(Completable.class)).isTrue();
4542
assertThat(ReactiveWrappers.isNoValueType(CompletableFuture.class)).isFalse();
4643
assertThat(ReactiveWrappers.isNoValueType(Publisher.class)).isFalse();
47-
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Single.class)).isFalse();
48-
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Maybe.class)).isFalse();
49-
assertThat(ReactiveWrappers.isNoValueType(Flowable.class)).isFalse();
50-
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.Observable.class)).isFalse();
5144
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.rxjava3.core.Single.class)).isFalse();
5245
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.rxjava3.core.Maybe.class)).isFalse();
5346
assertThat(ReactiveWrappers.isNoValueType(io.reactivex.rxjava3.core.Flowable.class)).isFalse();
@@ -61,14 +54,8 @@ void isSingleLikeShouldReportCorrectSingleTypes() {
6154

6255
assertThat(ReactiveWrappers.isSingleValueType(Mono.class)).isTrue();
6356
assertThat(ReactiveWrappers.isSingleValueType(Flux.class)).isFalse();
64-
assertThat(ReactiveWrappers.isSingleValueType(Completable.class)).isFalse();
6557
assertThat(ReactiveWrappers.isSingleValueType(CompletableFuture.class)).isFalse();
6658
assertThat(ReactiveWrappers.isSingleValueType(Publisher.class)).isFalse();
67-
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.Single.class)).isTrue();
68-
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.Completable.class)).isFalse();
69-
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.Maybe.class)).isTrue();
70-
assertThat(ReactiveWrappers.isSingleValueType(Flowable.class)).isFalse();
71-
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.Observable.class)).isFalse();
7259
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.rxjava3.core.Single.class)).isTrue();
7360
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.rxjava3.core.Completable.class)).isFalse();
7461
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.rxjava3.core.Maybe.class)).isTrue();
@@ -83,13 +70,8 @@ void isCollectionLikeShouldReportCorrectCollectionTypes() {
8370

8471
assertThat(ReactiveWrappers.isMultiValueType(Mono.class)).isFalse();
8572
assertThat(ReactiveWrappers.isMultiValueType(Flux.class)).isTrue();
86-
assertThat(ReactiveWrappers.isSingleValueType(Completable.class)).isFalse();
8773
assertThat(ReactiveWrappers.isSingleValueType(CompletableFuture.class)).isFalse();
8874
assertThat(ReactiveWrappers.isMultiValueType(Publisher.class)).isTrue();
89-
assertThat(ReactiveWrappers.isMultiValueType(io.reactivex.Single.class)).isFalse();
90-
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.Completable.class)).isFalse();
91-
assertThat(ReactiveWrappers.isMultiValueType(Flowable.class)).isTrue();
92-
assertThat(ReactiveWrappers.isMultiValueType(io.reactivex.Observable.class)).isTrue();
9375
assertThat(ReactiveWrappers.isMultiValueType(io.reactivex.rxjava3.core.Single.class)).isFalse();
9476
assertThat(ReactiveWrappers.isSingleValueType(io.reactivex.rxjava3.core.Completable.class)).isFalse();
9577
assertThat(ReactiveWrappers.isMultiValueType(io.reactivex.rxjava3.core.Flowable.class)).isTrue();

0 commit comments

Comments
 (0)
Please sign in to comment.