Skip to content

Commit 80c83a4

Browse files
authored
3.x: Standardize many of the operator fusion interfaces & queues (#7320)
1 parent 804b8ef commit 80c83a4

File tree

217 files changed

+401
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+401
-277
lines changed

src/main/java/io/reactivex/rxjava3/core/Flowable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.reactivex.rxjava3.flowables.*;
2626
import io.reactivex.rxjava3.functions.*;
2727
import io.reactivex.rxjava3.internal.functions.*;
28-
import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
2928
import io.reactivex.rxjava3.internal.jdk8.*;
3029
import io.reactivex.rxjava3.internal.operators.flowable.*;
3130
import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
@@ -35,6 +34,7 @@
3534
import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
3635
import io.reactivex.rxjava3.internal.subscribers.*;
3736
import io.reactivex.rxjava3.internal.util.*;
37+
import io.reactivex.rxjava3.operators.ScalarSupplier;
3838
import io.reactivex.rxjava3.parallel.ParallelFlowable;
3939
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
4040
import io.reactivex.rxjava3.schedulers.*;

src/main/java/io/reactivex/rxjava3/core/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.reactivex.rxjava3.exceptions.*;
2525
import io.reactivex.rxjava3.functions.*;
2626
import io.reactivex.rxjava3.internal.functions.*;
27-
import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
2827
import io.reactivex.rxjava3.internal.jdk8.*;
2928
import io.reactivex.rxjava3.internal.observers.*;
3029
import io.reactivex.rxjava3.internal.operators.flowable.*;
@@ -35,6 +34,7 @@
3534
import io.reactivex.rxjava3.internal.util.*;
3635
import io.reactivex.rxjava3.observables.*;
3736
import io.reactivex.rxjava3.observers.*;
37+
import io.reactivex.rxjava3.operators.ScalarSupplier;
3838
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3939
import io.reactivex.rxjava3.schedulers.*;
4040

src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import io.reactivex.rxjava3.annotations.Nullable;
1717
import io.reactivex.rxjava3.core.*;
18-
import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
18+
import io.reactivex.rxjava3.operators.QueueDisposable;
1919

2020
/**
2121
* Represents a stateless empty Disposable that reports being always

src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
package io.reactivex.rxjava3.internal.fuseable;
1515

1616
import io.reactivex.rxjava3.annotations.NonNull;
17+
import io.reactivex.rxjava3.operators.QueueDisposable;
18+
import io.reactivex.rxjava3.operators.QueueFuseable;
19+
import io.reactivex.rxjava3.operators.QueueSubscription;
1720

1821
/**
1922
* Represents an empty, async-only {@link QueueFuseable} instance.

src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
package io.reactivex.rxjava3.internal.fuseable;
1515

16+
import io.reactivex.rxjava3.operators.QueueFuseable;
17+
1618
/**
1719
* Represents an empty, async-only {@link QueueFuseable} instance that tracks and exposes a
1820
* canceled/disposed state.

src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
import io.reactivex.rxjava3.core.*;
2424
import io.reactivex.rxjava3.exceptions.*;
2525
import io.reactivex.rxjava3.functions.*;
26-
import io.reactivex.rxjava3.internal.fuseable.*;
27-
import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
2826
import io.reactivex.rxjava3.internal.subscriptions.*;
2927
import io.reactivex.rxjava3.internal.util.*;
28+
import io.reactivex.rxjava3.operators.QueueFuseable;
29+
import io.reactivex.rxjava3.operators.QueueSubscription;
30+
import io.reactivex.rxjava3.operators.SimpleQueue;
31+
import io.reactivex.rxjava3.operators.SpscArrayQueue;
3032
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3133

3234
/**

src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
import io.reactivex.rxjava3.annotations.*;
2424
import io.reactivex.rxjava3.core.Flowable;
2525
import io.reactivex.rxjava3.exceptions.Exceptions;
26-
import io.reactivex.rxjava3.internal.fuseable.*;
2726
import io.reactivex.rxjava3.internal.subscriptions.*;
2827
import io.reactivex.rxjava3.internal.util.BackpressureHelper;
28+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
29+
import io.reactivex.rxjava3.operators.QueueSubscription;
2930
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3031

3132
/**

src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import io.reactivex.rxjava3.core.Flowable;
2121
import io.reactivex.rxjava3.functions.Function;
22-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2322
import io.reactivex.rxjava3.internal.subscribers.*;
23+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2424

2525
/**
2626
* Map the upstream values into an Optional and emit its value if any.

src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.reactivex.rxjava3.core.Observer;
2222
import io.reactivex.rxjava3.exceptions.Exceptions;
2323
import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
24-
import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
24+
import io.reactivex.rxjava3.operators.QueueDisposable;
2525
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626

2727
/**

src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import io.reactivex.rxjava3.exceptions.Exceptions;
2121
import io.reactivex.rxjava3.functions.Function;
22-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2322
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
23+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2424
import io.reactivex.rxjava3.parallel.ParallelFlowable;
2525
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626

src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import io.reactivex.rxjava3.exceptions.*;
2121
import io.reactivex.rxjava3.functions.*;
22-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2322
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
23+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2424
import io.reactivex.rxjava3.parallel.*;
2525
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626

src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import io.reactivex.rxjava3.disposables.Disposable;
1818
import io.reactivex.rxjava3.exceptions.Exceptions;
1919
import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
20-
import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
20+
import io.reactivex.rxjava3.operators.QueueDisposable;
2121
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2222

2323
/**

src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import java.util.concurrent.atomic.AtomicInteger;
1717

18-
import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
18+
import io.reactivex.rxjava3.operators.QueueDisposable;
1919

2020
/**
2121
* An abstract QueueDisposable implementation, extending an AtomicInteger,

src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
package io.reactivex.rxjava3.internal.observers;
1515

16-
import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
16+
import io.reactivex.rxjava3.operators.QueueDisposable;
1717

1818
/**
1919
* An abstract QueueDisposable implementation that defaults all

src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
import io.reactivex.rxjava3.core.Observer;
1919
import io.reactivex.rxjava3.disposables.Disposable;
2020
import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
21-
import io.reactivex.rxjava3.internal.fuseable.*;
2221
import io.reactivex.rxjava3.internal.util.QueueDrainHelper;
22+
import io.reactivex.rxjava3.operators.QueueDisposable;
23+
import io.reactivex.rxjava3.operators.QueueSubscription;
24+
import io.reactivex.rxjava3.operators.SimpleQueue;
2325

2426
/**
2527
* Subscriber that can fuse with the upstream and calls a support interface

src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import io.reactivex.rxjava3.core.Observer;
1919
import io.reactivex.rxjava3.disposables.Disposable;
20-
import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
2120
import io.reactivex.rxjava3.internal.util.*;
21+
import io.reactivex.rxjava3.operators.SimplePlainQueue;
2222

2323
/**
2424
* Abstract base class for subscribers that hold another subscriber, a queue

src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
import io.reactivex.rxjava3.disposables.Disposable;
2222
import io.reactivex.rxjava3.exceptions.*;
2323
import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
24-
import io.reactivex.rxjava3.internal.fuseable.*;
25-
import io.reactivex.rxjava3.internal.queue.*;
2624
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
25+
import io.reactivex.rxjava3.operators.*;
2726
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2827

2928
public final class CompletableConcat extends Completable {

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import io.reactivex.rxjava3.core.*;
2323
import io.reactivex.rxjava3.disposables.Disposable;
2424
import io.reactivex.rxjava3.exceptions.*;
25-
import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
2625
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2726
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.SpscArrayQueue;
2828

2929
public final class BlockingFlowableIterable<T> implements Iterable<T> {
3030
final Flowable<T> source;

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import io.reactivex.rxjava3.disposables.*;
2323
import io.reactivex.rxjava3.exceptions.Exceptions;
2424
import io.reactivex.rxjava3.functions.*;
25-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2625
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2726
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2828
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2929

3030
public final class FlowableBufferBoundary<T, U extends Collection<? super T>, Open, Close>

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import io.reactivex.rxjava3.exceptions.Exceptions;
2424
import io.reactivex.rxjava3.functions.Function;
2525
import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber;
26-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2726
import io.reactivex.rxjava3.internal.subscriptions.*;
2827
import io.reactivex.rxjava3.internal.util.*;
28+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2929
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3030

3131
/**

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
import io.reactivex.rxjava3.core.*;
2222
import io.reactivex.rxjava3.exceptions.Exceptions;
2323
import io.reactivex.rxjava3.functions.*;
24-
import io.reactivex.rxjava3.internal.fuseable.*;
25-
import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
2624
import io.reactivex.rxjava3.internal.subscriptions.*;
2725
import io.reactivex.rxjava3.internal.util.*;
26+
import io.reactivex.rxjava3.operators.QueueSubscription;
27+
import io.reactivex.rxjava3.operators.SimpleQueue;
28+
import io.reactivex.rxjava3.operators.SpscArrayQueue;
2829

2930
public final class FlowableConcatMap<T, R> extends AbstractFlowableWithUpstream<T, R> {
3031

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import io.reactivex.rxjava3.core.*;
2222
import io.reactivex.rxjava3.exceptions.*;
2323
import io.reactivex.rxjava3.functions.Function;
24-
import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
25-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2624
import io.reactivex.rxjava3.internal.subscribers.*;
2725
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2826
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.SimpleQueue;
28+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2929

3030
public final class FlowableConcatMapEager<T, R> extends AbstractFlowableWithUpstream<T, R> {
3131

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
import io.reactivex.rxjava3.core.*;
2222
import io.reactivex.rxjava3.exceptions.Exceptions;
2323
import io.reactivex.rxjava3.functions.*;
24-
import io.reactivex.rxjava3.internal.fuseable.*;
2524
import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*;
26-
import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
2725
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2826
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.QueueSubscription;
28+
import io.reactivex.rxjava3.operators.SimpleQueue;
29+
import io.reactivex.rxjava3.operators.SpscArrayQueue;
2930

3031
public final class FlowableConcatMapScheduler<T, R> extends AbstractFlowableWithUpstream<T, R> {
3132

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import io.reactivex.rxjava3.exceptions.*;
2323
import io.reactivex.rxjava3.functions.Cancellable;
2424
import io.reactivex.rxjava3.internal.disposables.*;
25-
import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
26-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2725
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2826
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.SimplePlainQueue;
28+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2929
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3030

3131
public final class FlowableCreate<T> extends Flowable<T> {

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import io.reactivex.rxjava3.core.Flowable;
2323
import io.reactivex.rxjava3.exceptions.Exceptions;
2424
import io.reactivex.rxjava3.functions.*;
25-
import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
2625
import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
2726
import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
2827
import io.reactivex.rxjava3.internal.util.ExceptionHelper;
28+
import io.reactivex.rxjava3.operators.QueueFuseable;
2929
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3030

3131
public final class FlowableDistinct<T, K> extends AbstractFlowableWithUpstream<T, T> {

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import io.reactivex.rxjava3.annotations.Nullable;
1919
import io.reactivex.rxjava3.core.Flowable;
2020
import io.reactivex.rxjava3.functions.*;
21-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2221
import io.reactivex.rxjava3.internal.subscribers.*;
22+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2323

2424
public final class FlowableDistinctUntilChanged<T, K> extends AbstractFlowableWithUpstream<T, T> {
2525

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import io.reactivex.rxjava3.annotations.Nullable;
1919
import io.reactivex.rxjava3.core.Flowable;
2020
import io.reactivex.rxjava3.functions.Consumer;
21-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2221
import io.reactivex.rxjava3.internal.subscribers.*;
22+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2323

2424
/**
2525
* Calls a consumer after pushing the current item to the downstream.

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
import io.reactivex.rxjava3.core.*;
2020
import io.reactivex.rxjava3.exceptions.Exceptions;
2121
import io.reactivex.rxjava3.functions.Action;
22-
import io.reactivex.rxjava3.internal.fuseable.*;
2322
import io.reactivex.rxjava3.internal.subscriptions.*;
23+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
24+
import io.reactivex.rxjava3.operators.QueueSubscription;
2425
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2526

2627
/**

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import io.reactivex.rxjava3.core.Flowable;
2020
import io.reactivex.rxjava3.exceptions.*;
2121
import io.reactivex.rxjava3.functions.*;
22-
import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
2322
import io.reactivex.rxjava3.internal.subscribers.*;
2423
import io.reactivex.rxjava3.internal.util.ExceptionHelper;
24+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
2525
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626

2727
public final class FlowableDoOnEach<T> extends AbstractFlowableWithUpstream<T, T> {

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.reactivestreams.Subscriber;
1717

1818
import io.reactivex.rxjava3.core.Flowable;
19-
import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
2019
import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
20+
import io.reactivex.rxjava3.operators.ScalarSupplier;
2121

2222
/**
2323
* A source Flowable that signals an onSubscribe() + onComplete() only.

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
import io.reactivex.rxjava3.annotations.Nullable;
1919
import io.reactivex.rxjava3.core.Flowable;
2020
import io.reactivex.rxjava3.functions.Predicate;
21-
import io.reactivex.rxjava3.internal.fuseable.*;
2221
import io.reactivex.rxjava3.internal.subscribers.*;
22+
import io.reactivex.rxjava3.operators.ConditionalSubscriber;
23+
import io.reactivex.rxjava3.operators.QueueSubscription;
2324

2425
public final class FlowableFilter<T> extends AbstractFlowableWithUpstream<T, T> {
2526
final Predicate<? super T> predicate;

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import io.reactivex.rxjava3.disposables.Disposable;
2323
import io.reactivex.rxjava3.exceptions.*;
2424
import io.reactivex.rxjava3.functions.*;
25-
import io.reactivex.rxjava3.internal.fuseable.*;
26-
import io.reactivex.rxjava3.internal.queue.*;
2725
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2826
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.*;
2928
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3029

3130
public final class FlowableFlatMap<T, U> extends AbstractFlowableWithUpstream<T, U> {

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import io.reactivex.rxjava3.exceptions.Exceptions;
2424
import io.reactivex.rxjava3.functions.Function;
2525
import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
26-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2726
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2827
import io.reactivex.rxjava3.internal.util.*;
28+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2929

3030
/**
3131
* Maps upstream values into MaybeSources and merges their signals into one sequence.

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import io.reactivex.rxjava3.exceptions.Exceptions;
2424
import io.reactivex.rxjava3.functions.Function;
2525
import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
26-
import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
2726
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
2827
import io.reactivex.rxjava3.internal.util.*;
28+
import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
2929

3030
/**
3131
* Maps upstream values into SingleSources and merges their signals into one sequence.

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
import io.reactivex.rxjava3.core.*;
2323
import io.reactivex.rxjava3.exceptions.*;
2424
import io.reactivex.rxjava3.functions.*;
25-
import io.reactivex.rxjava3.internal.fuseable.*;
26-
import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
2725
import io.reactivex.rxjava3.internal.subscriptions.*;
2826
import io.reactivex.rxjava3.internal.util.*;
27+
import io.reactivex.rxjava3.operators.QueueSubscription;
28+
import io.reactivex.rxjava3.operators.SimpleQueue;
29+
import io.reactivex.rxjava3.operators.SpscArrayQueue;
2930
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
3031

3132
public final class FlowableFlattenIterable<T, R> extends AbstractFlowableWithUpstream<T, R> {

0 commit comments

Comments
 (0)