Skip to content

Commit d320d5c

Browse files
akarnokdakarnokd
authored
2.x: coverage and cleanup 10/13-1 (#4701)
1 parent 7c60915 commit d320d5c

31 files changed

+2303
-237
lines changed

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounce.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
package io.reactivex.internal.operators.flowable;
1515

16-
import io.reactivex.internal.functions.ObjectHelper;
1716
import java.util.concurrent.atomic.*;
1817

1918
import org.reactivestreams.*;
2019

2120
import io.reactivex.disposables.Disposable;
22-
import io.reactivex.exceptions.Exceptions;
21+
import io.reactivex.exceptions.*;
2322
import io.reactivex.functions.Function;
2423
import io.reactivex.internal.disposables.DisposableHelper;
24+
import io.reactivex.internal.functions.ObjectHelper;
2525
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2626
import io.reactivex.internal.util.BackpressureHelper;
2727
import io.reactivex.plugins.RxJavaPlugins;
@@ -147,7 +147,7 @@ void emit(long idx, T value) {
147147
}
148148
} else {
149149
cancel();
150-
actual.onError(new IllegalStateException("Could not deliver value due to lack of requests"));
150+
actual.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
151151
}
152152
}
153153
}

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounceTimed.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import io.reactivex.Scheduler;
2222
import io.reactivex.Scheduler.Worker;
2323
import io.reactivex.disposables.Disposable;
24-
import io.reactivex.internal.disposables.*;
24+
import io.reactivex.exceptions.MissingBackpressureException;
25+
import io.reactivex.internal.disposables.DisposableHelper;
2526
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2627
import io.reactivex.internal.util.BackpressureHelper;
2728
import io.reactivex.plugins.RxJavaPlugins;
@@ -157,7 +158,7 @@ void emit(long idx, T t, DebounceEmitter<T> emitter) {
157158
emitter.dispose();
158159
} else {
159160
cancel();
160-
actual.onError(new IllegalStateException("Could not deliver value due to lack of requests"));
161+
actual.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
161162
}
162163
}
163164
}

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableIntervalRange.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
import io.reactivex.*;
2222
import io.reactivex.disposables.Disposable;
23-
import io.reactivex.internal.disposables.*;
23+
import io.reactivex.exceptions.MissingBackpressureException;
24+
import io.reactivex.internal.disposables.DisposableHelper;
2425
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2526
import io.reactivex.internal.util.BackpressureHelper;
2627

@@ -106,7 +107,7 @@ public void run() {
106107
}
107108
} else {
108109
try {
109-
actual.onError(new IllegalStateException("Can't deliver value " + count + " due to lack of requests"));
110+
actual.onError(new MissingBackpressureException("Can't deliver value " + count + " due to lack of requests"));
110111
} finally {
111112
DisposableHelper.dispose(resource);
112113
}

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableSamplePublisher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.reactivestreams.*;
1919

2020
import io.reactivex.Flowable;
21+
import io.reactivex.exceptions.MissingBackpressureException;
2122
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2223
import io.reactivex.internal.util.BackpressureHelper;
2324
import io.reactivex.subscribers.SerializedSubscriber;
@@ -129,7 +130,7 @@ public void emit() {
129130
}
130131
} else {
131132
cancel();
132-
actual.onError(new IllegalStateException("Couldn't emit value due to lack of requests!"));
133+
actual.onError(new MissingBackpressureException("Couldn't emit value due to lack of requests!"));
133134
}
134135
}
135136
}

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableSampleTimed.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
import org.reactivestreams.*;
2020

21-
import io.reactivex.*;
21+
import io.reactivex.Scheduler;
2222
import io.reactivex.disposables.Disposable;
23+
import io.reactivex.exceptions.MissingBackpressureException;
2324
import io.reactivex.internal.disposables.DisposableHelper;
2425
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2526
import io.reactivex.internal.util.BackpressureHelper;
@@ -127,7 +128,7 @@ public void run() {
127128
}
128129
} else {
129130
cancel();
130-
actual.onError(new IllegalStateException("Couldn't emit value due to lack of requests!"));
131+
actual.onError(new MissingBackpressureException("Couldn't emit value due to lack of requests!"));
131132
}
132133
}
133134
}

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTimed.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818

1919
import org.reactivestreams.*;
2020

21-
import io.reactivex.*;
21+
import io.reactivex.Scheduler;
2222
import io.reactivex.Scheduler.Worker;
2323
import io.reactivex.disposables.Disposable;
24+
import io.reactivex.exceptions.MissingBackpressureException;
2425
import io.reactivex.internal.disposables.DisposableHelper;
2526
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2627
import io.reactivex.internal.util.BackpressureHelper;
@@ -106,7 +107,7 @@ public void onNext(T t) {
106107
} else {
107108
done = true;
108109
cancel();
109-
actual.onError(new IllegalStateException("Could not deliver value due to lack of requests"));
110+
actual.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
110111
return;
111112
}
112113

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundary.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import io.reactivex.Flowable;
2121
import io.reactivex.disposables.Disposable;
22-
import io.reactivex.exceptions.Exceptions;
22+
import io.reactivex.exceptions.*;
2323
import io.reactivex.internal.disposables.DisposableHelper;
2424
import io.reactivex.internal.fuseable.SimpleQueue;
2525
import io.reactivex.internal.queue.MpscLinkedQueue;
@@ -95,7 +95,7 @@ public void onSubscribe(Subscription s) {
9595
produced(1);
9696
}
9797
} else {
98-
a.onError(new IllegalStateException("Could not deliver first window due to lack of requests"));
98+
a.onError(new MissingBackpressureException("Could not deliver first window due to lack of requests"));
9999
return;
100100
}
101101

