Skip to content

Commit d4e8f29

Browse files
akarnokdakarnokd
authored
2.x: move Exceptions to public area, + ExceptionHelper (ReactiveX#4288)
1 parent 2d36c7b commit d4e8f29

151 files changed

Lines changed: 337 additions & 308 deletions

File tree

Some content is hidden

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

‎src/main/java/io/reactivex/Completable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
import io.reactivex.annotations.SchedulerSupport;
2020
import io.reactivex.disposables.Disposable;
21+
import io.reactivex.exceptions.Exceptions;
2122
import io.reactivex.functions.*;
2223
import io.reactivex.internal.functions.*;
2324
import io.reactivex.internal.operators.completable.*;
2425
import io.reactivex.internal.subscribers.completable.*;
25-
import io.reactivex.internal.util.Exceptions;
2626
import io.reactivex.plugins.RxJavaPlugins;
2727
import io.reactivex.schedulers.Schedulers;
2828

‎src/main/java/io/reactivex/Flowable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import io.reactivex.annotations.*;
2323
import io.reactivex.disposables.Disposable;
24+
import io.reactivex.exceptions.Exceptions;
2425
import io.reactivex.flowables.*;
2526
import io.reactivex.functions.*;
2627
import io.reactivex.internal.functions.Functions;
@@ -31,7 +32,7 @@
3132
import io.reactivex.internal.schedulers.ImmediateThinScheduler;
3233
import io.reactivex.internal.subscribers.flowable.*;
3334
import io.reactivex.internal.subscriptions.EmptySubscription;
34-
import io.reactivex.internal.util.*;
35+
import io.reactivex.internal.util.ArrayListSupplier;
3536
import io.reactivex.plugins.RxJavaPlugins;
3637
import io.reactivex.schedulers.*;
3738
import io.reactivex.subscribers.*;

‎src/main/java/io/reactivex/Observable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121

2222
import io.reactivex.annotations.*;
2323
import io.reactivex.disposables.*;
24+
import io.reactivex.exceptions.Exceptions;
2425
import io.reactivex.functions.*;
2526
import io.reactivex.internal.disposables.EmptyDisposable;
2627
import io.reactivex.internal.functions.Functions;
2728
import io.reactivex.internal.functions.Objects;
2829
import io.reactivex.internal.operators.observable.*;
2930
import io.reactivex.internal.subscribers.observable.*;
30-
import io.reactivex.internal.util.*;
31+
import io.reactivex.internal.util.ArrayListSupplier;
3132
import io.reactivex.observables.*;
3233
import io.reactivex.observers.*;
3334
import io.reactivex.plugins.RxJavaPlugins;

‎src/main/java/io/reactivex/Scheduler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.concurrent.TimeUnit;
1717

1818
import io.reactivex.disposables.*;
19-
import io.reactivex.internal.util.Exceptions;
19+
import io.reactivex.exceptions.Exceptions;
2020
import io.reactivex.plugins.RxJavaPlugins;
2121

2222
public abstract class Scheduler {

‎src/main/java/io/reactivex/Single.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import org.reactivestreams.*;
2020

2121
import io.reactivex.disposables.Disposable;
22+
import io.reactivex.exceptions.Exceptions;
2223
import io.reactivex.functions.*;
2324
import io.reactivex.internal.functions.Functions;
2425
import io.reactivex.internal.functions.Objects;
2526
import io.reactivex.internal.operators.single.*;
2627
import io.reactivex.internal.subscribers.single.*;
27-
import io.reactivex.internal.util.Exceptions;
2828
import io.reactivex.plugins.RxJavaPlugins;
2929
import io.reactivex.schedulers.Schedulers;
3030

‎src/main/java/io/reactivex/annotations/SchedulerSupport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
package io.reactivex.annotations;
1515

16-
import io.reactivex.schedulers.Schedulers;
1716
import java.lang.annotation.*;
1817

18+
import io.reactivex.schedulers.Schedulers;
19+
1920
/**
2021
* Indicates what kind of scheduler the class or method uses.
2122
* <p>

‎src/main/java/io/reactivex/disposables/CompositeDisposable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
import java.util.*;
1616

17-
import io.reactivex.exceptions.CompositeException;
17+
import io.reactivex.exceptions.*;
1818
import io.reactivex.internal.disposables.DisposableContainer;
1919
import io.reactivex.internal.functions.Objects;
20-
import io.reactivex.internal.util.*;
20+
import io.reactivex.internal.util.OpenHashSet;
2121

2222
/**
2323
* A disposable container that can hold onto multiple other disposables.

‎src/main/java/io/reactivex/disposables/RefCountDisposable.java‎

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

1414
package io.reactivex.disposables;
1515

16-
import io.reactivex.internal.disposables.DisposableHelper;
1716
import java.util.concurrent.atomic.*;
1817

18+
import io.reactivex.internal.disposables.DisposableHelper;
1919
import io.reactivex.internal.functions.Objects;
2020

2121
public final class RefCountDisposable implements Disposable {

‎src/main/java/io/reactivex/disposables/ReferenceDisposable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
package io.reactivex.disposables;
1515

16-
import io.reactivex.internal.functions.Objects;
1716
import java.util.concurrent.atomic.AtomicReference;
1817

18+
import io.reactivex.internal.functions.Objects;
19+
1920
abstract class ReferenceDisposable<T> extends AtomicReference<T> implements Disposable {
2021
/** */
2122
private static final long serialVersionUID = 6537757548749041217L;

‎src/main/java/io/reactivex/disposables/SerialDisposable.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.AtomicReference;
1717

18-
import io.reactivex.internal.disposables.*;
18+
import io.reactivex.internal.disposables.DisposableHelper;
1919

2020
public final class SerialDisposable implements Disposable {
2121
final AtomicReference<Disposable> resource;

0 commit comments

Comments
 (0)