@@ -239,7 +239,7 @@ void drainLoop() {
239239
} else {
240240
// don't emit new windows
241241
cancelled = true;
242-
a.onError(new IllegalStateException("Could not deliver new window due to lack of requests"));
242+
a.onError(new MissingBackpressureException("Could not deliver new window due to lack of requests"));
243243
continue;
244244
}
245245

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundarySelector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
package io.reactivex.internal.operators.flowable;
1515

16-
import io.reactivex.internal.functions.ObjectHelper;
1716
import java.util.*;
1817
import java.util.concurrent.atomic.*;
1918

2019
import org.reactivestreams.*;
2120

2221
import io.reactivex.Flowable;
2322
import io.reactivex.disposables.*;
24-
import io.reactivex.exceptions.Exceptions;
23+
import io.reactivex.exceptions.*;
2524
import io.reactivex.functions.Function;
2625
import io.reactivex.internal.disposables.DisposableHelper;
26+
import io.reactivex.internal.functions.ObjectHelper;
2727
import io.reactivex.internal.fuseable.SimpleQueue;
2828
import io.reactivex.internal.queue.MpscLinkedQueue;
2929
import io.reactivex.internal.subscribers.QueueDrainSubscriber;
@@ -275,7 +275,7 @@ void drainLoop() {
275275
}
276276
} else {
277277
cancelled = true;
278-
a.onError(new IllegalStateException("Could not deliver new window due to lack of requests"));
278+
a.onError(new MissingBackpressureException("Could not deliver new window due to lack of requests"));
279279
continue;
280280
}
281281

‎src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundarySupplier.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313

1414
package io.reactivex.internal.operators.flowable;
1515

16-
import io.reactivex.internal.functions.ObjectHelper;
1716
import java.util.concurrent.Callable;
1817
import java.util.concurrent.atomic.*;
1918

2019
import org.reactivestreams.*;
2120

2221
import io.reactivex.Flowable;
2322
import io.reactivex.disposables.Disposable;
24-
import io.reactivex.exceptions.Exceptions;
23+
import io.reactivex.exceptions.*;
2524
import io.reactivex.internal.disposables.DisposableHelper;
25+
import io.reactivex.internal.functions.ObjectHelper;
2626
import io.reactivex.internal.fuseable.SimpleQueue;
2727
import io.reactivex.internal.queue.MpscLinkedQueue;
2828
import io.reactivex.internal.subscribers.QueueDrainSubscriber;
@@ -109,7 +109,7 @@ public void onSubscribe(Subscription s) {
109109
}
110110
} else {
111111
s.cancel();
112-
a.onError(new IllegalStateException("Could not deliver first window due to lack of requests"));
112+
a.onError(new MissingBackpressureException("Could not deliver first window due to lack of requests"));
113113
return;
114114
}
115115

@@ -264,7 +264,7 @@ void drainLoop() {
264264
} else {
265265
// don't emit new windows
266266
cancelled = true;
267-
a.onError(new IllegalStateException("Could not deliver new window due to lack of requests"));
267+
a.onError(new MissingBackpressureException("Could not deliver new window due to lack of requests"));
268268
continue;
269269
}
270270

‎src/main/java/io/reactivex/internal/subscribers/QueueDrainSubscriber.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.reactivestreams.Subscriber;
1919

2020
import io.reactivex.disposables.Disposable;
21+
import io.reactivex.exceptions.MissingBackpressureException;
2122
import io.reactivex.internal.fuseable.SimpleQueue;
2223
import io.reactivex.internal.subscriptions.SubscriptionHelper;
2324
import io.reactivex.internal.util.*;
@@ -80,7 +81,7 @@ protected final void fastPathEmitMax(U value, boolean delayError, Disposable dis
8081
}
8182
} else {
8283
dispose.dispose();
83-
s.onError(new IllegalStateException("Could not emit buffer due to lack of requests"));
84+
s.onError(new MissingBackpressureException("Could not emit buffer due to lack of requests"));
8485
return;
8586
}
8687
} else {
@@ -114,7 +115,7 @@ protected final void fastPathOrderedEmitMax(U value, boolean delayError, Disposa
114115
} else {
115116
cancelled = true;
116117
dispose.dispose();
117-
s.onError(new IllegalStateException("Could not emit buffer due to lack of requests"));
118+
s.onError(new MissingBackpressureException("Could not emit buffer due to lack of requests"));
118119
return;
119120
}
120121
} else {

0 commit comments

Comments
 (0)