diff --git a/src/main/java/rx/Completable.java b/src/main/java/rx/Completable.java index e9b78c569f..536509b39a 100644 --- a/src/main/java/rx/Completable.java +++ b/src/main/java/rx/Completable.java @@ -2249,7 +2249,7 @@ public final R to(Func1 converter) { * @return the new Observable created */ public final Observable toObservable() { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { unsafeSubscribe(s); diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java index 67e4d6149e..89e1aea07c 100644 --- a/src/main/java/rx/Observable.java +++ b/src/main/java/rx/Observable.java @@ -51,7 +51,7 @@ public class Observable { /** * Creates an Observable with a Function to execute when it is subscribed to. *

- * Note: Use {@link #create(OnSubscribe)} to create an Observable, instead of this constructor, + * Note: Use {@link #unsafeCreate(OnSubscribe)} to create an Observable, instead of this constructor, * unless you specifically have a need for inheritance. * * @param f @@ -62,10 +62,72 @@ protected Observable(OnSubscribe f) { } /** - * This method requires advanced knowledge about building operators and data sources; please consider - * other standard methods first, such as {@link Observable#fromEmitter(Action1, Emitter.BackpressureMode)}; - * Returns an Observable that will execute the specified function when a {@link Subscriber} subscribes to - * it. + * Constructs an Observable in an unsafe manner, that is, unsubscription and backpressure handling + * is the responsibility of the OnSubscribe implementation. + * @param the value type emitted + * @param f the callback to execute for each individual Subscriber that subscribes to the + * returned Observable + * @return the new Observable instance + * @deprecated 1.2.7 - inherently unsafe, use the other create() methods for basic cases or + * see {@link #unsafeCreate(OnSubscribe)} for advanced cases (such as custom operators) + * @see #create(SyncOnSubscribe) + * @see #create(AsyncOnSubscribe) + * @see #create(Action1, rx.Emitter.BackpressureMode) + */ + @Deprecated + public static Observable create(OnSubscribe f) { + return new Observable(RxJavaHooks.onCreate(f)); + } + + /** + * Provides an API (via a cold Observable) that bridges the reactive world with the callback-style, + * generally non-backpressured world. + *

+ * Example: + *


+     * Observable.<Event>create(emitter -> {
+     *     Callback listener = new Callback() {
+     *         @Override
+     *         public void onEvent(Event e) {
+     *             emitter.onNext(e);
+     *             if (e.isLast()) {
+     *                 emitter.onCompleted();
+     *             }
+     *         }
+     *
+     *         @Override
+     *         public void onFailure(Exception e) {
+     *             emitter.onError(e);
+     *         }
+     *     };
+     *
+     *     AutoCloseable c = api.someMethod(listener);
+     *
+     *     emitter.setCancellation(c::close);
+     *
+     * }, BackpressureMode.BUFFER);
+     * 
+ *

+ * You should call the Emitter's onNext, onError and onCompleted methods in a serialized fashion. The + * rest of its methods are thread-safe. + * + * @param the element type + * @param emitter the emitter that is called when a Subscriber subscribes to the returned {@code Observable} + * @param backpressure the backpressure mode to apply if the downstream Subscriber doesn't request (fast) enough + * @return the new Observable instance + * @see Emitter + * @see Emitter.BackpressureMode + * @see rx.functions.Cancellable + * @since 1.2.7 - experimental + */ + @Experimental + public static Observable create(Action1> emitter, Emitter.BackpressureMode backpressure) { + return unsafeCreate(new OnSubscribeCreate(emitter, backpressure)); + } + + /** + * Returns an Observable that executes the given OnSubscribe action for each individual Subscriber + * that subscribes; unsubscription and backpressure must be implemented manually. *

* *

@@ -84,7 +146,7 @@ protected Observable(OnSubscribe f) { * document the fact that the consumer of the returned {@code Observable} has to apply one of * the {@code onBackpressureXXX} operators. *

Scheduler:
- *
{@code create} does not operate by default on a particular {@link Scheduler}.
+ *
{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.
* * * @param @@ -95,8 +157,10 @@ protected Observable(OnSubscribe f) { * @return an Observable that, when a {@link Subscriber} subscribes to it, will execute the specified * function * @see ReactiveX operators documentation: Create + * @since 1.2.7 - experimental */ - public static Observable create(OnSubscribe f) { + @Experimental + public static Observable unsafeCreate(OnSubscribe f) { return new Observable(RxJavaHooks.onCreate(f)); } @@ -140,7 +204,7 @@ public static Observable create(OnSubscribe f) { * @since 1.2 */ public static Observable create(SyncOnSubscribe syncOnSubscribe) { - return create((OnSubscribe)syncOnSubscribe); + return unsafeCreate(syncOnSubscribe); } /** @@ -183,7 +247,7 @@ public static Observable create(SyncOnSubscribe syncOnSubscribe) */ @Experimental public static Observable create(AsyncOnSubscribe asyncOnSubscribe) { - return create((OnSubscribe)asyncOnSubscribe); + return unsafeCreate(asyncOnSubscribe); } /** @@ -234,7 +298,7 @@ public interface Operator extends Func1, Subscriber< * @see RxJava wiki: Implementing Your Own Operators */ public final Observable lift(final Operator operator) { - return create(new OnSubscribeLift(onSubscribe, operator)); + return unsafeCreate(new OnSubscribeLift(onSubscribe, operator)); } /** @@ -373,7 +437,7 @@ public Completable toCompletable() { * @see ReactiveX operators documentation: Amb */ public static Observable amb(Iterable> sources) { - return create(OnSubscribeAmb.amb(sources)); + return unsafeCreate(OnSubscribeAmb.amb(sources)); } /** @@ -399,7 +463,7 @@ public static Observable amb(Iterable> * @see ReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2) { - return create(OnSubscribeAmb.amb(o1, o2)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2)); } /** @@ -427,7 +491,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3) { - return create(OnSubscribeAmb.amb(o1, o2, o3)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3)); } /** @@ -457,7 +521,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4)); } /** @@ -489,7 +553,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4, Observable o5) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4, o5)); } /** @@ -523,7 +587,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4, Observable o5, Observable o6) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6)); } /** @@ -559,7 +623,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4, Observable o5, Observable o6, Observable o7) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7)); } /** @@ -597,7 +661,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4, Observable o5, Observable o6, Observable o7, Observable o8) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7, o8)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7, o8)); } /** @@ -637,7 +701,7 @@ public static Observable amb(Observable o1, ObservableReactiveX operators documentation: Amb */ public static Observable amb(Observable o1, Observable o2, Observable o3, Observable o4, Observable o5, Observable o6, Observable o7, Observable o8, Observable o9) { - return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7, o8, o9)); + return unsafeCreate(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7, o8, o9)); } /** @@ -1020,7 +1084,7 @@ public static Observable combineLates * @see ReactiveX operators documentation: CombineLatest */ public static Observable combineLatest(List> sources, FuncN combineFunction) { - return create(new OnSubscribeCombineLatest(sources, combineFunction)); + return unsafeCreate(new OnSubscribeCombineLatest(sources, combineFunction)); } /** @@ -1049,7 +1113,7 @@ public static Observable combineLatest(ListReactiveX operators documentation: CombineLatest */ public static Observable combineLatest(Iterable> sources, FuncN combineFunction) { - return create(new OnSubscribeCombineLatest(sources, combineFunction)); + return unsafeCreate(new OnSubscribeCombineLatest(sources, combineFunction)); } /** @@ -1080,7 +1144,7 @@ public static Observable combineLatest(IterableReactiveX operators documentation: CombineLatest */ public static Observable combineLatestDelayError(Iterable> sources, FuncN combineFunction) { - return create(new OnSubscribeCombineLatest(null, sources, combineFunction, RxRingBuffer.SIZE, true)); + return unsafeCreate(new OnSubscribeCombineLatest(null, sources, combineFunction, RxRingBuffer.SIZE, true)); } /** @@ -1762,7 +1826,7 @@ public static Observable concatDelayError(Observable t1, Obs * @see ReactiveX operators documentation: Defer */ public static Observable defer(Func0> observableFactory) { - return create(new OnSubscribeDefer(observableFactory)); + return unsafeCreate(new OnSubscribeDefer(observableFactory)); } /** @@ -1808,7 +1872,7 @@ public static Observable empty() { * @see ReactiveX operators documentation: Throw */ public static Observable error(Throwable exception) { - return create(new OnSubscribeThrow(exception)); + return unsafeCreate(new OnSubscribeThrow(exception)); } /** @@ -1838,7 +1902,7 @@ public static Observable error(Throwable exception) { */ @SuppressWarnings("cast") public static Observable from(Future future) { - return (Observable)create(OnSubscribeToObservableFuture.toObservableFuture(future)); + return (Observable)unsafeCreate(OnSubscribeToObservableFuture.toObservableFuture(future)); } /** @@ -1872,7 +1936,7 @@ public static Observable from(Future future) { */ @SuppressWarnings("cast") public static Observable from(Future future, long timeout, TimeUnit unit) { - return (Observable)create(OnSubscribeToObservableFuture.toObservableFuture(future, timeout, unit)); + return (Observable)unsafeCreate(OnSubscribeToObservableFuture.toObservableFuture(future, timeout, unit)); } /** @@ -1904,7 +1968,7 @@ public static Observable from(Future future, long timeout, T public static Observable from(Future future, Scheduler scheduler) { // TODO in a future revision the Scheduler will become important because we'll start polling instead of blocking on the Future @SuppressWarnings("cast") - Observable o = (Observable)create(OnSubscribeToObservableFuture.toObservableFuture(future)); + Observable o = (Observable)unsafeCreate(OnSubscribeToObservableFuture.toObservableFuture(future)); return o.subscribeOn(scheduler); } @@ -1929,7 +1993,7 @@ public static Observable from(Future future, Scheduler sched * @see ReactiveX operators documentation: From */ public static Observable from(Iterable iterable) { - return create(new OnSubscribeFromIterable(iterable)); + return unsafeCreate(new OnSubscribeFromIterable(iterable)); } /** @@ -1959,7 +2023,7 @@ public static Observable from(T[] array) { if (n == 1) { return just(array[0]); } - return create(new OnSubscribeFromArray(array)); + return unsafeCreate(new OnSubscribeFromArray(array)); } /** @@ -2002,10 +2066,12 @@ public static Observable from(T[] array) { * @see Emitter.BackpressureMode * @see rx.functions.Cancellable * @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number) + * @deprecated 1.2.7 - aliased to {@link #create(Action1, rx.Emitter.BackpressureMode)}, will be removed in 1.3.0 */ @Experimental + @Deprecated public static Observable fromEmitter(Action1> emitter, Emitter.BackpressureMode backpressure) { - return create(new OnSubscribeFromEmitter(emitter, backpressure)); + return unsafeCreate(new OnSubscribeCreate(emitter, backpressure)); } /** @@ -2033,7 +2099,7 @@ public static Observable fromEmitter(Action1> emitter, Emitter * @since 1.2 */ public static Observable fromCallable(Callable func) { - return create(new OnSubscribeFromCallable(func)); + return unsafeCreate(new OnSubscribeFromCallable(func)); } /** @@ -2140,7 +2206,7 @@ public static Observable interval(long initialDelay, long period, TimeUnit * @since 1.0.12 */ public static Observable interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) { - return create(new OnSubscribeTimerPeriodically(initialDelay, period, unit, scheduler)); + return unsafeCreate(new OnSubscribeTimerPeriodically(initialDelay, period, unit, scheduler)); } /** @@ -3473,7 +3539,7 @@ public static Observable range(int start, int count) { if (count == 1) { return Observable.just(start); } - return Observable.create(new OnSubscribeRange(start, start + (count - 1))); + return Observable.unsafeCreate(new OnSubscribeRange(start, start + (count - 1))); } /** @@ -3733,7 +3799,7 @@ public static Observable timer(long delay, TimeUnit unit) { * @see ReactiveX operators documentation: Timer */ public static Observable timer(long delay, TimeUnit unit, Scheduler scheduler) { - return create(new OnSubscribeTimerOnce(delay, unit, scheduler)); + return unsafeCreate(new OnSubscribeTimerOnce(delay, unit, scheduler)); } /** @@ -3803,7 +3869,7 @@ public static Observable using( final Func0 resourceFactory, final Func1> observableFactory, final Action1 disposeAction, boolean disposeEagerly) { - return create(new OnSubscribeUsing(resourceFactory, observableFactory, disposeAction, disposeEagerly)); + return unsafeCreate(new OnSubscribeUsing(resourceFactory, observableFactory, disposeAction, disposeEagerly)); } /** @@ -5070,7 +5136,7 @@ public final Observable collect(Func0 stateFactory, final Action2(this, stateFactory, collector)); + return unsafeCreate(new OnSubscribeCollect(this, stateFactory, collector)); } /** @@ -5103,7 +5169,7 @@ public final Observable concatMap(Func1 scalar = (ScalarSynchronousObservable) this; return scalar.scalarFlatMap(func); } - return create(new OnSubscribeConcatMap(this, func, 2, OnSubscribeConcatMap.IMMEDIATE)); + return unsafeCreate(new OnSubscribeConcatMap(this, func, 2, OnSubscribeConcatMap.IMMEDIATE)); } /** @@ -5134,7 +5200,7 @@ public final Observable concatMapDelayError(Func1 scalar = (ScalarSynchronousObservable) this; return scalar.scalarFlatMap(func); } - return create(new OnSubscribeConcatMap(this, func, 2, OnSubscribeConcatMap.END)); + return unsafeCreate(new OnSubscribeConcatMap(this, func, 2, OnSubscribeConcatMap.END)); } /** @@ -5580,7 +5646,7 @@ public final Observable delaySubscription(long delay, TimeUnit unit) { * @see ReactiveX operators documentation: Delay */ public final Observable delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) { - return create(new OnSubscribeDelaySubscription(this, delay, unit, scheduler)); + return unsafeCreate(new OnSubscribeDelaySubscription(this, delay, unit, scheduler)); } /** @@ -5606,7 +5672,7 @@ public final Observable delaySubscription(long delay, TimeUnit unit, Schedule * @see ReactiveX operators documentation: Delay */ public final Observable delaySubscription(Func0> subscriptionDelay) { - return create(new OnSubscribeDelaySubscriptionWithSelector(this, subscriptionDelay)); + return unsafeCreate(new OnSubscribeDelaySubscriptionWithSelector(this, subscriptionDelay)); } /** @@ -5633,7 +5699,7 @@ public final Observable delaySubscription(Observable other) { if (other == null) { throw new NullPointerException(); } - return create(new OnSubscribeDelaySubscriptionOther(this, other)); + return unsafeCreate(new OnSubscribeDelaySubscriptionOther(this, other)); } /** @@ -5800,7 +5866,7 @@ public final Observable doOnCompleted(final Action0 onCompleted) { Action1 onError = Actions.empty(); Observer observer = new ActionObserver(onNext, onError, onCompleted); - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -5822,7 +5888,7 @@ public final Observable doOnCompleted(final Action0 onCompleted) { */ public final Observable doOnEach(final Action1> onNotification) { Observer observer = new ActionNotificationObserver(onNotification); - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -5849,7 +5915,7 @@ public final Observable doOnEach(final Action1> onNot * @see ReactiveX operators documentation: Do */ public final Observable doOnEach(Observer observer) { - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -5877,7 +5943,7 @@ public final Observable doOnError(final Action1 onError) { Action0 onCompleted = Actions.empty(); Observer observer = new ActionObserver(onNext, onError, onCompleted); - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -5902,7 +5968,7 @@ public final Observable doOnNext(final Action1 onNext) { Action0 onCompleted = Actions.empty(); Observer observer = new ActionObserver(onNext, onError, onCompleted); - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -5983,7 +6049,7 @@ public final Observable doOnTerminate(final Action0 onTerminate) { Observer observer = new ActionObserver(onNext, onError, onTerminate); - return create(new OnSubscribeDoOnEach(this, observer)); + return unsafeCreate(new OnSubscribeDoOnEach(this, observer)); } /** @@ -6559,7 +6625,7 @@ public final Observable exists(Func1 predicate) { * @see ReactiveX operators documentation: Filter */ public final Observable filter(Func1 predicate) { - return create(new OnSubscribeFilter(this, predicate)); + return unsafeCreate(new OnSubscribeFilter(this, predicate)); } /** @@ -7301,7 +7367,7 @@ public final Observable> groupBy(final Func1 Observable groupJoin(Observable right, Func1> leftDuration, Func1> rightDuration, Func2, ? extends R> resultSelector) { - return create(new OnSubscribeGroupJoin(this, right, leftDuration, rightDuration, resultSelector)); + return unsafeCreate(new OnSubscribeGroupJoin(this, right, leftDuration, rightDuration, resultSelector)); } /** @@ -7383,7 +7449,7 @@ public final Observable isEmpty() { public final Observable join(Observable right, Func1> leftDurationSelector, Func1> rightDurationSelector, Func2 resultSelector) { - return create(new OnSubscribeJoin(this, right, leftDurationSelector, rightDurationSelector, resultSelector)); + return unsafeCreate(new OnSubscribeJoin(this, right, leftDurationSelector, rightDurationSelector, resultSelector)); } /** @@ -7531,7 +7597,7 @@ public final Observable limit(int count) { * @see ReactiveX operators documentation: Map */ public final Observable map(Func1 func) { - return create(new OnSubscribeMap(this, func)); + return unsafeCreate(new OnSubscribeMap(this, func)); } private Observable mapNotification(Func1 onNext, Func1 onError, Func0 onCompleted) { @@ -8108,7 +8174,7 @@ public final Observable onExceptionResumeNext(final Observable r */ @Experimental public final Observable onTerminateDetach() { - return create(new OnSubscribeDetach(this)); + return unsafeCreate(new OnSubscribeDetach(this)); } /** @@ -8225,7 +8291,7 @@ public final Observable reduce(Func2 accumulator) { * * It should use last() not takeLast(1) since it needs to emit an error if the sequence is empty. */ - return create(new OnSubscribeReduce(this, accumulator)); + return unsafeCreate(new OnSubscribeReduce(this, accumulator)); } /** @@ -8273,7 +8339,7 @@ public final Observable reduce(Func2 accumulator) { * @see Wikipedia: Fold (higher-order function) */ public final Observable reduce(R initialValue, Func2 accumulator) { - return create(new OnSubscribeReduceSeed(this, initialValue, accumulator)); + return unsafeCreate(new OnSubscribeReduceSeed(this, initialValue, accumulator)); } /** @@ -9486,7 +9552,7 @@ public final Observable skip(long time, TimeUnit unit) { * @see ReactiveX operators documentation: Skip */ public final Observable skip(long time, TimeUnit unit, Scheduler scheduler) { - return create(new OnSubscribeSkipTimed(this, time, unit, scheduler)); + return unsafeCreate(new OnSubscribeSkipTimed(this, time, unit, scheduler)); } /** @@ -10288,7 +10354,7 @@ public final Observable subscribeOn(Scheduler scheduler) { if (this instanceof ScalarSynchronousObservable) { return ((ScalarSynchronousObservable)this).scalarScheduleOn(scheduler); } - return create(new OperatorSubscribeOn(this, scheduler)); + return unsafeCreate(new OperatorSubscribeOn(this, scheduler)); } /** @@ -10483,7 +10549,7 @@ public final Observable takeLast(final int count) { if (count == 0) { return ignoreElements(); } else if (count == 1) { - return create(new OnSubscribeTakeLastOne(this)); + return unsafeCreate(new OnSubscribeTakeLastOne(this)); } else { return lift(new OperatorTakeLast(count)); } @@ -11441,7 +11507,7 @@ public final Observable> toList() { * @see ReactiveX operators documentation: To */ public final Observable> toMap(Func1 keySelector) { - return create(new OnSubscribeToMap(this, keySelector, UtilityFunctions.identity())); + return unsafeCreate(new OnSubscribeToMap(this, keySelector, UtilityFunctions.identity())); } /** @@ -11471,7 +11537,7 @@ public final Observable> toMap(Func1 keySe * @see ReactiveX operators documentation: To */ public final Observable> toMap(Func1 keySelector, Func1 valueSelector) { - return create(new OnSubscribeToMap(this, keySelector, valueSelector)); + return unsafeCreate(new OnSubscribeToMap(this, keySelector, valueSelector)); } /** @@ -11500,7 +11566,7 @@ public final Observable> toMap(Func1 ke * @see ReactiveX operators documentation: To */ public final Observable> toMap(Func1 keySelector, Func1 valueSelector, Func0> mapFactory) { - return create(new OnSubscribeToMap(this, keySelector, valueSelector, mapFactory)); + return unsafeCreate(new OnSubscribeToMap(this, keySelector, valueSelector, mapFactory)); } /** @@ -11523,7 +11589,7 @@ public final Observable> toMap(Func1 ke * @see ReactiveX operators documentation: To */ public final Observable>> toMultimap(Func1 keySelector) { - return create(new OnSubscribeToMultimap(this, keySelector, UtilityFunctions.identity())); + return unsafeCreate(new OnSubscribeToMultimap(this, keySelector, UtilityFunctions.identity())); } /** @@ -11551,7 +11617,7 @@ public final Observable>> toMultimap(Func1ReactiveX operators documentation: To */ public final Observable>> toMultimap(Func1 keySelector, Func1 valueSelector) { - return create(new OnSubscribeToMultimap(this, keySelector, valueSelector)); + return unsafeCreate(new OnSubscribeToMultimap(this, keySelector, valueSelector)); } /** @@ -11581,7 +11647,7 @@ public final Observable>> toMultimap(Func1ReactiveX operators documentation: To */ public final Observable>> toMultimap(Func1 keySelector, Func1 valueSelector, Func0>> mapFactory) { - return create(new OnSubscribeToMultimap(this, keySelector, valueSelector, mapFactory)); + return unsafeCreate(new OnSubscribeToMultimap(this, keySelector, valueSelector, mapFactory)); } /** @@ -11613,7 +11679,7 @@ public final Observable>> toMultimap(Func1ReactiveX operators documentation: To */ public final Observable>> toMultimap(Func1 keySelector, Func1 valueSelector, Func0>> mapFactory, Func1> collectionFactory) { - return create(new OnSubscribeToMultimap(this, keySelector, valueSelector, mapFactory, collectionFactory)); + return unsafeCreate(new OnSubscribeToMultimap(this, keySelector, valueSelector, mapFactory, collectionFactory)); } /** @@ -11857,7 +11923,7 @@ public final Observable withLatestFrom(Observable other, */ @Experimental public final Observable withLatestFrom(Observable o1, Observable o2, Func3 combiner) { - return create(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2 }, null, Functions.fromFunc(combiner))); + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2 }, null, Functions.fromFunc(combiner))); } /** @@ -11894,7 +11960,7 @@ public final Observable withLatestFrom( Observable o1, Observable o2, Observable o3, Func4 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3 }, null, Functions.fromFunc(combiner))); } @@ -11934,7 +12000,7 @@ public final Observable withLatestFrom( Observable o1, Observable o2, Observable o3, Observable o4, Func5 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3, o4 }, null, Functions.fromFunc(combiner))); } /** @@ -11976,7 +12042,7 @@ public final Observable withLatestFrom( Observable o3, Observable o4, Observable o5, Func6 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3, o4, o5 }, null, Functions.fromFunc(combiner))); } @@ -12021,7 +12087,7 @@ public final Observable withLatestFrom( Observable o3, Observable o4, Observable o5, Observable o6, Func7 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3, o4, o5, o6 }, null, Functions.fromFunc(combiner))); } @@ -12069,7 +12135,7 @@ public final Observable withLatestFrom( Observable o5, Observable o6, Observable o7, Func8 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3, o4, o5, o6, o7 }, null, Functions.fromFunc(combiner))); } @@ -12119,7 +12185,7 @@ public final Observable withLatestFrom( Observable o5, Observable o6, Observable o7, Observable o8, Func9 combiner) { - return create(new OperatorWithLatestFromMany(this, + return unsafeCreate(new OperatorWithLatestFromMany(this, new Observable[] { o1, o2, o3, o4, o5, o6, o7, o8 }, null, Functions.fromFunc(combiner))); } @@ -12149,7 +12215,7 @@ public final Observable withLatestFrom( */ @Experimental public final Observable withLatestFrom(Observable[] others, FuncN combiner) { - return create(new OperatorWithLatestFromMany(this, others, null, combiner)); + return unsafeCreate(new OperatorWithLatestFromMany(this, others, null, combiner)); } /** @@ -12178,7 +12244,7 @@ public final Observable withLatestFrom(Observable[] others, FuncN c */ @Experimental public final Observable withLatestFrom(Iterable> others, FuncN combiner) { - return create(new OperatorWithLatestFromMany(this, null, others, combiner)); + return unsafeCreate(new OperatorWithLatestFromMany(this, null, others, combiner)); } /** diff --git a/src/main/java/rx/Single.java b/src/main/java/rx/Single.java index 782d5c833f..709b709f41 100644 --- a/src/main/java/rx/Single.java +++ b/src/main/java/rx/Single.java @@ -202,7 +202,7 @@ public interface Transformer extends Func1, Single> { */ private static Observable asObservable(Single t) { // is this sufficient, or do I need to keep the outer Single and subscribe to it? - return Observable.create(new SingleToObservable(t.onSubscribe)); + return Observable.unsafeCreate(new SingleToObservable(t.onSubscribe)); } /* ********************************************************************************************************* diff --git a/src/main/java/rx/internal/operators/EmptyObservableHolder.java b/src/main/java/rx/internal/operators/EmptyObservableHolder.java index e582407bee..e386539c66 100644 --- a/src/main/java/rx/internal/operators/EmptyObservableHolder.java +++ b/src/main/java/rx/internal/operators/EmptyObservableHolder.java @@ -28,7 +28,7 @@ public enum EmptyObservableHolder implements OnSubscribe { ; /** The singleton instance. */ - static final Observable EMPTY = Observable.create(INSTANCE); + static final Observable EMPTY = Observable.unsafeCreate(INSTANCE); /** diff --git a/src/main/java/rx/internal/operators/NeverObservableHolder.java b/src/main/java/rx/internal/operators/NeverObservableHolder.java index 6a80d22e8b..056c08b034 100644 --- a/src/main/java/rx/internal/operators/NeverObservableHolder.java +++ b/src/main/java/rx/internal/operators/NeverObservableHolder.java @@ -28,7 +28,7 @@ public enum NeverObservableHolder implements OnSubscribe { ; /** The singleton instance. */ - static final Observable NEVER = Observable.create(INSTANCE); + static final Observable NEVER = Observable.unsafeCreate(INSTANCE); /** * Returns a type-corrected singleton instance of the never Observable. diff --git a/src/main/java/rx/internal/operators/OnSubscribeFromEmitter.java b/src/main/java/rx/internal/operators/OnSubscribeCreate.java similarity index 97% rename from src/main/java/rx/internal/operators/OnSubscribeFromEmitter.java rename to src/main/java/rx/internal/operators/OnSubscribeCreate.java index 355ae99c1d..497b240ec0 100644 --- a/src/main/java/rx/internal/operators/OnSubscribeFromEmitter.java +++ b/src/main/java/rx/internal/operators/OnSubscribeCreate.java @@ -29,13 +29,13 @@ import rx.plugins.RxJavaHooks; import rx.subscriptions.SerialSubscription; -public final class OnSubscribeFromEmitter implements OnSubscribe { +public final class OnSubscribeCreate implements OnSubscribe { final Action1> Emitter; final Emitter.BackpressureMode backpressure; - public OnSubscribeFromEmitter(Action1> Emitter, Emitter.BackpressureMode backpressure) { + public OnSubscribeCreate(Action1> Emitter, Emitter.BackpressureMode backpressure) { this.Emitter = Emitter; this.backpressure = backpressure; } @@ -268,7 +268,7 @@ public void onError(Throwable e) { @Override void onOverflow() { - onError(new MissingBackpressureException("fromEmitter: could not emit value due to lack of requests")); + onError(new MissingBackpressureException("create: could not emit value due to lack of requests")); } } diff --git a/src/main/java/rx/internal/operators/OnSubscribeFlattenIterable.java b/src/main/java/rx/internal/operators/OnSubscribeFlattenIterable.java index 608e6808b7..fe85e55369 100644 --- a/src/main/java/rx/internal/operators/OnSubscribeFlattenIterable.java +++ b/src/main/java/rx/internal/operators/OnSubscribeFlattenIterable.java @@ -70,9 +70,9 @@ public static Observable createFrom(Observable source, Func1> mapper, int prefetch) { if (source instanceof ScalarSynchronousObservable) { T scalar = ((ScalarSynchronousObservable) source).get(); - return Observable.create(new OnSubscribeScalarFlattenIterable(scalar, mapper)); + return Observable.unsafeCreate(new OnSubscribeScalarFlattenIterable(scalar, mapper)); } - return Observable.create(new OnSubscribeFlattenIterable(source, mapper, prefetch)); + return Observable.unsafeCreate(new OnSubscribeFlattenIterable(source, mapper, prefetch)); } static final class FlattenIterableSubscriber extends Subscriber { diff --git a/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java b/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java index 4666751842..3c99b68262 100644 --- a/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java +++ b/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java @@ -170,7 +170,7 @@ public void onNext(T1 args) { leftMap().put(id, subjSerial); } - Observable window = Observable.create(new WindowObservableFunc(subj, cancel)); + Observable window = Observable.unsafeCreate(new WindowObservableFunc(subj, cancel)); Observable duration = leftDuration.call(args); diff --git a/src/main/java/rx/internal/operators/OnSubscribeRedo.java b/src/main/java/rx/internal/operators/OnSubscribeRedo.java index fc9fe9e4d2..de4f5e4d15 100644 --- a/src/main/java/rx/internal/operators/OnSubscribeRedo.java +++ b/src/main/java/rx/internal/operators/OnSubscribeRedo.java @@ -31,7 +31,7 @@ * limitations under the License. */ -import static rx.Observable.create; // NOPMD +import static rx.Observable.unsafeCreate; // NOPMD import java.util.concurrent.atomic.*; @@ -133,11 +133,11 @@ public static Observable retry(Observable source, final long count) { } public static Observable retry(Observable source, Func1>, ? extends Observable> notificationHandler) { - return create(new OnSubscribeRedo(source, notificationHandler, true, false, Schedulers.trampoline())); + return unsafeCreate(new OnSubscribeRedo(source, notificationHandler, true, false, Schedulers.trampoline())); } public static Observable retry(Observable source, Func1>, ? extends Observable> notificationHandler, Scheduler scheduler) { - return create(new OnSubscribeRedo(source, notificationHandler, true, false, scheduler)); + return unsafeCreate(new OnSubscribeRedo(source, notificationHandler, true, false, scheduler)); } public static Observable repeat(Observable source) { @@ -163,15 +163,15 @@ public static Observable repeat(Observable source, final long count, S } public static Observable repeat(Observable source, Func1>, ? extends Observable> notificationHandler) { - return create(new OnSubscribeRedo(source, notificationHandler, false, true, Schedulers.trampoline())); + return unsafeCreate(new OnSubscribeRedo(source, notificationHandler, false, true, Schedulers.trampoline())); } public static Observable repeat(Observable source, Func1>, ? extends Observable> notificationHandler, Scheduler scheduler) { - return create(new OnSubscribeRedo(source, notificationHandler, false, true, scheduler)); + return unsafeCreate(new OnSubscribeRedo(source, notificationHandler, false, true, scheduler)); } public static Observable redo(Observable source, Func1>, ? extends Observable> notificationHandler, Scheduler scheduler) { - return create(new OnSubscribeRedo(source, notificationHandler, false, false, scheduler)); + return unsafeCreate(new OnSubscribeRedo(source, notificationHandler, false, false, scheduler)); } private OnSubscribeRedo(Observable source, Func1>, ? extends Observable> f, boolean stopOnComplete, boolean stopOnError, diff --git a/src/main/java/rx/internal/operators/OperatorPublish.java b/src/main/java/rx/internal/operators/OperatorPublish.java index 7d087efcb4..c07d084abe 100644 --- a/src/main/java/rx/internal/operators/OperatorPublish.java +++ b/src/main/java/rx/internal/operators/OperatorPublish.java @@ -123,7 +123,7 @@ public static Observable create(final Observable source, public static Observable create(final Observable source, final Func1, ? extends Observable> selector, final boolean delayError) { - return create(new OnSubscribe() { + return unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber child) { final OnSubscribePublishMulticast op = new OnSubscribePublishMulticast(RxRingBuffer.SIZE, delayError); @@ -155,7 +155,7 @@ public void setProducer(Producer p) { child.add(op); child.add(subscriber); - selector.call(Observable.create(op)).unsafeSubscribe(subscriber); + selector.call(Observable.unsafeCreate(op)).unsafeSubscribe(subscriber); source.unsafeSubscribe(op.subscriber()); } diff --git a/src/main/java/rx/internal/operators/OperatorReplay.java b/src/main/java/rx/internal/operators/OperatorReplay.java index 53511f9c80..045eae96af 100644 --- a/src/main/java/rx/internal/operators/OperatorReplay.java +++ b/src/main/java/rx/internal/operators/OperatorReplay.java @@ -58,7 +58,7 @@ public Object call() { public static Observable multicastSelector( final Func0> connectableFactory, final Func1, ? extends Observable> selector) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber child) { ConnectableObservable co; diff --git a/src/main/java/rx/internal/util/ScalarSynchronousObservable.java b/src/main/java/rx/internal/util/ScalarSynchronousObservable.java index d14269953c..141030266e 100644 --- a/src/main/java/rx/internal/util/ScalarSynchronousObservable.java +++ b/src/main/java/rx/internal/util/ScalarSynchronousObservable.java @@ -122,7 +122,7 @@ public void call() { }; } - return create(new ScalarAsyncOnSubscribe(t, onSchedule)); + return unsafeCreate(new ScalarAsyncOnSubscribe(t, onSchedule)); } /** The OnSubscribe callback for the Observable constructor. */ @@ -225,7 +225,7 @@ public String toString() { * @return the new observable */ public Observable scalarFlatMap(final Func1> func) { - return create(new OnSubscribe() { + return unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber child) { Observable o = func.call(t); diff --git a/src/main/java/rx/observables/AsyncOnSubscribe.java b/src/main/java/rx/observables/AsyncOnSubscribe.java index 35eb618736..e3acb1627e 100644 --- a/src/main/java/rx/observables/AsyncOnSubscribe.java +++ b/src/main/java/rx/observables/AsyncOnSubscribe.java @@ -33,7 +33,7 @@ /** * A utility class to create {@code OnSubscribe} functions that respond correctly to back * pressure requests from subscribers. This is an improvement over - * {@link rx.Observable#create(OnSubscribe) Observable.create(OnSubscribe)} which does not provide + * {@link rx.Observable#unsafeCreate(OnSubscribe) Observable.create(OnSubscribe)} which does not provide * any means of managing back pressure requests out-of-the-box. This variant of an OnSubscribe * function allows for the asynchronous processing of requests. * diff --git a/src/main/java/rx/observables/ConnectableObservable.java b/src/main/java/rx/observables/ConnectableObservable.java index 09ac04257d..f1fffceb5f 100644 --- a/src/main/java/rx/observables/ConnectableObservable.java +++ b/src/main/java/rx/observables/ConnectableObservable.java @@ -76,7 +76,7 @@ public void call(Subscription t1) { * @see ReactiveX documentation: RefCount */ public Observable refCount() { - return create(new OnSubscribeRefCount(this)); + return unsafeCreate(new OnSubscribeRefCount(this)); } /** @@ -125,6 +125,6 @@ public Observable autoConnect(int numberOfSubscribers, Action1(this, numberOfSubscribers, connection)); + return unsafeCreate(new OnSubscribeAutoConnect(this, numberOfSubscribers, connection)); } } diff --git a/src/main/java/rx/observables/SyncOnSubscribe.java b/src/main/java/rx/observables/SyncOnSubscribe.java index dc9e2a7a3c..cf848e7bc4 100644 --- a/src/main/java/rx/observables/SyncOnSubscribe.java +++ b/src/main/java/rx/observables/SyncOnSubscribe.java @@ -29,7 +29,7 @@ /** * A utility class to create {@code OnSubscribe} functions that responds correctly to back * pressure requests from subscribers. This is an improvement over - * {@link rx.Observable#create(OnSubscribe) Observable.create(OnSubscribe)} which does not provide + * {@link rx.Observable#unsafeCreate(OnSubscribe) Observable.create(OnSubscribe)} which does not provide * any means of managing back pressure requests out-of-the-box. * * @param diff --git a/src/main/java/rx/plugins/RxJavaObservableExecutionHook.java b/src/main/java/rx/plugins/RxJavaObservableExecutionHook.java index f1b897fa21..47ab6e4095 100644 --- a/src/main/java/rx/plugins/RxJavaObservableExecutionHook.java +++ b/src/main/java/rx/plugins/RxJavaObservableExecutionHook.java @@ -41,7 +41,7 @@ */ public abstract class RxJavaObservableExecutionHook { // NOPMD /** - * Invoked during the construction by {@link Observable#create(OnSubscribe)} + * Invoked during the construction by {@link Observable#unsafeCreate(OnSubscribe)} *

* This can be used to decorate or replace the onSubscribe function or just perform extra * logging, metrics and other such things and pass through the function. diff --git a/src/perf/java/rx/OneItemPerf.java b/src/perf/java/rx/OneItemPerf.java index 43c6539992..7927268c69 100644 --- a/src/perf/java/rx/OneItemPerf.java +++ b/src/perf/java/rx/OneItemPerf.java @@ -70,7 +70,7 @@ public void call(SingleSubscriber t) { @Setup public void setup() { scalar = Observable.just(1); - one = Observable.create(new OnSubscribe() { + one = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.setProducer(new SingleProducer(t, 1)); diff --git a/src/perf/java/rx/jmh/InputWithIncrementingInteger.java b/src/perf/java/rx/jmh/InputWithIncrementingInteger.java index 9700db74c1..24468bb97b 100644 --- a/src/perf/java/rx/jmh/InputWithIncrementingInteger.java +++ b/src/perf/java/rx/jmh/InputWithIncrementingInteger.java @@ -44,7 +44,7 @@ public void setup(final Blackhole bh) { final int size = getSize(); observable = Observable.range(0, size); - firehose = Observable.create(new OnSubscribe() { + firehose = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/perf/java/rx/operators/FromComparison.java b/src/perf/java/rx/operators/FromComparison.java index 3ba2d3c751..763a938cae 100644 --- a/src/perf/java/rx/operators/FromComparison.java +++ b/src/perf/java/rx/operators/FromComparison.java @@ -49,8 +49,8 @@ public void setup() { Arrays.fill(array, 1); - iterableSource = Observable.create(new OnSubscribeFromIterable(Arrays.asList(array))); - arraySource = Observable.create(new OnSubscribeFromArray(array)); + iterableSource = Observable.unsafeCreate(new OnSubscribeFromIterable(Arrays.asList(array))); + arraySource = Observable.unsafeCreate(new OnSubscribeFromArray(array)); } @Benchmark diff --git a/src/perf/java/rx/operators/OperatorRangePerf.java b/src/perf/java/rx/operators/OperatorRangePerf.java index 53e06a0c94..78711e3d58 100644 --- a/src/perf/java/rx/operators/OperatorRangePerf.java +++ b/src/perf/java/rx/operators/OperatorRangePerf.java @@ -43,7 +43,7 @@ public static class InputUsingRequest { @Setup public void setup(final Blackhole bh) { - observable = Observable.create(new OnSubscribeRange(0, size)); + observable = Observable.unsafeCreate(new OnSubscribeRange(0, size)); this.bh = bh; } @@ -91,7 +91,7 @@ public static class InputWithoutRequest { @Setup public void setup(final Blackhole bh) { - observable = Observable.create(new OnSubscribeRange(0, size)); + observable = Observable.unsafeCreate(new OnSubscribeRange(0, size)); this.bh = bh; } diff --git a/src/perf/java/rx/operators/OperatorSerializePerf.java b/src/perf/java/rx/operators/OperatorSerializePerf.java index cae310b72c..70b61421ec 100644 --- a/src/perf/java/rx/operators/OperatorSerializePerf.java +++ b/src/perf/java/rx/operators/OperatorSerializePerf.java @@ -59,7 +59,7 @@ public void serializedSingleStream(Input input) throws InterruptedException { @Benchmark public void serializedTwoStreamsHighlyContended(final Input input) throws InterruptedException { LatchedObserver o = input.newLatchedObserver(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -101,7 +101,7 @@ public Integer call(Long t1) { @Benchmark public void serializedTwoStreamsSlightlyContended(final InputWithInterval input) throws InterruptedException { LatchedObserver o = input.newLatchedObserver(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -118,7 +118,7 @@ public void call(Subscriber s) { @Benchmark public void serializedTwoStreamsOneFastOneSlow(final InputWithInterval input) throws InterruptedException { LatchedObserver o = input.newLatchedObserver(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber s) { diff --git a/src/perf/java/rx/operators/OperatorTakeLastOnePerf.java b/src/perf/java/rx/operators/OperatorTakeLastOnePerf.java index 3b54689c53..c96f9a2c66 100644 --- a/src/perf/java/rx/operators/OperatorTakeLastOnePerf.java +++ b/src/perf/java/rx/operators/OperatorTakeLastOnePerf.java @@ -46,7 +46,7 @@ public void takeLastOneUsingTakeLast(Input input) { @Benchmark public void takeLastOneUsingTakeLastOne(Input input) { - Observable.create(new OnSubscribeTakeLastOne(input.observable)).subscribe(input.observer); + Observable.unsafeCreate(new OnSubscribeTakeLastOne(input.observable)).subscribe(input.observer); } } diff --git a/src/test/java/rx/BackpressureTests.java b/src/test/java/rx/BackpressureTests.java index f9931f8754..16a1565b0a 100644 --- a/src/test/java/rx/BackpressureTests.java +++ b/src/test/java/rx/BackpressureTests.java @@ -593,7 +593,7 @@ private static Observable incrementingIntegers(final AtomicInteger coun } private static Observable incrementingIntegers(final AtomicInteger counter, final ConcurrentLinkedQueue threadsSeen) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { final AtomicLong requested = new AtomicLong(); @@ -637,7 +637,7 @@ public void request(long n) { * @return */ private static Observable firehose(final AtomicInteger counter) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { int i; diff --git a/src/test/java/rx/CompletableTest.java b/src/test/java/rx/CompletableTest.java index 97a40439c8..23418b60e6 100644 --- a/src/test/java/rx/CompletableTest.java +++ b/src/test/java/rx/CompletableTest.java @@ -391,7 +391,7 @@ public void call(CompletableSubscriber cs) { cs.onError(e); } }) - .andThen(Observable.create(new Observable.OnSubscribe() { + .andThen(Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { hasRun.set(true); diff --git a/src/test/java/rx/ConcatTests.java b/src/test/java/rx/ConcatTests.java index 558f8af1dd..d00d812c52 100644 --- a/src/test/java/rx/ConcatTests.java +++ b/src/test/java/rx/ConcatTests.java @@ -149,7 +149,7 @@ public void testConcatCovariance4() { Media media = new Media(); HorrorMovie horrorMovie2 = new HorrorMovie(); - Observable o1 = Observable.create(new OnSubscribe() { + Observable o1 = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) { diff --git a/src/test/java/rx/EventStream.java b/src/test/java/rx/EventStream.java index 632e649601..91a6482a5c 100644 --- a/src/test/java/rx/EventStream.java +++ b/src/test/java/rx/EventStream.java @@ -32,7 +32,7 @@ private EventStream() { throw new IllegalStateException("No instances!"); } public static Observable getEventStream(final String type, final int numInstances) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { diff --git a/src/test/java/rx/MergeTests.java b/src/test/java/rx/MergeTests.java index 07bba783ea..c42579cc37 100644 --- a/src/test/java/rx/MergeTests.java +++ b/src/test/java/rx/MergeTests.java @@ -80,7 +80,7 @@ public void testMergeCovariance3() { @Test public void testMergeCovariance4() { - Observable o1 = Observable.create(new OnSubscribe() { + Observable o1 = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) { diff --git a/src/test/java/rx/ObservableTests.java b/src/test/java/rx/ObservableTests.java index bed04b4cdc..1ad7daaa72 100644 --- a/src/test/java/rx/ObservableTests.java +++ b/src/test/java/rx/ObservableTests.java @@ -94,7 +94,7 @@ public void fromArityArgs1() { @Test public void testCreate() { - Observable observable = Observable.create(new OnSubscribe() { + Observable observable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber Observer) { @@ -140,7 +140,7 @@ public void testCountZeroItems() { @Test public void testCountError() { - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber obsv) { obsv.onError(new RuntimeException()); @@ -289,7 +289,7 @@ public void testOnSubscribeFails() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); final RuntimeException re = new RuntimeException("bad impl"); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { @@ -330,7 +330,7 @@ public void testCustomObservableWithErrorInObserverAsynchronous() throws Interru final CountDownLatch latch = new CountDownLatch(1); final AtomicInteger count = new AtomicInteger(); final AtomicReference error = new AtomicReference(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -395,7 +395,7 @@ public void onNext(String v) { public void testCustomObservableWithErrorInObserverSynchronous() { final AtomicInteger count = new AtomicInteger(); final AtomicReference error = new AtomicReference(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { @@ -445,7 +445,7 @@ public void onNext(String v) { public void testCustomObservableWithErrorInObservableSynchronous() { final AtomicInteger count = new AtomicInteger(); final AtomicReference error = new AtomicReference(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { @@ -484,7 +484,7 @@ public void onNext(String v) { @Test public void testPublishLast() throws InterruptedException { final AtomicInteger count = new AtomicInteger(); - ConnectableObservable connectable = Observable.create(new OnSubscribe() { + ConnectableObservable connectable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { count.incrementAndGet(); @@ -522,7 +522,7 @@ public void call(String value) { @Test public void testReplay() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - ConnectableObservable o = Observable.create(new OnSubscribe() { + ConnectableObservable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -577,7 +577,7 @@ public void call(String v) { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -625,7 +625,7 @@ public void call(String v) { @Test public void testCacheWithCapacity() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -711,7 +711,7 @@ public void call(Object t1) { public void testErrorThrownWithoutErrorHandlerAsynchronous() throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); final AtomicReference exception = new AtomicReference(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -1109,7 +1109,7 @@ public void testForEachWithNull() { @Test public void nullOnSubscribe() { - Observable source = Observable.create((OnSubscribe)null); + Observable source = Observable.unsafeCreate((OnSubscribe)null); try { source.subscribe(); @@ -1147,7 +1147,7 @@ public void nullSubscriber() { @Test public void testCacheHint() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { diff --git a/src/test/java/rx/SubscriberTest.java b/src/test/java/rx/SubscriberTest.java index 5180966a1a..a57f2b0229 100644 --- a/src/test/java/rx/SubscriberTest.java +++ b/src/test/java/rx/SubscriberTest.java @@ -229,7 +229,7 @@ public void testRequestToObservable() { TestSubscriber ts = new TestSubscriber(); ts.request(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -252,7 +252,7 @@ public void testRequestThroughMap() { TestSubscriber ts = new TestSubscriber(); ts.request(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -282,7 +282,7 @@ public void testRequestThroughTakeThatReducesRequest() { TestSubscriber ts = new TestSubscriber(); ts.request(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -305,7 +305,7 @@ public void testRequestThroughTakeWhereRequestIsSmallerThanTake() { TestSubscriber ts = new TestSubscriber(); ts.request(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/exceptions/ExceptionsTest.java b/src/test/java/rx/exceptions/ExceptionsTest.java index 5fe0f18d69..07bcb644a8 100644 --- a/src/test/java/rx/exceptions/ExceptionsTest.java +++ b/src/test/java/rx/exceptions/ExceptionsTest.java @@ -254,10 +254,10 @@ public void onNext(Integer integer) { @Test(expected = OnErrorFailedException.class) public void testOnErrorExceptionIsThrownFromSubscribe() { - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s1) { - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s2) { throw new IllegalArgumentException("original exception"); @@ -270,10 +270,10 @@ public void call(Subscriber s2) { @Test(expected = OnErrorFailedException.class) public void testOnErrorExceptionIsThrownFromUnsafeSubscribe() { - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s1) { - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s2) { throw new IllegalArgumentException("original exception"); diff --git a/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java b/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java index 45a109e885..4cff913cea 100644 --- a/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java +++ b/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java @@ -239,7 +239,7 @@ public void testNoBufferingOrBlockingOfSequence() throws Throwable { final CountDownLatch timeHasPassed = new CountDownLatch(COUNT); final AtomicBoolean running = new AtomicBoolean(true); final AtomicInteger count = new AtomicInteger(0); - final Observable obs = Observable.create(new Observable.OnSubscribe() { + final Observable obs = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber o) { diff --git a/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java b/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java index 97d8cdb250..81f54dcdca 100644 --- a/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java +++ b/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java @@ -65,7 +65,7 @@ public void testExceptionWithMoreThanOneElement() throws Throwable { @Test public void testToFutureWithException() { - Observable obs = Observable.create(new OnSubscribe() { + Observable obs = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { @@ -85,7 +85,7 @@ public void call(Subscriber observer) { @Test(expected = CancellationException.class) public void testGetAfterCancel() throws Exception { - Observable obs = Observable.create(new OperationNeverComplete()); + Observable obs = Observable.unsafeCreate(new OperationNeverComplete()); Future f = toFuture(obs); boolean cancelled = f.cancel(true); assertTrue(cancelled); // because OperationNeverComplete never does @@ -94,7 +94,7 @@ public void testGetAfterCancel() throws Exception { @Test(expected = CancellationException.class) public void testGetWithTimeoutAfterCancel() throws Exception { - Observable obs = Observable.create(new OperationNeverComplete()); + Observable obs = Observable.unsafeCreate(new OperationNeverComplete()); Future f = toFuture(obs); boolean cancelled = f.cancel(true); assertTrue(cancelled); // because OperationNeverComplete never does diff --git a/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java b/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java index e641227f01..91902b2c77 100644 --- a/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java +++ b/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java @@ -55,7 +55,7 @@ public void testToIterator() { @Test(expected = TestException.class) public void testToIteratorWithException() { - Observable obs = Observable.create(new OnSubscribe() { + Observable obs = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { @@ -75,7 +75,7 @@ public void call(Subscriber observer) { @Test(expected = TestException.class) public void testExceptionThrownFromOnSubscribe() { - Iterable strings = Observable.create(new Observable.OnSubscribe() { + Iterable strings = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber subscriber) { throw new TestException("intentional"); diff --git a/src/test/java/rx/internal/operators/CachedObservableTest.java b/src/test/java/rx/internal/operators/CachedObservableTest.java index a642d80b03..40fe2e56de 100644 --- a/src/test/java/rx/internal/operators/CachedObservableTest.java +++ b/src/test/java/rx/internal/operators/CachedObservableTest.java @@ -85,7 +85,7 @@ public void testColdReplayBackpressure() { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new Observable.OnSubscribe() { + Observable o = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -220,7 +220,7 @@ public void testAsyncComeAndGo() { @Test public void testNoMissingBackpressureException() { final int m = 4 * 1000 * 1000; - Observable firehose = Observable.create(new OnSubscribe() { + Observable firehose = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { for (int i = 0; i < m; i++) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java b/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java index c3e7480fa7..7f9bf0ff49 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java @@ -51,7 +51,7 @@ public void setUp() { private Observable createObservable(final String[] values, final long interval, final Throwable e) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { @@ -90,7 +90,7 @@ public void testAmb() { Observable observable3 = createObservable(new String[] { "3", "33", "333", "3333" }, 3000, null); - Observable o = Observable.create(amb(observable1, + Observable o = Observable.unsafeCreate(amb(observable1, observable2, observable3)); @SuppressWarnings("unchecked") @@ -119,7 +119,7 @@ public void testAmb2() { Observable observable3 = createObservable(new String[] {}, 3000, new IOException("fake exception")); - Observable o = Observable.create(amb(observable1, + Observable o = Observable.unsafeCreate(amb(observable1, observable2, observable3)); @SuppressWarnings("unchecked") @@ -146,7 +146,7 @@ public void testAmb3() { Observable observable3 = createObservable(new String[] { "3" }, 3000, null); - Observable o = Observable.create(amb(observable1, + Observable o = Observable.unsafeCreate(amb(observable1, observable2, observable3)); @SuppressWarnings("unchecked") @@ -165,7 +165,7 @@ public void testProducerRequestThroughAmb() { ts.requestMore(3); final AtomicLong requested1 = new AtomicLong(); final AtomicLong requested2 = new AtomicLong(); - Observable o1 = Observable.create(new OnSubscribe() { + Observable o1 = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -181,7 +181,7 @@ public void request(long n) { } }); - Observable o2 = Observable.create(new OnSubscribe() { + Observable o2 = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeCollectTest.java b/src/test/java/rx/internal/operators/OnSubscribeCollectTest.java index 859ecd63c9..75d6b51954 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeCollectTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeCollectTest.java @@ -130,7 +130,7 @@ public void call(Throwable t) { final RuntimeException e1 = new RuntimeException(); final RuntimeException e2 = new RuntimeException(); TestSubscriber> ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -171,7 +171,7 @@ public void call(List t1, Integer t2) { public void testCollectorFailureDoesNotResultInErrorAndCompletedEmissions() { final RuntimeException e1 = new RuntimeException(); TestSubscriber> ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -209,7 +209,7 @@ public void testCollectorFailureDoesNotResultInErrorAndOnNextEmissions() { final RuntimeException e1 = new RuntimeException(); TestSubscriber> ts = TestSubscriber.create(); final AtomicBoolean added = new AtomicBoolean(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeFromEmitterTest.java b/src/test/java/rx/internal/operators/OnSubscribeCreateTest.java similarity index 80% rename from src/test/java/rx/internal/operators/OnSubscribeFromEmitterTest.java rename to src/test/java/rx/internal/operators/OnSubscribeCreateTest.java index 8298625a9b..2d8e5f843c 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeFromEmitterTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeCreateTest.java @@ -32,7 +32,7 @@ import rx.plugins.RxJavaHooks; import rx.subjects.PublishSubject; -public class OnSubscribeFromEmitterTest { +public class OnSubscribeCreateTest { PublishEmitter source; @@ -49,7 +49,7 @@ public void before() { @Test public void normalBuffered() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); source.onNext(1); source.onNext(2); @@ -70,7 +70,7 @@ public void normalBuffered() { @Test public void normalDrop() { - Observable.fromEmitter(source, Emitter.BackpressureMode.DROP).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.DROP).subscribe(ts); source.onNext(1); @@ -86,7 +86,7 @@ public void normalDrop() { @Test public void normalLatest() { - Observable.fromEmitter(source, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.LATEST).subscribe(ts); source.onNext(1); @@ -102,7 +102,7 @@ public void normalLatest() { @Test public void normalNone() { - Observable.fromEmitter(source, Emitter.BackpressureMode.NONE).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.NONE).subscribe(ts); source.onNext(1); source.onNext(2); @@ -115,7 +115,7 @@ public void normalNone() { @Test public void normalNoneRequested() { - Observable.fromEmitter(source, Emitter.BackpressureMode.NONE).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.NONE).subscribe(ts); ts.requestMore(2); source.onNext(1); @@ -130,7 +130,7 @@ public void normalNoneRequested() { @Test public void normalError() { - Observable.fromEmitter(source, Emitter.BackpressureMode.ERROR).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.ERROR).subscribe(ts); source.onNext(1); source.onNext(2); @@ -140,7 +140,7 @@ public void normalError() { ts.assertError(MissingBackpressureException.class); ts.assertNotCompleted(); - Assert.assertEquals("fromEmitter: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); + Assert.assertEquals("create: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); } @Test @@ -153,13 +153,13 @@ public void call(Emitter emitter) { //don't check for unsubscription emitter.onNext(2); }}; - Observable.fromEmitter(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); + Observable.create(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); ts.assertNoValues(); ts.assertError(MissingBackpressureException.class); ts.assertNotCompleted(); - Assert.assertEquals("fromEmitter: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); + Assert.assertEquals("create: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); } @Test @@ -172,13 +172,13 @@ public void call(Emitter emitter) { //don't check for unsubscription emitter.onCompleted(); }}; - Observable.fromEmitter(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); + Observable.create(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); ts.assertNoValues(); ts.assertError(MissingBackpressureException.class); ts.assertNotCompleted(); - Assert.assertEquals("fromEmitter: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); + Assert.assertEquals("create: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); } @Test @@ -199,13 +199,13 @@ public void call(Emitter emitter) { //don't check for unsubscription emitter.onError(e); }}; - Observable.fromEmitter(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); + Observable.create(source, Emitter.BackpressureMode.ERROR).unsafeSubscribe(ts); ts.assertNoValues(); ts.assertError(MissingBackpressureException.class); ts.assertNotCompleted(); - Assert.assertEquals("fromEmitter: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); + Assert.assertEquals("create: could not emit value due to lack of requests", ts.getOnErrorEvents().get(0).getMessage()); assertEquals(Arrays.asList(e), list); } finally { RxJavaHooks.reset(); @@ -214,7 +214,7 @@ public void call(Emitter emitter) { @Test public void errorBuffered() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); source.onNext(1); source.onNext(2); @@ -233,7 +233,7 @@ public void errorBuffered() { @Test public void errorLatest() { - Observable.fromEmitter(source, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.LATEST).subscribe(ts); source.onNext(1); source.onNext(2); @@ -248,7 +248,7 @@ public void errorLatest() { @Test public void errorNone() { - Observable.fromEmitter(source, Emitter.BackpressureMode.NONE).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.NONE).subscribe(ts); source.onNext(1); source.onNext(2); @@ -263,7 +263,7 @@ public void errorNone() { @Test public void unsubscribedBuffer() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); ts.unsubscribe(); source.onNext(1); @@ -279,7 +279,7 @@ public void unsubscribedBuffer() { @Test public void unsubscribedLatest() { - Observable.fromEmitter(source, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.LATEST).subscribe(ts); ts.unsubscribe(); source.onNext(1); @@ -295,7 +295,7 @@ public void unsubscribedLatest() { @Test public void unsubscribedError() { - Observable.fromEmitter(source, Emitter.BackpressureMode.ERROR).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.ERROR).subscribe(ts); ts.unsubscribe(); source.onNext(1); @@ -311,7 +311,7 @@ public void unsubscribedError() { @Test public void unsubscribedDrop() { - Observable.fromEmitter(source, Emitter.BackpressureMode.DROP).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.DROP).subscribe(ts); ts.unsubscribe(); source.onNext(1); @@ -327,7 +327,7 @@ public void unsubscribedDrop() { @Test public void unsubscribedNone() { - Observable.fromEmitter(source, Emitter.BackpressureMode.NONE).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.NONE).subscribe(ts); ts.unsubscribe(); source.onNext(1); @@ -343,7 +343,7 @@ public void unsubscribedNone() { @Test public void unsubscribedNoCancelBuffer() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); ts.unsubscribe(); sourceNoCancel.onNext(1); @@ -359,7 +359,7 @@ public void unsubscribedNoCancelBuffer() { @Test public void unsubscribedNoCancelLatest() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); ts.unsubscribe(); sourceNoCancel.onNext(1); @@ -375,7 +375,7 @@ public void unsubscribedNoCancelLatest() { @Test public void unsubscribedNoCancelError() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.ERROR).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.ERROR).subscribe(ts); ts.unsubscribe(); sourceNoCancel.onNext(1); @@ -391,7 +391,7 @@ public void unsubscribedNoCancelError() { @Test public void unsubscribedNoCancelDrop() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.DROP).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.DROP).subscribe(ts); ts.unsubscribe(); sourceNoCancel.onNext(1); @@ -407,7 +407,7 @@ public void unsubscribedNoCancelDrop() { @Test public void unsubscribedNoCancelNone() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.NONE).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.NONE).subscribe(ts); ts.unsubscribe(); sourceNoCancel.onNext(1); @@ -423,7 +423,7 @@ public void unsubscribedNoCancelNone() { @Test public void deferredRequest() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); source.onNext(1); source.onNext(2); @@ -438,7 +438,7 @@ public void deferredRequest() { @Test public void take() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).take(2).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).take(2).subscribe(ts); source.onNext(1); source.onNext(2); @@ -453,7 +453,7 @@ public void take() { @Test public void takeOne() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).take(1).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).take(1).subscribe(ts); ts.requestMore(2); source.onNext(1); @@ -467,7 +467,7 @@ public void takeOne() { @Test public void requestExact() { - Observable.fromEmitter(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(source, Emitter.BackpressureMode.BUFFER).subscribe(ts); ts.requestMore(2); source.onNext(1); @@ -481,7 +481,7 @@ public void requestExact() { @Test public void takeNoCancel() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).take(2).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).take(2).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onNext(2); @@ -496,7 +496,7 @@ public void takeNoCancel() { @Test public void takeOneNoCancel() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).take(1).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).take(1).subscribe(ts); ts.requestMore(2); sourceNoCancel.onNext(1); @@ -510,7 +510,7 @@ public void takeOneNoCancel() { @Test public void unsubscribeNoCancel() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); ts.requestMore(2); sourceNoCancel.onNext(1); @@ -535,7 +535,7 @@ public void onNext(Integer t) { } }; - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts1); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts1); sourceNoCancel.onNext(1); @@ -546,7 +546,7 @@ public void onNext(Integer t) { @Test public void completeInline() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onCompleted(); @@ -560,7 +560,7 @@ public void completeInline() { @Test public void errorInline() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onError(new TestException()); @@ -582,7 +582,7 @@ public void onNext(Integer t) { } }; - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts1); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.BUFFER).subscribe(ts1); sourceNoCancel.onNext(1); sourceNoCancel.onNext(2); @@ -602,7 +602,7 @@ public void onNext(Integer t) { } }; - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); sourceNoCancel.onNext(1); @@ -621,7 +621,7 @@ public void onNext(Integer t) { } }; - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); sourceNoCancel.onNext(1); @@ -632,7 +632,7 @@ public void onNext(Integer t) { @Test public void completeInlineLatest() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onCompleted(); @@ -646,7 +646,7 @@ public void completeInlineLatest() { @Test public void completeInlineExactLatest() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onCompleted(); @@ -660,7 +660,7 @@ public void completeInlineExactLatest() { @Test public void errorInlineLatest() { - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts); sourceNoCancel.onNext(1); sourceNoCancel.onError(new TestException()); @@ -682,7 +682,7 @@ public void onNext(Integer t) { } }; - Observable.fromEmitter(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); + Observable.create(sourceNoCancel, Emitter.BackpressureMode.LATEST).subscribe(ts1); sourceNoCancel.onNext(1); sourceNoCancel.onNext(2); diff --git a/src/test/java/rx/internal/operators/OnSubscribeDetachTest.java b/src/test/java/rx/internal/operators/OnSubscribeDetachTest.java index 6d06019425..7d435bff79 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeDetachTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeDetachTest.java @@ -138,7 +138,7 @@ public void deferredUpstreamProducer() { TestSubscriber ts = new TestSubscriber(0); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { subscriber.set(t); diff --git a/src/test/java/rx/internal/operators/OnSubscribeDoOnEachTest.java b/src/test/java/rx/internal/operators/OnSubscribeDoOnEachTest.java index 8cf5bdd2cc..bec5c4daab 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeDoOnEachTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeDoOnEachTest.java @@ -178,7 +178,7 @@ public void testFatalError() { .flatMap(new Func1>() { @Override public Observable call(Integer integer) { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber o) { throw new NullPointerException("Test NPE"); @@ -229,7 +229,7 @@ public void call(Throwable e) { public void testIfOnNextActionFailsEmitsErrorAndDoesNotFollowWithCompleted() { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { @@ -259,7 +259,7 @@ public void call(Integer t) { public void testIfOnNextActionFailsEmitsErrorAndDoesNotFollowWithOnNext() { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { @@ -298,7 +298,7 @@ public void call(Throwable e) { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException(); final RuntimeException e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeFromArrayTest.java b/src/test/java/rx/internal/operators/OnSubscribeFromArrayTest.java index cd117169d2..1d5368f097 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeFromArrayTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeFromArrayTest.java @@ -29,7 +29,7 @@ Observable create(int n) { for (int i = 0; i < n; i++) { array[i] = i; } - return Observable.create(new OnSubscribeFromArray(array)); + return Observable.unsafeCreate(new OnSubscribeFromArray(array)); } @Test public void simple() { diff --git a/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java b/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java index 43993ca137..0464ed8dc0 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java @@ -38,12 +38,12 @@ public class OnSubscribeFromIterableTest { @Test(expected = NullPointerException.class) public void testNull() { - Observable.create(new OnSubscribeFromIterable(null)); + Observable.unsafeCreate(new OnSubscribeFromIterable(null)); } @Test public void testListIterable() { - Observable observable = Observable.create(new OnSubscribeFromIterable(Arrays. asList("one", "two", "three"))); + Observable observable = Observable.unsafeCreate(new OnSubscribeFromIterable(Arrays. asList("one", "two", "three"))); @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); @@ -86,7 +86,7 @@ public void remove() { } }; - Observable observable = Observable.create(new OnSubscribeFromIterable(it)); + Observable observable = Observable.unsafeCreate(new OnSubscribeFromIterable(it)); @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); diff --git a/src/test/java/rx/internal/operators/OnSubscribeMapTest.java b/src/test/java/rx/internal/operators/OnSubscribeMapTest.java index 6477bdbdc5..12c24cb303 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeMapTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeMapTest.java @@ -299,7 +299,7 @@ public void call(Object object) { }; try { - Observable.create(creator).flatMap(manyMapper).map(mapper).subscribe(onNext); + Observable.unsafeCreate(creator).flatMap(manyMapper).map(mapper).subscribe(onNext); } catch (RuntimeException e) { e.printStackTrace(); throw e; diff --git a/src/test/java/rx/internal/operators/OnSubscribeReduceTest.java b/src/test/java/rx/internal/operators/OnSubscribeReduceTest.java index 9ae07b6112..7d0f1a6cc3 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeReduceTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeReduceTest.java @@ -145,7 +145,7 @@ public void testBackpressureWithInitialValue() throws InterruptedException { @Test public void testNoInitialValueDoesNotEmitMultipleTerminalEvents() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -176,7 +176,7 @@ public Integer call(Integer a, Integer b) { @Test public void testNoInitialValueUpstreamEmitsMoreOnNextDespiteUnsubscription() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -226,7 +226,7 @@ public void call(Throwable t) { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException("e1"); final Throwable e2 = new RuntimeException("e2"); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java b/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java index e0761a576a..a64f808e78 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java @@ -322,7 +322,7 @@ public void call() { } private Observable synchronousInterval() { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { @@ -341,7 +341,7 @@ public void call(Subscriber subscriber) { public void onlyFirstShouldSubscribeAndLastUnsubscribe() { final AtomicInteger subscriptionCount = new AtomicInteger(); final AtomicInteger unsubscriptionCount = new AtomicInteger(); - Observable observable = Observable.create(new OnSubscribe() { + Observable observable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { subscriptionCount.incrementAndGet(); diff --git a/src/test/java/rx/internal/operators/OnSubscribeToMapTest.java b/src/test/java/rx/internal/operators/OnSubscribeToMapTest.java index 1ed6a542a8..97b7f33673 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeToMapTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeToMapTest.java @@ -301,7 +301,7 @@ public Map call() { public void testFactoryFailureDoesNotAllowErrorAndCompletedEmissions() { TestSubscriber> ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -342,7 +342,7 @@ public void call(Throwable t) { TestSubscriber> ts = TestSubscriber.create(0); final RuntimeException e1 = new RuntimeException(); final RuntimeException e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -377,7 +377,7 @@ public Integer call(Integer t) { public void testFactoryFailureDoesNotAllowErrorThenOnNextEmissions() { TestSubscriber> ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeToMultimapTest.java b/src/test/java/rx/internal/operators/OnSubscribeToMultimapTest.java index 91fb03c0be..a27c2ae662 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeToMultimapTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeToMultimapTest.java @@ -395,7 +395,7 @@ public Collection call(Integer k) { public void testKeySelectorFailureDoesNotAllowErrorAndCompletedEmissions() { TestSubscriber>> ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -436,7 +436,7 @@ public void call(Throwable t) { TestSubscriber>> ts = TestSubscriber.create(0); final RuntimeException e1 = new RuntimeException(); final RuntimeException e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -471,7 +471,7 @@ public Integer call(Integer t) { public void testFactoryFailureDoesNotAllowErrorThenOnNextEmissions() { TestSubscriber>> ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java b/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java index e169cbb68e..3a93d4cc8f 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java @@ -254,7 +254,7 @@ public Subscription call() { Func1> observableFactory = new Func1>() { @Override public Observable call(Subscription subscription) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { throw new TestException(); diff --git a/src/test/java/rx/internal/operators/OperatorAllTest.java b/src/test/java/rx/internal/operators/OperatorAllTest.java index 0ca615d515..5ac74526fa 100644 --- a/src/test/java/rx/internal/operators/OperatorAllTest.java +++ b/src/test/java/rx/internal/operators/OperatorAllTest.java @@ -186,7 +186,7 @@ public Boolean call(Object object) { @Test public void testDoesNotEmitMultipleTerminalEvents() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -216,7 +216,7 @@ public Boolean call(Integer t) { @Test public void testUpstreamEmitsOnNextAfterFailureWithoutCheckingSubscription() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -263,7 +263,7 @@ public void call(Throwable t) { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException(); final Throwable e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OperatorAnyTest.java b/src/test/java/rx/internal/operators/OperatorAnyTest.java index 776d6e8f72..0eaf6b07ec 100644 --- a/src/test/java/rx/internal/operators/OperatorAnyTest.java +++ b/src/test/java/rx/internal/operators/OperatorAnyTest.java @@ -278,7 +278,7 @@ public Boolean call(Object object) { @Test public void testUpstreamEmitsOnNextAfterFailureWithoutCheckingSubscription() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -314,7 +314,7 @@ public Boolean call(Integer t) { @Test public void testUpstreamEmitsOnNextWithoutCheckingSubscription() { TestSubscriber ts = TestSubscriber.create(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -356,7 +356,7 @@ public void call(Throwable t) { TestSubscriber ts = TestSubscriber.create(); final RuntimeException e1 = new RuntimeException(); final Throwable e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OperatorBufferTest.java b/src/test/java/rx/internal/operators/OperatorBufferTest.java index 99f4cf5c0f..5cd3b2fa96 100644 --- a/src/test/java/rx/internal/operators/OperatorBufferTest.java +++ b/src/test/java/rx/internal/operators/OperatorBufferTest.java @@ -52,7 +52,7 @@ public void before() { @Test public void testComplete() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { observer.onCompleted(); @@ -69,7 +69,7 @@ public void call(Subscriber observer) { @Test public void testSkipAndCountOverlappingBuffers() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { observer.onNext("one"); @@ -94,7 +94,7 @@ public void call(Subscriber observer) { @Test public void testSkipAndCountGaplessBuffers() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { observer.onNext("one"); @@ -119,7 +119,7 @@ public void call(Subscriber observer) { @Test public void testSkipAndCountBuffersWithGaps() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { observer.onNext("one"); @@ -144,7 +144,7 @@ public void call(Subscriber observer) { @Test public void testTimedAndCount() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -175,7 +175,7 @@ public void call(Subscriber observer) { @Test public void testTimed() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 97); @@ -208,7 +208,7 @@ public void call(Subscriber observer) { @Test public void testObservableBasedOpenerAndCloser() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -220,7 +220,7 @@ public void call(Subscriber observer) { } }); - Observable openings = Observable.create(new Observable.OnSubscribe() { + Observable openings = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, new Object(), 50); @@ -232,7 +232,7 @@ public void call(Subscriber observer) { Func1> closer = new Func1>() { @Override public Observable call(Object opening) { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, new Object(), 100); @@ -256,7 +256,7 @@ public void call(Subscriber observer) { @Test public void testObservableBasedCloser() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -271,7 +271,7 @@ public void call(Subscriber observer) { Func0> closer = new Func0>() { @Override public Observable call() { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, new Object(), 100); @@ -786,7 +786,7 @@ public void testProducerRequestThroughBufferWithSize1() { TestSubscriber> ts = new TestSubscriber>(); ts.requestMore(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -811,7 +811,7 @@ public void request(long n) { public void testProducerRequestThroughBufferWithSize2() { TestSubscriber> ts = new TestSubscriber>(); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -834,7 +834,7 @@ public void testProducerRequestThroughBufferWithSize3() { TestSubscriber> ts = new TestSubscriber>(); ts.requestMore(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -858,7 +858,7 @@ public void request(long n) { public void testProducerRequestThroughBufferWithSize4() { TestSubscriber> ts = new TestSubscriber>(); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -882,7 +882,7 @@ public void testProducerRequestOverflowThroughBufferWithSize1() { TestSubscriber> ts = new TestSubscriber>(); ts.requestMore(Long.MAX_VALUE / 2); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -905,7 +905,7 @@ public void testProducerRequestOverflowThroughBufferWithSize2() { TestSubscriber> ts = new TestSubscriber>(); ts.requestMore(Long.MAX_VALUE / 2); final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber s) { @@ -926,7 +926,7 @@ public void request(long n) { @Test public void testProducerRequestOverflowThroughBufferWithSize3() { final AtomicLong requested = new AtomicLong(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorConcatTest.java b/src/test/java/rx/internal/operators/OperatorConcatTest.java index 564eb9e709..1e818accda 100644 --- a/src/test/java/rx/internal/operators/OperatorConcatTest.java +++ b/src/test/java/rx/internal/operators/OperatorConcatTest.java @@ -115,7 +115,7 @@ public void testConcatObservableOfObservables() { final Observable odds = Observable.from(o); final Observable even = Observable.from(e); - Observable> observableOfObservables = Observable.create(new Observable.OnSubscribe>() { + Observable> observableOfObservables = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { @@ -144,7 +144,7 @@ public void testSimpleAsyncConcat() { TestObservable o1 = new TestObservable("one", "two", "three"); TestObservable o2 = new TestObservable("four", "five", "six"); - Observable.concat(Observable.create(o1), Observable.create(o2)).subscribe(observer); + Observable.concat(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2)).subscribe(observer); try { // wait for async observables to complete @@ -179,7 +179,7 @@ public void testNestedAsyncConcat() throws Throwable { final AtomicReference parent = new AtomicReference(); final CountDownLatch parentHasStarted = new CountDownLatch(1); - Observable> observableOfObservables = Observable.create(new Observable.OnSubscribe>() { + Observable> observableOfObservables = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(final Subscriber> observer) { @@ -193,12 +193,12 @@ public void run() { // emit first if (!s.isUnsubscribed()) { System.out.println("Emit o1"); - observer.onNext(Observable.create(o1)); + observer.onNext(Observable.unsafeCreate(o1)); } // emit second if (!s.isUnsubscribed()) { System.out.println("Emit o2"); - observer.onNext(Observable.create(o2)); + observer.onNext(Observable.unsafeCreate(o2)); } // wait until sometime later and emit third @@ -209,7 +209,7 @@ public void run() { } if (!s.isUnsubscribed()) { System.out.println("Emit o3"); - observer.onNext(Observable.create(o3)); + observer.onNext(Observable.unsafeCreate(o3)); } } catch (Throwable e) { @@ -285,7 +285,7 @@ public void testBlockedObservableOfObservables() { final CountDownLatch callOnce = new CountDownLatch(1); final CountDownLatch okToContinue = new CountDownLatch(1); TestObservable> observableOfObservables = new TestObservable>(callOnce, okToContinue, odds, even); - Observable concatF = Observable.concat(Observable.create(observableOfObservables)); + Observable concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables)); concatF.subscribe(observer); try { //Block main thread to allow observables to serve up o1. @@ -323,8 +323,8 @@ public void testConcatConcurrentWithInfinity() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); @SuppressWarnings("unchecked") - TestObservable> observableOfObservables = new TestObservable>(Observable.create(w1), Observable.create(w2)); - Observable concatF = Observable.concat(Observable.create(observableOfObservables)); + TestObservable> observableOfObservables = new TestObservable>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2)); + Observable concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables)); concatF.take(50).subscribe(observer); @@ -357,13 +357,13 @@ public void testConcatNonBlockingObservables() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable> observableOfObservables = Observable.create(new Observable.OnSubscribe>() { + Observable> observableOfObservables = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { // simulate what would happen in an observable - observer.onNext(Observable.create(w1)); - observer.onNext(Observable.create(w2)); + observer.onNext(Observable.unsafeCreate(w1)); + observer.onNext(Observable.unsafeCreate(w2)); observer.onCompleted(); } @@ -408,7 +408,7 @@ public void testConcatUnsubscribe() { @SuppressWarnings("unchecked") final Observer observer = mock(Observer.class); - final Observable concat = Observable.concat(Observable.create(w1), Observable.create(w2)); + final Observable concat = Observable.concat(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2)); try { // Subscribe @@ -450,8 +450,8 @@ public void testConcatUnsubscribeConcurrent() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); @SuppressWarnings("unchecked") - TestObservable> observableOfObservables = new TestObservable>(Observable.create(w1), Observable.create(w2)); - Observable concatF = Observable.concat(Observable.create(observableOfObservables)); + TestObservable> observableOfObservables = new TestObservable>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2)); + Observable concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables)); Subscription s1 = concatF.subscribe(observer); @@ -618,7 +618,7 @@ public void testMultipleObservers() { @Test public void concatVeryLongObservableOfObservables() { final int n = 10000; - Observable> source = Observable.create(new OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new OnSubscribe>() { @Override public void call(Subscriber> s) { for (int i = 0; i < n; i++) { @@ -650,7 +650,7 @@ public void call(Subscriber> s) { @Test public void concatVeryLongObservableOfObservablesTakeHalf() { final int n = 10000; - Observable> source = Observable.create(new OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new OnSubscribe>() { @Override public void call(Subscriber> s) { for (int i = 0; i < n; i++) { @@ -724,7 +724,7 @@ public void testInnerBackpressureWithoutAlignedBoundaries() { // https://github.com/ReactiveX/RxJava/issues/1818 @Test public void testConcatWithNonCompliantSourceDoubleOnComplete() { - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorDebounceTest.java b/src/test/java/rx/internal/operators/OperatorDebounceTest.java index ae509c743d..bf3cad52d5 100644 --- a/src/test/java/rx/internal/operators/OperatorDebounceTest.java +++ b/src/test/java/rx/internal/operators/OperatorDebounceTest.java @@ -57,7 +57,7 @@ public void before() { @Test public void testDebounceWithCompleted() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 100, "one"); // Should be skipped since "two" will arrive before the timeout expires. @@ -82,7 +82,7 @@ public void call(Subscriber observer) { @Test public void testDebounceNeverEmits() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { // all should be skipped since they are happening faster than the 200ms timeout @@ -111,7 +111,7 @@ public void call(Subscriber observer) { @Test public void testDebounceWithError() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { Exception error = new TestException(); diff --git a/src/test/java/rx/internal/operators/OperatorDoOnRequestTest.java b/src/test/java/rx/internal/operators/OperatorDoOnRequestTest.java index e471376e93..d1ddd22c85 100644 --- a/src/test/java/rx/internal/operators/OperatorDoOnRequestTest.java +++ b/src/test/java/rx/internal/operators/OperatorDoOnRequestTest.java @@ -99,7 +99,7 @@ public void dontRequestIfDownstreamRequestsLate() { final AtomicReference producer = new AtomicReference(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.setProducer(new Producer() { diff --git a/src/test/java/rx/internal/operators/OperatorDoOnSubscribeTest.java b/src/test/java/rx/internal/operators/OperatorDoOnSubscribeTest.java index 4765a5dfe3..2f60a9e8c5 100644 --- a/src/test/java/rx/internal/operators/OperatorDoOnSubscribeTest.java +++ b/src/test/java/rx/internal/operators/OperatorDoOnSubscribeTest.java @@ -76,7 +76,7 @@ public void testDoOnUnSubscribeWorksWithRefCount() throws Exception { final AtomicInteger countBefore = new AtomicInteger(); final AtomicInteger countAfter = new AtomicInteger(); final AtomicReference> sref = new AtomicReference>(); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorGroupByTest.java b/src/test/java/rx/internal/operators/OperatorGroupByTest.java index 1cad5330c3..5d035bcd82 100644 --- a/src/test/java/rx/internal/operators/OperatorGroupByTest.java +++ b/src/test/java/rx/internal/operators/OperatorGroupByTest.java @@ -189,7 +189,7 @@ public void testGroupedEventStream() throws Throwable { final int count = 100; final int groupCount = 2; - Observable es = Observable.create(new Observable.OnSubscribe() { + Observable es = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -602,7 +602,7 @@ public void call(String s) { public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsAndThenComplete() throws InterruptedException { final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { @@ -680,7 +680,7 @@ public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenSu System.err.println("----------------------------------------------------------------------------------------------"); final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { @@ -771,7 +771,7 @@ public void call(String s) { public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenObservesOnAndDelaysAndThenCompletes() throws InterruptedException { final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { @@ -847,7 +847,7 @@ public void call(String s) { @Test public void testGroupsWithNestedSubscribeOn() throws InterruptedException { final ArrayList results = new ArrayList(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { @@ -903,7 +903,7 @@ public void call(String s) { @Test public void testGroupsWithNestedObserveOn() throws InterruptedException { final ArrayList results = new ArrayList(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { @@ -963,7 +963,7 @@ Observable ASYNC_INFINITE_OBSERVABLE_OF_EVENT(final int numGroups, final } Observable SYNC_INFINITE_OBSERVABLE_OF_EVENT(final int numGroups, final AtomicInteger subscribeCounter, final AtomicInteger sentEventCounter) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber op) { @@ -1375,7 +1375,7 @@ public void call(String s) { @Test public void testGroupByUnsubscribe() { final Subscription s = mock(Subscription.class); - Observable o = Observable.create( + Observable o = Observable.unsafeCreate( new OnSubscribe() { @Override public void call(Subscriber subscriber) { @@ -1419,7 +1419,7 @@ public void onNext(GroupedObservable o) { } } }); - Observable.create( + Observable.unsafeCreate( new OnSubscribe() { @Override public void call(Subscriber subscriber) { diff --git a/src/test/java/rx/internal/operators/OperatorMaterializeTest.java b/src/test/java/rx/internal/operators/OperatorMaterializeTest.java index af090b4379..437593d313 100644 --- a/src/test/java/rx/internal/operators/OperatorMaterializeTest.java +++ b/src/test/java/rx/internal/operators/OperatorMaterializeTest.java @@ -43,7 +43,7 @@ public void testMaterialize1() { "three"); TestObserver Observer = new TestObserver(); - Observable> m = Observable.create(o1).materialize(); + Observable> m = Observable.unsafeCreate(o1).materialize(); m.subscribe(Observer); try { @@ -69,7 +69,7 @@ public void testMaterialize2() { final TestAsyncErrorObservable o1 = new TestAsyncErrorObservable("one", "two", "three"); TestObserver Observer = new TestObserver(); - Observable> m = Observable.create(o1).materialize(); + Observable> m = Observable.unsafeCreate(o1).materialize(); m.subscribe(Observer); try { @@ -94,7 +94,7 @@ public void testMaterialize2() { public void testMultipleSubscribes() throws InterruptedException, ExecutionException { final TestAsyncErrorObservable o = new TestAsyncErrorObservable("one", "two", null, "three"); - Observable> m = Observable.create(o).materialize(); + Observable> m = Observable.unsafeCreate(o).materialize(); assertEquals(3, m.toList().toBlocking().toFuture().get().size()); assertEquals(3, m.toList().toBlocking().toFuture().get().size()); diff --git a/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java b/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java index 7943e30dee..05326cf75a 100644 --- a/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java +++ b/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java @@ -55,8 +55,8 @@ public void before() { @Test public void testErrorDelayed1() { - final Observable o1 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called - final Observable o2 = Observable.create(new TestErrorObservable("one", "two", "three")); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); Observable m = Observable.mergeDelayError(o1, o2); m.subscribe(stringObserver); @@ -76,10 +76,10 @@ public void testErrorDelayed1() { @Test public void testErrorDelayed2() { - final Observable o1 = Observable.create(new TestErrorObservable("one", "two", "three")); - final Observable o2 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called - final Observable o3 = Observable.create(new TestErrorObservable("seven", "eight", null)); - final Observable o4 = Observable.create(new TestErrorObservable("nine")); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called + final Observable o3 = Observable.unsafeCreate(new TestErrorObservable("seven", "eight", null)); + final Observable o4 = Observable.unsafeCreate(new TestErrorObservable("nine")); Observable m = Observable.mergeDelayError(o1, o2, o3, o4); m.subscribe(stringObserver); @@ -101,10 +101,10 @@ public void testErrorDelayed2() { @Test public void testErrorDelayed3() { - final Observable o1 = Observable.create(new TestErrorObservable("one", "two", "three")); - final Observable o2 = Observable.create(new TestErrorObservable("four", "five", "six")); - final Observable o3 = Observable.create(new TestErrorObservable("seven", "eight", null)); - final Observable o4 = Observable.create(new TestErrorObservable("nine")); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("four", "five", "six")); + final Observable o3 = Observable.unsafeCreate(new TestErrorObservable("seven", "eight", null)); + final Observable o4 = Observable.unsafeCreate(new TestErrorObservable("nine")); Observable m = Observable.mergeDelayError(o1, o2, o3, o4); m.subscribe(stringObserver); @@ -124,10 +124,10 @@ public void testErrorDelayed3() { @Test public void testErrorDelayed4() { - final Observable o1 = Observable.create(new TestErrorObservable("one", "two", "three")); - final Observable o2 = Observable.create(new TestErrorObservable("four", "five", "six")); - final Observable o3 = Observable.create(new TestErrorObservable("seven", "eight")); - final Observable o4 = Observable.create(new TestErrorObservable("nine", null)); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("four", "five", "six")); + final Observable o3 = Observable.unsafeCreate(new TestErrorObservable("seven", "eight")); + final Observable o4 = Observable.unsafeCreate(new TestErrorObservable("nine", null)); Observable m = Observable.mergeDelayError(o1, o2, o3, o4); m.subscribe(stringObserver); @@ -153,7 +153,7 @@ public void testErrorDelayed4WithThreading() { // throw the error at the very end so no onComplete will be called after it final TestAsyncErrorObservable o4 = new TestAsyncErrorObservable("nine", null); - Observable m = Observable.mergeDelayError(Observable.create(o1), Observable.create(o2), Observable.create(o3), Observable.create(o4)); + Observable m = Observable.mergeDelayError(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2), Observable.unsafeCreate(o3), Observable.unsafeCreate(o4)); m.subscribe(stringObserver); try { @@ -180,8 +180,8 @@ public void testErrorDelayed4WithThreading() { @Test public void testCompositeErrorDelayed1() { - final Observable o1 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called - final Observable o2 = Observable.create(new TestErrorObservable("one", "two", null)); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("one", "two", null)); Observable m = Observable.mergeDelayError(o1, o2); m.subscribe(stringObserver); @@ -200,8 +200,8 @@ public void testCompositeErrorDelayed1() { @Test public void testCompositeErrorDelayed2() { - final Observable o1 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called - final Observable o2 = Observable.create(new TestErrorObservable("one", "two", null)); + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" from the source (and it should never be sent by the source since onError was called + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("one", "two", null)); Observable m = Observable.mergeDelayError(o1, o2); CaptureObserver w = new CaptureObserver(); @@ -223,10 +223,10 @@ public void testCompositeErrorDelayed2() { @Test public void testMergeObservableOfObservables() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); - Observable> observableOfObservables = Observable.create(new Observable.OnSubscribe>() { + Observable> observableOfObservables = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { @@ -247,8 +247,8 @@ public void call(Subscriber> observer) { @Test public void testMergeArray() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); Observable m = Observable.mergeDelayError(o1, o2); m.subscribe(stringObserver); @@ -260,8 +260,8 @@ public void testMergeArray() { @Test public void testMergeList() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); List> listOfObservables = new ArrayList>(); listOfObservables.add(o1); listOfObservables.add(o2); @@ -277,8 +277,8 @@ public void testMergeList() { // This is pretty much a clone of testMergeList but with the overloaded MergeDelayError for Iterables @Test public void mergeIterable() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); List> listOfObservables = new ArrayList>(); listOfObservables.add(o1); listOfObservables.add(o2); @@ -296,7 +296,7 @@ public void testMergeArrayWithThreading() { final TestASynchronousObservable o1 = new TestASynchronousObservable(); final TestASynchronousObservable o2 = new TestASynchronousObservable(); - Observable m = Observable.mergeDelayError(Observable.create(o1), Observable.create(o2)); + Observable m = Observable.mergeDelayError(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2)); m.subscribe(stringObserver); try { @@ -455,7 +455,7 @@ public void onNext(String args) { } @Test public void testMergeSourceWhichDoesntPropagateExceptionBack() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { try { @@ -527,11 +527,11 @@ public void testErrorInParentObservableDelayed() throws Exception { for (int i = 0; i < 50; i++) { final TestASynchronous1sDelayedObservable o1 = new TestASynchronous1sDelayedObservable(); final TestASynchronous1sDelayedObservable o2 = new TestASynchronous1sDelayedObservable(); - Observable> parentObservable = Observable.create(new Observable.OnSubscribe>() { + Observable> parentObservable = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> op) { - op.onNext(Observable.create(o1)); - op.onNext(Observable.create(o2)); + op.onNext(Observable.unsafeCreate(o1)); + op.onNext(Observable.unsafeCreate(o2)); op.onError(new NullPointerException("throwing exception in parent")); } }); diff --git a/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java b/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java index 56685b1630..21ce364b34 100644 --- a/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java +++ b/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java @@ -72,7 +72,7 @@ public void testMaxConcurrent() { for (int i = 0; i < observableCount; i++) { SubscriptionCheckObservable sco = new SubscriptionCheckObservable(subscriptionCount, maxConcurrent); scos.add(sco); - os.add(Observable.create(sco)); + os.add(Observable.unsafeCreate(sco)); } Iterator iter = Observable.merge(os, maxConcurrent).toBlocking().toIterable().iterator(); diff --git a/src/test/java/rx/internal/operators/OperatorMergeTest.java b/src/test/java/rx/internal/operators/OperatorMergeTest.java index d79649667d..7528cb88d8 100644 --- a/src/test/java/rx/internal/operators/OperatorMergeTest.java +++ b/src/test/java/rx/internal/operators/OperatorMergeTest.java @@ -53,10 +53,10 @@ public void before() { @Test public void testMergeObservableOfObservables() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); - Observable> observableOfObservables = Observable.create(new Observable.OnSubscribe>() { + Observable> observableOfObservables = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { @@ -77,8 +77,8 @@ public void call(Subscriber> observer) { @Test public void testMergeArray() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); Observable m = Observable.merge(o1, o2); m.subscribe(stringObserver); @@ -90,8 +90,8 @@ public void testMergeArray() { @Test public void testMergeList() { - final Observable o1 = Observable.create(new TestSynchronousObservable()); - final Observable o2 = Observable.create(new TestSynchronousObservable()); + final Observable o1 = Observable.unsafeCreate(new TestSynchronousObservable()); + final Observable o2 = Observable.unsafeCreate(new TestSynchronousObservable()); List> listOfObservables = new ArrayList>(); listOfObservables.add(o1); listOfObservables.add(o2); @@ -110,7 +110,7 @@ public void testUnSubscribeObservableOfObservables() throws InterruptedException final AtomicBoolean unsubscribed = new AtomicBoolean(); final CountDownLatch latch = new CountDownLatch(1); - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(final Subscriber> observer) { @@ -172,7 +172,7 @@ public void testMergeArrayWithThreading() { final TestASynchronousObservable o1 = new TestASynchronousObservable(); final TestASynchronousObservable o2 = new TestASynchronousObservable(); - Observable m = Observable.merge(Observable.create(o1), Observable.create(o2)); + Observable m = Observable.merge(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2)); TestSubscriber ts = new TestSubscriber(stringObserver); m.subscribe(ts); @@ -195,7 +195,7 @@ public void testSynchronizationOfMultipleSequences() throws Throwable { final AtomicInteger concurrentCounter = new AtomicInteger(); final AtomicInteger totalCounter = new AtomicInteger(); - Observable m = Observable.merge(Observable.create(o1), Observable.create(o2)); + Observable m = Observable.merge(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2)); m.subscribe(new Subscriber() { @Override @@ -262,8 +262,8 @@ public void onNext(String v) { @Test public void testError1() { // we are using synchronous execution to test this exactly rather than non-deterministic concurrent behavior - final Observable o1 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" - final Observable o2 = Observable.create(new TestErrorObservable("one", "two", "three")); // we expect to lose all of these since o1 is done first and fails + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); // we expect to lose all of these since o1 is done first and fails Observable m = Observable.merge(o1, o2); m.subscribe(stringObserver); @@ -284,10 +284,10 @@ public void testError1() { @Test public void testError2() { // we are using synchronous execution to test this exactly rather than non-deterministic concurrent behavior - final Observable o1 = Observable.create(new TestErrorObservable("one", "two", "three")); - final Observable o2 = Observable.create(new TestErrorObservable("four", null, "six")); // we expect to lose "six" - final Observable o3 = Observable.create(new TestErrorObservable("seven", "eight", null));// we expect to lose all of these since o2 is done first and fails - final Observable o4 = Observable.create(new TestErrorObservable("nine"));// we expect to lose all of these since o2 is done first and fails + final Observable o1 = Observable.unsafeCreate(new TestErrorObservable("one", "two", "three")); + final Observable o2 = Observable.unsafeCreate(new TestErrorObservable("four", null, "six")); // we expect to lose "six" + final Observable o3 = Observable.unsafeCreate(new TestErrorObservable("seven", "eight", null));// we expect to lose all of these since o2 is done first and fails + final Observable o4 = Observable.unsafeCreate(new TestErrorObservable("nine"));// we expect to lose all of these since o2 is done first and fails Observable m = Observable.merge(o1, o2, o3, o4); m.subscribe(stringObserver); @@ -308,7 +308,7 @@ public void testError2() { @Test public void testThrownErrorHandling() { TestSubscriber ts = new TestSubscriber(); - Observable o1 = Observable.create(new OnSubscribe() { + Observable o1 = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -460,7 +460,7 @@ public void testEarlyUnsubscribe() { } private Observable createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(final Scheduler scheduler, final AtomicBoolean unsubscribed) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -499,7 +499,7 @@ public void testConcurrency() { @Test public void testConcurrencyWithSleeping() { - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber s) { @@ -543,7 +543,7 @@ public void call() { @Test public void testConcurrencyWithBrokenOnCompleteContract() { - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber s) { @@ -807,7 +807,7 @@ public void mergeWithNullValues() { public void mergeWithTerminalEventAfterUnsubscribe() { System.out.println("mergeWithTerminalEventAfterUnsubscribe"); TestSubscriber ts = new TestSubscriber(); - Observable bad = Observable.create(new OnSubscribe() { + Observable bad = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -984,7 +984,7 @@ public void mergeManyAsyncSingle() { @Override public Observable call(final Integer i) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorObserveOnTest.java b/src/test/java/rx/internal/operators/OperatorObserveOnTest.java index c5a29e04a2..df2e21e5c8 100644 --- a/src/test/java/rx/internal/operators/OperatorObserveOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorObserveOnTest.java @@ -526,7 +526,7 @@ public boolean hasNext() { @Test public void testQueueFullEmitsError() { final CountDownLatch latch = new CountDownLatch(1); - Observable observable = Observable.create(new OnSubscribe() { + Observable observable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) { diff --git a/src/test/java/rx/internal/operators/OperatorOnBackpressureBufferTest.java b/src/test/java/rx/internal/operators/OperatorOnBackpressureBufferTest.java index ea48f2847e..b76405b12c 100644 --- a/src/test/java/rx/internal/operators/OperatorOnBackpressureBufferTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnBackpressureBufferTest.java @@ -227,7 +227,7 @@ public void onNext(T t) { }); } - static final Observable infinite = Observable.create(new OnSubscribe() { + static final Observable infinite = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorOnBackpressureDropTest.java b/src/test/java/rx/internal/operators/OperatorOnBackpressureDropTest.java index 87d748e2ea..07174570b5 100644 --- a/src/test/java/rx/internal/operators/OperatorOnBackpressureDropTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnBackpressureDropTest.java @@ -151,7 +151,7 @@ public void testOnDropMethodIsCalled() { final List list = new ArrayList(); // request 0 TestSubscriber ts = TestSubscriber.create(0); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -180,7 +180,7 @@ public void call(Integer t) { public void testUpstreamEmitsOnCompletedAfterFailureWithoutCheckingSubscription() { TestSubscriber ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -221,7 +221,7 @@ public void call(Throwable t) { TestSubscriber ts = TestSubscriber.create(0); final RuntimeException e1 = new RuntimeException(); final RuntimeException e2 = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -255,7 +255,7 @@ public void call(Integer t) { public void testUpstreamEmitsOnNextAfterFailureWithoutCheckingSubscription() { TestSubscriber ts = TestSubscriber.create(0); final RuntimeException e = new RuntimeException(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber sub) { @@ -291,7 +291,7 @@ public void call(Long n) { } }; - static final Observable infinite = Observable.create(new OnSubscribe() { + static final Observable infinite = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -304,7 +304,7 @@ public void call(Subscriber s) { }); private static final Observable range(final long n) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java index 9076e2f542..e127334588 100644 --- a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java @@ -44,7 +44,7 @@ public class OperatorOnErrorResumeNextViaFunctionTest { @Test public void testResumeNextWithSynchronousExecution() { final AtomicReference receivedException = new AtomicReference(); - Observable w = Observable.create(new Observable.OnSubscribe() { + Observable w = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { @@ -94,7 +94,7 @@ public Observable call(Throwable t1) { } }; - Observable observable = Observable.create(w).onErrorResumeNext(resume); + Observable observable = Observable.unsafeCreate(w).onErrorResumeNext(resume); @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); @@ -131,7 +131,7 @@ public Observable call(Throwable t1) { } }; - Observable observable = Observable.create(w).onErrorResumeNext(resume); + Observable observable = Observable.unsafeCreate(w).onErrorResumeNext(resume); @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); diff --git a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java index a7315a9158..41f910c2fc 100644 --- a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java @@ -42,7 +42,7 @@ public void testResumeNext() { Subscription s = mock(Subscription.class); // Trigger failure on second element TestObservable f = new TestObservable(s, "one", "fail", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); Observable resume = Observable.just("twoResume", "threeResume"); Observable observable = w.onErrorResumeNext(resume); @@ -72,7 +72,7 @@ public void testMapResumeAsyncNext() { Observable w = Observable.just("one", "fail", "two", "three", "fail"); // Resume Observable is async TestObservable f = new TestObservable(sr, "twoResume", "threeResume"); - Observable resume = Observable.create(f); + Observable resume = Observable.unsafeCreate(f); // Introduce map function that fails intermittently (Map does not prevent this when the observer is a // rx.operator incl onErrorResumeNextViaObservable) @@ -110,7 +110,7 @@ public String call(String s) { @Test public void testResumeNextWithFailedOnSubscribe() { - Observable testObservable = Observable.create(new OnSubscribe() { + Observable testObservable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { @@ -132,7 +132,7 @@ public void call(Subscriber t1) { @Test public void testResumeNextWithFailedOnSubscribeAsync() { - Observable testObservable = Observable.create(new OnSubscribe() { + Observable testObservable = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { diff --git a/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java b/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java index 57a16e7829..196d5d49ce 100644 --- a/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java @@ -41,7 +41,7 @@ public class OperatorOnErrorReturnTest { @Test public void testResumeNext() { TestObservable f = new TestObservable("one"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); final AtomicReference capturedException = new AtomicReference(); Observable observable = w.onErrorReturn(new Func1() { @@ -77,7 +77,7 @@ public String call(Throwable e) { @Test public void testFunctionThrowsError() { TestObservable f = new TestObservable("one"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); final AtomicReference capturedException = new AtomicReference(); Observable observable = w.onErrorReturn(new Func1() { diff --git a/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java b/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java index 3b403f90e1..b54c7d4c46 100644 --- a/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java @@ -35,7 +35,7 @@ public class OperatorOnExceptionResumeNextViaObservableTest { public void testResumeNextWithException() { // Trigger failure on second element TestObservable f = new TestObservable("one", "EXCEPTION", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); Observable resume = Observable.just("twoResume", "threeResume"); Observable observable = w.onExceptionResumeNext(resume); @@ -63,7 +63,7 @@ public void testResumeNextWithException() { public void testResumeNextWithRuntimeException() { // Trigger failure on second element TestObservable f = new TestObservable("one", "RUNTIMEEXCEPTION", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); Observable resume = Observable.just("twoResume", "threeResume"); Observable observable = w.onExceptionResumeNext(resume); @@ -91,7 +91,7 @@ public void testResumeNextWithRuntimeException() { public void testThrowablePassesThru() { // Trigger failure on second element TestObservable f = new TestObservable("one", "THROWABLE", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); Observable resume = Observable.just("twoResume", "threeResume"); Observable observable = w.onExceptionResumeNext(resume); @@ -119,7 +119,7 @@ public void testThrowablePassesThru() { public void testErrorPassesThru() { // Trigger failure on second element TestObservable f = new TestObservable("one", "ON_OVERFLOW_ERROR", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); Observable resume = Observable.just("twoResume", "threeResume"); Observable observable = w.onExceptionResumeNext(resume); @@ -149,7 +149,7 @@ public void testMapResumeAsyncNext() { Observable w = Observable.just("one", "fail", "two", "three", "fail"); // Resume Observable is async TestObservable f = new TestObservable("twoResume", "threeResume"); - Observable resume = Observable.create(f); + Observable resume = Observable.unsafeCreate(f); // Introduce map function that fails intermittently (Map does not prevent this when the observer is a // rx.operator incl onErrorResumeNextViaObservable) diff --git a/src/test/java/rx/internal/operators/OperatorPublishTest.java b/src/test/java/rx/internal/operators/OperatorPublishTest.java index d0f524159f..9855143447 100644 --- a/src/test/java/rx/internal/operators/OperatorPublishTest.java +++ b/src/test/java/rx/internal/operators/OperatorPublishTest.java @@ -37,7 +37,7 @@ public class OperatorPublishTest { @Test public void testPublish() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - ConnectableObservable o = Observable.create(new OnSubscribe() { + ConnectableObservable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -368,7 +368,7 @@ public void onStart() { @Test public void testConnectIsIdempotent() { final AtomicInteger calls = new AtomicInteger(); - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { calls.getAndIncrement(); diff --git a/src/test/java/rx/internal/operators/OperatorRepeatTest.java b/src/test/java/rx/internal/operators/OperatorRepeatTest.java index c736b2ef3f..1a37f23c05 100644 --- a/src/test/java/rx/internal/operators/OperatorRepeatTest.java +++ b/src/test/java/rx/internal/operators/OperatorRepeatTest.java @@ -40,7 +40,7 @@ public class OperatorRepeatTest { public void testRepetition() { int NUM = 10; final AtomicInteger count = new AtomicInteger(); - int value = Observable.create(new OnSubscribe() { + int value = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber o) { @@ -68,7 +68,7 @@ public void testNoStackOverFlow() { public void testRepeatTakeWithSubscribeOn() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable oi = Observable.create(new OnSubscribe() { + Observable oi = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OperatorReplayTest.java b/src/test/java/rx/internal/operators/OperatorReplayTest.java index e98c542cd8..e4734c30a6 100644 --- a/src/test/java/rx/internal/operators/OperatorReplayTest.java +++ b/src/test/java/rx/internal/operators/OperatorReplayTest.java @@ -915,7 +915,7 @@ public void testColdReplayBackpressure() { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new Observable.OnSubscribe() { + Observable o = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -1055,7 +1055,7 @@ public void testNoMissingBackpressureException() { m = 4 * 1000 * 1000; } - Observable firehose = Observable.create(new OnSubscribe() { + Observable firehose = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { for (int i = 0; i < m; i++) { diff --git a/src/test/java/rx/internal/operators/OperatorRetryTest.java b/src/test/java/rx/internal/operators/OperatorRetryTest.java index 7937f8945f..d4cf161dc5 100644 --- a/src/test/java/rx/internal/operators/OperatorRetryTest.java +++ b/src/test/java/rx/internal/operators/OperatorRetryTest.java @@ -45,7 +45,7 @@ public class OperatorRetryTest { public void iterativeBackoff() { @SuppressWarnings("unchecked") Observer consumer = mock(Observer.class); - Observable producer = Observable.create(new OnSubscribe() { + Observable producer = Observable.unsafeCreate(new OnSubscribe() { private AtomicInteger count = new AtomicInteger(4); long last = System.currentTimeMillis(); @@ -116,7 +116,7 @@ public void testRetryIndefinitely() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); int NUM_RETRIES = 20; - Observable origin = Observable.create(new FuncWithErrors(NUM_RETRIES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES)); origin.retry().unsafeSubscribe(new TestSubscriber(observer)); InOrder inOrder = inOrder(observer); @@ -136,7 +136,7 @@ public void testSchedulingNotificationHandler() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); int NUM_RETRIES = 2; - Observable origin = Observable.create(new FuncWithErrors(NUM_RETRIES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES)); TestSubscriber subscriber = new TestSubscriber(observer); origin.retryWhen(new Func1, Observable>() { @Override @@ -168,7 +168,7 @@ public void testOnNextFromNotificationHandler() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); int NUM_RETRIES = 2; - Observable origin = Observable.create(new FuncWithErrors(NUM_RETRIES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES)); origin.retryWhen(new Func1, Observable>() { @Override public Observable call(Observable t1) { @@ -198,7 +198,7 @@ public Void call(Throwable t1) { public void testOnCompletedFromNotificationHandler() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(1)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(1)); TestSubscriber subscriber = new TestSubscriber(observer); origin.retryWhen(new Func1, Observable>() { @Override @@ -219,7 +219,7 @@ public Observable call(Observable t1) { public void testOnErrorFromNotificationHandler() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(2)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(2)); origin.retryWhen(new Func1, Observable>() { @Override public Observable call(Observable t1) { @@ -247,7 +247,7 @@ public void call(Subscriber subscriber) { } }; - int first = Observable.create(onSubscribe) + int first = Observable.unsafeCreate(onSubscribe) .retryWhen(new Func1, Observable>() { @Override public Observable call(Observable attempt) { @@ -270,7 +270,7 @@ public Void call(Throwable o, Integer integer) { public void testOriginFails() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(1)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(1)); origin.subscribe(observer); InOrder inOrder = inOrder(observer); @@ -286,7 +286,7 @@ public void testRetryFail() { int NUM_FAILURES = 2; @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(NUM_FAILURES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_FAILURES)); origin.retry(NUM_RETRIES).subscribe(observer); InOrder inOrder = inOrder(observer); @@ -305,7 +305,7 @@ public void testRetrySuccess() { int NUM_FAILURES = 1; @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(NUM_FAILURES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_FAILURES)); origin.retry(3).subscribe(observer); InOrder inOrder = inOrder(observer); @@ -325,7 +325,7 @@ public void testInfiniteRetry() { int NUM_FAILURES = 20; @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(NUM_FAILURES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_FAILURES)); origin.retry().subscribe(observer); InOrder inOrder = inOrder(observer); @@ -478,7 +478,7 @@ public boolean isUnsubscribed() { }); } }; - Observable stream = Observable.create(onSubscribe); + Observable stream = Observable.unsafeCreate(onSubscribe); Observable streamWithRetry = stream.retry(); Subscription sub = streamWithRetry.subscribe(); assertEquals(1, subsCount.get()); @@ -512,7 +512,7 @@ public void call(Subscriber s) { } }; - Observable.create(onSubscribe).retry(3).subscribe(ts); + Observable.unsafeCreate(onSubscribe).retry(3).subscribe(ts); assertEquals(4, subsCount.get()); // 1 + 3 retries } @@ -530,7 +530,7 @@ public void call(Subscriber s) { } }; - Observable.create(onSubscribe).retry(1).subscribe(ts); + Observable.unsafeCreate(onSubscribe).retry(1).subscribe(ts); assertEquals(2, subsCount.get()); } @@ -548,7 +548,7 @@ public void call(Subscriber s) { } }; - Observable.create(onSubscribe).retry(0).subscribe(ts); + Observable.unsafeCreate(onSubscribe).retry(0).subscribe(ts); assertEquals(1, subsCount.get()); } @@ -651,7 +651,7 @@ public void testUnsubscribeAfterError() { // Observable that always fails after 100ms SlowObservable so = new SlowObservable(100, 0); - Observable o = Observable.create(so).retry(5); + Observable o = Observable.unsafeCreate(so).retry(5); AsyncObserver async = new AsyncObserver(observer); @@ -676,7 +676,7 @@ public void testTimeoutWithRetry() { // Observable that sends every 100ms (timeout fails instead) SlowObservable so = new SlowObservable(100, 10); - Observable o = Observable.create(so).timeout(80, TimeUnit.MILLISECONDS).retry(5); + Observable o = Observable.unsafeCreate(so).timeout(80, TimeUnit.MILLISECONDS).retry(5); AsyncObserver async = new AsyncObserver(observer); @@ -700,7 +700,7 @@ public void testRetryWithBackpressure() throws InterruptedException { for (int i = 0; i < 400; i++) { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable origin = Observable.create(new FuncWithErrors(NUM_RETRIES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES)); TestSubscriber ts = new TestSubscriber(observer); origin.retry().observeOn(Schedulers.computation()).unsafeSubscribe(ts); ts.awaitTerminalEvent(5, TimeUnit.SECONDS); @@ -743,7 +743,7 @@ public void testRetryWithBackpressureParallel() throws InterruptedException { public void run() { final AtomicInteger nexts = new AtomicInteger(); try { - Observable origin = Observable.create(new FuncWithErrors(NUM_RETRIES)); + Observable origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES)); TestSubscriber ts = new TestSubscriber(); origin.retry() .observeOn(Schedulers.computation()).unsafeSubscribe(ts); @@ -866,7 +866,7 @@ public void testIssue1900SourceNotSupportingBackpressure() { final int NUM_MSG = 1034; final AtomicInteger count = new AtomicInteger(); - Observable origin = Observable.create(new Observable.OnSubscribe() { + Observable origin = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber o) { diff --git a/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java b/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java index f526d327f6..dab59e9f0d 100644 --- a/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java +++ b/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java @@ -81,7 +81,7 @@ public void testWithNothingToRetry() { } @Test public void testRetryTwice() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { int count; @Override public void call(Subscriber t1) { @@ -116,7 +116,7 @@ public void call(Subscriber t1) { } @Test public void testRetryTwiceAndGiveUp() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { t1.onNext(0); @@ -143,7 +143,7 @@ public void call(Subscriber t1) { } @Test public void testRetryOnSpecificException() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { int count; @Override public void call(Subscriber t1) { @@ -179,7 +179,7 @@ public void call(Subscriber t1) { public void testRetryOnSpecificExceptionAndNotOther() { final IOException ioe = new IOException(); final TestException te = new TestException(); - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { int count; @Override public void call(Subscriber t1) { @@ -238,7 +238,7 @@ public void testUnsubscribeAfterError() { // Observable that always fails after 100ms OperatorRetryTest.SlowObservable so = new OperatorRetryTest.SlowObservable(100, 0); Observable o = Observable - .create(so) + .unsafeCreate(so) .retry(retry5); OperatorRetryTest.AsyncObserver async = new OperatorRetryTest.AsyncObserver(observer); @@ -265,7 +265,7 @@ public void testTimeoutWithRetry() { // Observable that sends every 100ms (timeout fails instead) OperatorRetryTest.SlowObservable so = new OperatorRetryTest.SlowObservable(100, 10); Observable o = Observable - .create(so) + .unsafeCreate(so) .timeout(80, TimeUnit.MILLISECONDS) .retry(retry5); diff --git a/src/test/java/rx/internal/operators/OperatorSampleTest.java b/src/test/java/rx/internal/operators/OperatorSampleTest.java index 04000973ec..20d59d8523 100644 --- a/src/test/java/rx/internal/operators/OperatorSampleTest.java +++ b/src/test/java/rx/internal/operators/OperatorSampleTest.java @@ -50,7 +50,7 @@ public void before() { @Test public void testSample() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer1) { innerScheduler.schedule(new Action0() { @@ -111,7 +111,7 @@ public void call() { @Test public void sampleWithTimeEmitAndTerminate() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer1) { innerScheduler.schedule(new Action0() { @@ -303,7 +303,7 @@ public void sampleWithSamplerThrows() { @Test public void testSampleUnsubscribe() { final Subscription s = mock(Subscription.class); - Observable o = Observable.create( + Observable o = Observable.unsafeCreate( new OnSubscribe() { @Override public void call(Subscriber subscriber) { @@ -387,7 +387,7 @@ public void dontUnsubscribeChild2() { @Test public void neverSetProducer() { - Observable neverBackpressure = Observable.create(new OnSubscribe() { + Observable neverBackpressure = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.setProducer(new Producer() { @@ -430,7 +430,7 @@ public void setProducer(Producer p) { public void unsubscribeMainAfterCompleted() { final AtomicBoolean unsubscribed = new AtomicBoolean(); - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.add(Subscriptions.create(new Action0() { @@ -467,7 +467,7 @@ public void onCompleted() { public void unsubscribeSamplerAfterCompleted() { final AtomicBoolean unsubscribed = new AtomicBoolean(); - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.add(Subscriptions.create(new Action0() { diff --git a/src/test/java/rx/internal/operators/OperatorScanTest.java b/src/test/java/rx/internal/operators/OperatorScanTest.java index c6bf08b718..e20519ed17 100644 --- a/src/test/java/rx/internal/operators/OperatorScanTest.java +++ b/src/test/java/rx/internal/operators/OperatorScanTest.java @@ -306,7 +306,7 @@ public Integer call(Integer t1, Integer t2) { @Test public void testScanShouldNotRequestZero() { final AtomicReference producer = new AtomicReference(); - Observable o = Observable.create(new Observable.OnSubscribe() { + Observable o = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber subscriber) { Producer p = spy(new Producer() { @@ -371,7 +371,7 @@ public Integer call(Integer t1, Integer t2) { @Test public void testInitialValueEmittedWithProducer() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t) { t.setProducer(new Producer() { diff --git a/src/test/java/rx/internal/operators/OperatorSerializeTest.java b/src/test/java/rx/internal/operators/OperatorSerializeTest.java index 450e2e0185..14d38dd76b 100644 --- a/src/test/java/rx/internal/operators/OperatorSerializeTest.java +++ b/src/test/java/rx/internal/operators/OperatorSerializeTest.java @@ -51,7 +51,7 @@ public void before() { @Test public void testSingleThreadedBasic() { TestSingleThreadedObservable onSubscribe = new TestSingleThreadedObservable("one", "two", "three"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); w.serialize().subscribe(observer); onSubscribe.waitToFinish(); @@ -69,7 +69,7 @@ public void testSingleThreadedBasic() { @Test public void testMultiThreadedBasic() { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyobserver = new BusyObserver(); @@ -92,7 +92,7 @@ public void testMultiThreadedBasic() { @Test public void testMultiThreadedWithNPE() { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyobserver = new BusyObserver(); @@ -123,7 +123,7 @@ public void testMultiThreadedWithNPEinMiddle() { boolean lessThan9 = false; for (int i = 0; i < 3; i++) { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null, "four", "five", "six", "seven", "eight", "nine"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyobserver = new BusyObserver(); diff --git a/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java b/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java index 65f1b9870e..6eb4abd8e8 100644 --- a/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java @@ -50,7 +50,7 @@ public void testIssue813() throws InterruptedException { TestSubscriber observer = new TestSubscriber(); final Subscription subscription = Observable - .create(new Observable.OnSubscribe() { + .unsafeCreate(new Observable.OnSubscribe() { @Override public void call( final Subscriber subscriber) { @@ -85,7 +85,7 @@ public void call( @Test public void testThrownErrorHandling() { TestSubscriber ts = new TestSubscriber(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -100,7 +100,7 @@ public void call(Subscriber s) { @Test public void testOnError() { TestSubscriber ts = new TestSubscriber(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -170,7 +170,7 @@ public Subscription schedule(final Action0 action, final long delayTime, final T public void testUnsubscribeInfiniteStream() throws InterruptedException { TestSubscriber ts = new TestSubscriber(); final AtomicInteger count = new AtomicInteger(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber sub) { diff --git a/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java b/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java index 70225a53eb..5108f4001d 100644 --- a/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java +++ b/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java @@ -58,7 +58,7 @@ public void testSwitchWhenEmpty() throws Exception { @Test public void testSwitchWithProducer() throws Exception { final AtomicBoolean emitted = new AtomicBoolean(false); - Observable withProducer = Observable.create(new Observable.OnSubscribe() { + Observable withProducer = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber subscriber) { subscriber.setProducer(new Producer() { @@ -82,7 +82,7 @@ public void request(long n) { public void testSwitchTriggerUnsubscribe() throws Exception { final Subscription empty = Subscriptions.empty(); - Observable withProducer = Observable.create(new Observable.OnSubscribe() { + Observable withProducer = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber subscriber) { subscriber.add(empty); @@ -121,7 +121,7 @@ public void onNext(Long aLong) { public void testSwitchShouldTriggerUnsubscribe() { final Subscription s = Subscriptions.empty(); - Observable.create(new Observable.OnSubscribe() { + Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber subscriber) { subscriber.add(s); @@ -176,7 +176,7 @@ public void testBackpressureOnFirstObservable() { @Test(timeout = 10000) public void testRequestsNotLost() throws InterruptedException { final TestSubscriber ts = new TestSubscriber(0); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber subscriber) { diff --git a/src/test/java/rx/internal/operators/OperatorSwitchTest.java b/src/test/java/rx/internal/operators/OperatorSwitchTest.java index 1a8732e341..8525c18cd6 100644 --- a/src/test/java/rx/internal/operators/OperatorSwitchTest.java +++ b/src/test/java/rx/internal/operators/OperatorSwitchTest.java @@ -53,10 +53,10 @@ public void before() { @Test public void testSwitchWhenOuterCompleteBeforeInner() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 50, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 50, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 70, "one"); @@ -80,10 +80,10 @@ public void call(Subscriber observer) { @Test public void testSwitchWhenInnerCompleteBeforeOuter() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 10, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 10, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 0, "one"); @@ -92,7 +92,7 @@ public void call(Subscriber observer) { } })); - publishNext(observer, 100, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 100, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 0, "three"); @@ -123,10 +123,10 @@ public void call(Subscriber observer) { @Test public void testSwitchWithComplete() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 50, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 50, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { publishNext(observer, 60, "one"); @@ -134,7 +134,7 @@ public void call(final Subscriber observer) { } })); - publishNext(observer, 200, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 200, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { publishNext(observer, 0, "three"); @@ -179,10 +179,10 @@ public void call(final Subscriber observer) { @Test public void testSwitchWithError() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 50, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 50, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { publishNext(observer, 50, "one"); @@ -190,7 +190,7 @@ public void call(final Subscriber observer) { } })); - publishNext(observer, 200, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 200, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 0, "three"); @@ -235,10 +235,10 @@ public void call(Subscriber observer) { @Test public void testSwitchWithSubsequenceComplete() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 50, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 50, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 50, "one"); @@ -246,14 +246,14 @@ public void call(Subscriber observer) { } })); - publishNext(observer, 130, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 130, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishCompleted(observer, 0); } })); - publishNext(observer, 150, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 150, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 50, "three"); @@ -285,10 +285,10 @@ public void call(Subscriber observer) { @Test public void testSwitchWithSubsequenceError() { - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 50, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 50, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 50, "one"); @@ -296,14 +296,14 @@ public void call(Subscriber observer) { } })); - publishNext(observer, 130, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 130, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishError(observer, 0, new TestException()); } })); - publishNext(observer, 150, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 150, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 50, "three"); @@ -364,10 +364,10 @@ public void call() { @Test public void testSwitchIssue737() { // https://github.com/ReactiveX/RxJava/issues/737 - Observable> source = Observable.create(new Observable.OnSubscribe>() { + Observable> source = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { - publishNext(observer, 0, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 0, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 10, "1-one"); @@ -377,7 +377,7 @@ public void call(Subscriber observer) { publishCompleted(observer, 40); } })); - publishNext(observer, 25, Observable.create(new Observable.OnSubscribe() { + publishNext(observer, 25, Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 10, "2-one"); @@ -407,7 +407,7 @@ public void call(Subscriber observer) { @Test public void testBackpressure() { - final Observable o1 = Observable.create(new Observable.OnSubscribe() { + final Observable o1 = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { observer.setProducer(new Producer() { @@ -428,7 +428,7 @@ public void request(long n) { }); } }); - final Observable o2 = Observable.create(new Observable.OnSubscribe() { + final Observable o2 = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { observer.setProducer(new Producer() { @@ -449,7 +449,7 @@ public void request(long n) { }); } }); - final Observable o3 = Observable.create(new Observable.OnSubscribe() { + final Observable o3 = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { observer.setProducer(new Producer() { @@ -469,7 +469,7 @@ public void request(long n) { }); } }); - Observable> o = Observable.create(new Observable.OnSubscribe>() { + Observable> o = Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(Subscriber> observer) { publishNext(observer, 10, o1); @@ -519,7 +519,7 @@ public void onNext(String s) { public void testUnsubscribe() { final AtomicBoolean isUnsubscribed = new AtomicBoolean(); Observable.switchOnNext( - Observable.create(new Observable.OnSubscribe>() { + Observable.unsafeCreate(new Observable.OnSubscribe>() { @Override public void call(final Subscriber> subscriber) { subscriber.onNext(Observable.just(1)); diff --git a/src/test/java/rx/internal/operators/OperatorTakeTest.java b/src/test/java/rx/internal/operators/OperatorTakeTest.java index 0dc3dbc8c4..edf17bac10 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeTest.java @@ -112,7 +112,7 @@ public Integer call(Integer t1) { @Test public void testTakeDoesntLeakErrors() { - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { observer.onNext("one"); @@ -136,7 +136,7 @@ public void call(Subscriber observer) { public void testTakeZeroDoesntLeakError() { final AtomicBoolean subscribed = new AtomicBoolean(false); final AtomicBoolean unSubscribed = new AtomicBoolean(false); - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { subscribed.set(true); @@ -173,7 +173,7 @@ public boolean isUnsubscribed() { public void testUnsubscribeAfterTake() { final Subscription s = mock(Subscription.class); TestObservableFunc f = new TestObservableFunc("one", "two", "three"); - Observable w = Observable.create(f); + Observable w = Observable.unsafeCreate(f); @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); @@ -218,7 +218,7 @@ public void call(Long l) { @Test(timeout = 2000) public void testMultiTake() { final AtomicInteger count = new AtomicInteger(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -277,7 +277,7 @@ public void run() { } } - private static Observable INFINITE_OBSERVABLE = Observable.create(new OnSubscribe() { + private static Observable INFINITE_OBSERVABLE = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber op) { @@ -311,7 +311,7 @@ public void testProducerRequestThroughTake() { TestSubscriber ts = new TestSubscriber(); ts.requestMore(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { @@ -334,7 +334,7 @@ public void testProducerRequestThroughTakeIsModified() { TestSubscriber ts = new TestSubscriber(); ts.requestMore(3); final AtomicLong requested = new AtomicLong(); - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java b/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java index 28c0c432ff..5c590c68c5 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java @@ -40,7 +40,7 @@ public void testTakeUntil() { TestObservable other = new TestObservable(sOther); Observer result = mock(Observer.class); - Observable stringObservable = Observable.create(source).takeUntil(Observable.create(other)); + Observable stringObservable = Observable.unsafeCreate(source).takeUntil(Observable.unsafeCreate(other)); stringObservable.subscribe(result); source.sendOnNext("one"); source.sendOnNext("two"); @@ -67,7 +67,7 @@ public void testTakeUntilSourceCompleted() { TestObservable other = new TestObservable(sOther); Observer result = mock(Observer.class); - Observable stringObservable = Observable.create(source).takeUntil(Observable.create(other)); + Observable stringObservable = Observable.unsafeCreate(source).takeUntil(Observable.unsafeCreate(other)); stringObservable.subscribe(result); source.sendOnNext("one"); source.sendOnNext("two"); @@ -90,7 +90,7 @@ public void testTakeUntilSourceError() { Throwable error = new Throwable(); Observer result = mock(Observer.class); - Observable stringObservable = Observable.create(source).takeUntil(Observable.create(other)); + Observable stringObservable = Observable.unsafeCreate(source).takeUntil(Observable.unsafeCreate(other)); stringObservable.subscribe(result); source.sendOnNext("one"); source.sendOnNext("two"); @@ -116,7 +116,7 @@ public void testTakeUntilOtherError() { Throwable error = new Throwable(); Observer result = mock(Observer.class); - Observable stringObservable = Observable.create(source).takeUntil(Observable.create(other)); + Observable stringObservable = Observable.unsafeCreate(source).takeUntil(Observable.unsafeCreate(other)); stringObservable.subscribe(result); source.sendOnNext("one"); source.sendOnNext("two"); @@ -145,7 +145,7 @@ public void testTakeUntilOtherCompleted() { TestObservable other = new TestObservable(sOther); Observer result = mock(Observer.class); - Observable stringObservable = Observable.create(source).takeUntil(Observable.create(other)); + Observable stringObservable = Observable.unsafeCreate(source).takeUntil(Observable.unsafeCreate(other)); stringObservable.subscribe(result); source.sendOnNext("one"); source.sendOnNext("two"); diff --git a/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java b/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java index 0a3cd3ec94..2537e0e807 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java @@ -107,7 +107,7 @@ public Boolean call(String input) { @Test public void testTakeWhileDoesntLeakErrors() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { observer.onNext("one"); @@ -130,7 +130,7 @@ public void testTakeWhileProtectsPredicateCall() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable take = Observable.create(source).takeWhile(new Func1() { + Observable take = Observable.unsafeCreate(source).takeWhile(new Func1() { @Override public Boolean call(String s) { throw testException; @@ -157,7 +157,7 @@ public void testUnsubscribeAfterTake() { @SuppressWarnings("unchecked") Observer observer = mock(Observer.class); - Observable take = Observable.create(w).takeWhile(new Func1() { + Observable take = Observable.unsafeCreate(w).takeWhile(new Func1() { int index; @Override diff --git a/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java b/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java index f608cb22c6..4908efc534 100644 --- a/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java +++ b/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java @@ -55,7 +55,7 @@ public void before() { @Test public void testThrottlingWithCompleted() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { publishNext(observer, 100, "one"); // publish as it's first @@ -82,7 +82,7 @@ public void call(Subscriber observer) { @Test public void testThrottlingWithError() { - Observable source = Observable.create(new OnSubscribe() { + Observable source = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { Exception error = new TestException(); diff --git a/src/test/java/rx/internal/operators/OperatorTimeoutTests.java b/src/test/java/rx/internal/operators/OperatorTimeoutTests.java index 3071d78f6d..fba5b1d6c5 100644 --- a/src/test/java/rx/internal/operators/OperatorTimeoutTests.java +++ b/src/test/java/rx/internal/operators/OperatorTimeoutTests.java @@ -234,7 +234,7 @@ public void shouldTimeoutIfSynchronizedObservableEmitFirstOnNextNotWithinTimeout @Override public void run() { - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { @@ -268,7 +268,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnTimeout() throws Interr // From https://github.com/ReactiveX/RxJava/pull/951 final Subscription s = mock(Subscription.class); - Observable never = Observable.create(new OnSubscribe() { + Observable never = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { subscriber.add(s); @@ -296,7 +296,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnImmediatelyComplete() { // From https://github.com/ReactiveX/RxJava/pull/951 final Subscription s = mock(Subscription.class); - Observable immediatelyComplete = Observable.create(new OnSubscribe() { + Observable immediatelyComplete = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { subscriber.add(s); @@ -326,7 +326,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnImmediatelyErrored() th // From https://github.com/ReactiveX/RxJava/pull/951 final Subscription s = mock(Subscription.class); - Observable immediatelyError = Observable.create(new OnSubscribe() { + Observable immediatelyError = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { subscriber.add(s); diff --git a/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java b/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java index d2d0e2e567..50ce9e5865 100644 --- a/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java +++ b/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java @@ -334,7 +334,7 @@ public void testTimeoutSelectorWithTimeoutAndOnNextRaceCondition() throws Interr public Observable call(Integer t1) { if (t1 == 1) { // Force "unsubscribe" run on another thread - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { enteredTimeoutOne.countDown(); diff --git a/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java b/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java index 8e4317af40..fe8d664122 100644 --- a/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java @@ -39,7 +39,7 @@ public void testUnsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnSameThread() thro try { final ThreadSubscription subscription = new ThreadSubscription(); final AtomicReference subscribeThread = new AtomicReference(); - Observable w = Observable.create(new OnSubscribe() { + Observable w = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { @@ -84,7 +84,7 @@ public void testUnsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnDifferentThreads( try { final ThreadSubscription subscription = new ThreadSubscription(); final AtomicReference subscribeThread = new AtomicReference(); - Observable w = Observable.create(new OnSubscribe() { + Observable w = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber t1) { diff --git a/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java b/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java index 7f74cd1ee0..2e9b718e67 100644 --- a/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java +++ b/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java @@ -249,7 +249,7 @@ public void onCompleted() { } public static Observable hotStream() { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { while (!s.isUnsubscribed()) { diff --git a/src/test/java/rx/internal/operators/OperatorWindowWithStartEndObservableTest.java b/src/test/java/rx/internal/operators/OperatorWindowWithStartEndObservableTest.java index 858465a877..eeb47b89be 100644 --- a/src/test/java/rx/internal/operators/OperatorWindowWithStartEndObservableTest.java +++ b/src/test/java/rx/internal/operators/OperatorWindowWithStartEndObservableTest.java @@ -46,7 +46,7 @@ public void testObservableBasedOpenerAndCloser() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -58,7 +58,7 @@ public void call(Subscriber observer) { } }); - Observable openings = Observable.create(new Observable.OnSubscribe() { + Observable openings = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, new Object(), 50); @@ -70,7 +70,7 @@ public void call(Subscriber observer) { Func1> closer = new Func1>() { @Override public Observable call(Object opening) { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, new Object(), 100); @@ -94,7 +94,7 @@ public void testObservableBasedCloser() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -110,7 +110,7 @@ public void call(Subscriber observer) { int calls; @Override public Observable call() { - return Observable.create(new Observable.OnSubscribe() { + return Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { int c = calls++; diff --git a/src/test/java/rx/internal/operators/OperatorWindowWithTimeTest.java b/src/test/java/rx/internal/operators/OperatorWindowWithTimeTest.java index 71a59ff510..78500db578 100644 --- a/src/test/java/rx/internal/operators/OperatorWindowWithTimeTest.java +++ b/src/test/java/rx/internal/operators/OperatorWindowWithTimeTest.java @@ -45,7 +45,7 @@ public void testTimedAndCount() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 10); @@ -78,7 +78,7 @@ public void testTimed() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new Observable.OnSubscribe() { + Observable source = Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { push(observer, "one", 98); diff --git a/src/test/java/rx/internal/operators/OperatorZipTest.java b/src/test/java/rx/internal/operators/OperatorZipTest.java index 908f44a23d..5f4b06bcbe 100644 --- a/src/test/java/rx/internal/operators/OperatorZipTest.java +++ b/src/test/java/rx/internal/operators/OperatorZipTest.java @@ -94,7 +94,7 @@ public void testStartpingDifferentLengthObservableSequences1() { TestObservable w2 = new TestObservable(); TestObservable w3 = new TestObservable(); - Observable zipW = Observable.zip(Observable.create(w1), Observable.create(w2), Observable.create(w3), getConcat3StringsZipr()); + Observable zipW = Observable.zip(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2), Observable.unsafeCreate(w3), getConcat3StringsZipr()); zipW.subscribe(w); /* simulate sending data */ @@ -128,7 +128,7 @@ public void testStartpingDifferentLengthObservableSequences2() { TestObservable w2 = new TestObservable(); TestObservable w3 = new TestObservable(); - Observable zipW = Observable.zip(Observable.create(w1), Observable.create(w2), Observable.create(w3), getConcat3StringsZipr()); + Observable zipW = Observable.zip(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2), Observable.unsafeCreate(w3), getConcat3StringsZipr()); zipW.subscribe(w); /* simulate sending data */ @@ -1212,7 +1212,7 @@ public boolean hasNext() { Observable OBSERVABLE_OF_5_INTEGERS = OBSERVABLE_OF_5_INTEGERS(new AtomicInteger()); Observable OBSERVABLE_OF_5_INTEGERS(final AtomicInteger numEmitted) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber o) { @@ -1231,7 +1231,7 @@ public void call(final Subscriber o) { } Observable ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(final CountDownLatch latch) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber o) { diff --git a/src/test/java/rx/internal/operators/SafeSubscriberTest.java b/src/test/java/rx/internal/operators/SafeSubscriberTest.java index cf71a8f5d1..57fc3446bc 100644 --- a/src/test/java/rx/internal/operators/SafeSubscriberTest.java +++ b/src/test/java/rx/internal/operators/SafeSubscriberTest.java @@ -38,7 +38,7 @@ public class SafeSubscriberTest { @Test public void testOnNextAfterOnError() { TestObservable t = new TestObservable(); - Observable st = Observable.create(t); + Observable st = Observable.unsafeCreate(t); @SuppressWarnings("unchecked") Observer w = mock(Observer.class); @@ -60,7 +60,7 @@ public void testOnNextAfterOnError() { @Test public void testOnCompletedAfterOnError() { TestObservable t = new TestObservable(); - Observable st = Observable.create(t); + Observable st = Observable.unsafeCreate(t); @SuppressWarnings("unchecked") Observer w = mock(Observer.class); @@ -82,7 +82,7 @@ public void testOnCompletedAfterOnError() { @Test public void testOnNextAfterOnCompleted() { TestObservable t = new TestObservable(); - Observable st = Observable.create(t); + Observable st = Observable.unsafeCreate(t); @SuppressWarnings("unchecked") Observer w = mock(Observer.class); @@ -105,7 +105,7 @@ public void testOnNextAfterOnCompleted() { @Test public void testOnErrorAfterOnCompleted() { TestObservable t = new TestObservable(); - Observable st = Observable.create(t); + Observable st = Observable.unsafeCreate(t); @SuppressWarnings("unchecked") Observer w = mock(Observer.class); diff --git a/src/test/java/rx/internal/producers/ProducersTest.java b/src/test/java/rx/internal/producers/ProducersTest.java index f41fcda71a..46533b8ada 100644 --- a/src/test/java/rx/internal/producers/ProducersTest.java +++ b/src/test/java/rx/internal/producers/ProducersTest.java @@ -365,7 +365,7 @@ public void testObserverArbiterAsync() { .map(plus(40)) ); - Observable source = Observable.create( + Observable source = Observable.unsafeCreate( new SwitchTimer(timers, 550, TimeUnit.MILLISECONDS, test)); diff --git a/src/test/java/rx/observables/AsyncOnSubscribeTest.java b/src/test/java/rx/observables/AsyncOnSubscribeTest.java index a711d92c91..d344532aae 100644 --- a/src/test/java/rx/observables/AsyncOnSubscribeTest.java +++ b/src/test/java/rx/observables/AsyncOnSubscribeTest.java @@ -110,7 +110,7 @@ public void testSubscribedByBufferingOperator() { public void call(Long requested, Observer> observer) { observer.onNext(Observable.range(1, requested.intValue())); }}); - Observable.create(os).observeOn(scheduler).subscribe(subscriber); + Observable.unsafeCreate(os).observeOn(scheduler).subscribe(subscriber); subscriber.requestMore(RxRingBuffer.SIZE); scheduler.advanceTimeBy(10, TimeUnit.DAYS); subscriber.assertNoErrors(); @@ -141,7 +141,7 @@ public Integer call(Integer state, Long requested, Observer> observer) { observer.onCompleted(); }}); - Observable.create(os).subscribe(subscriber); + Observable.unsafeCreate(os).subscribe(subscriber); subscriber.requestMore(1); subscriber.assertNoErrors(); subscriber.assertCompleted(); @@ -174,7 +174,7 @@ public void call(Long requested, Observer> observe observer.onNext(Observable.just(2)); } }); - Observable.create(os).subscribe(subscriber); + Observable.unsafeCreate(os).subscribe(subscriber); subscriber.requestMore(1); subscriber.assertError(IllegalStateException.class); subscriber.assertNotCompleted(); @@ -189,7 +189,7 @@ public void testThrowException() throws InterruptedException { public void call(Long requested, Observer> observer) { throw new TestException(); }}); - Observable.create(os).subscribe(subscriber); + Observable.unsafeCreate(os).subscribe(subscriber); subscriber.requestMore(1); subscriber.assertError(TestException.class); subscriber.assertNotCompleted(); @@ -209,7 +209,7 @@ public Integer call(Integer state, Long requested, Observer obs = BlockingObservable.from(Observable.create(new Observable.OnSubscribe() { + BlockingObservable obs = BlockingObservable.from(Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(Subscriber observer) { @@ -281,7 +281,7 @@ public void call(Subscriber observer) { @Test public void testForEachWithError() { try { - BlockingObservable.from(Observable.create(new Observable.OnSubscribe() { + BlockingObservable.from(Observable.unsafeCreate(new Observable.OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -382,7 +382,7 @@ public Boolean call(String args) { @Test public void testSingleOrDefaultUnsubscribe() throws InterruptedException { final CountDownLatch unsubscribe = new CountDownLatch(1); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber subscriber) { subscriber.add(Subscriptions.create(new Action0() { diff --git a/src/test/java/rx/observables/SyncOnSubscribeTest.java b/src/test/java/rx/observables/SyncOnSubscribeTest.java index 630561b0a3..a219e1d7b7 100644 --- a/src/test/java/rx/observables/SyncOnSubscribeTest.java +++ b/src/test/java/rx/observables/SyncOnSubscribeTest.java @@ -52,7 +52,7 @@ public void call(Observer subscriber) { TestSubscriber ts = new TestSubscriber(); - Observable.create(os).subscribe(ts); + Observable.unsafeCreate(os).subscribe(ts); ts.assertNoErrors(); ts.assertTerminalEvent(); @@ -82,7 +82,7 @@ public void call(Integer t) { TestSubscriber ts = new TestSubscriber(); - Observable.create(os).subscribe(ts); + Observable.unsafeCreate(os).subscribe(ts); ts.assertNoErrors(); ts.assertTerminalEvent(); @@ -103,7 +103,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, times(1)).onNext(1); verify(o, never()).onNext(2); @@ -124,7 +124,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, times(1)).onNext(1); verify(o, times(1)).onCompleted(); @@ -144,7 +144,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, times(1)).onNext(1); verify(o, times(1)).onCompleted(); @@ -171,7 +171,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, times(1)).onNext(1); verify(o, never()).onCompleted(); @@ -190,7 +190,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onNext(any(Integer.class)); verify(o, never()).onError(any(Throwable.class)); @@ -206,7 +206,7 @@ public void call(Observer subscriber) { }}); - Observable neverObservable = Observable.create(os).subscribeOn(Schedulers.newThread()); + Observable neverObservable = Observable.unsafeCreate(os).subscribeOn(Schedulers.newThread()); Observable merged = Observable.amb(neverObservable, Observable.timer(100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.newThread())); Iterator values = merged.toBlocking().toIterable().iterator(); @@ -225,7 +225,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onNext(any(Integer.class)); verify(o, never()).onCompleted(); @@ -243,7 +243,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onNext(any(Integer.class)); verify(o, times(1)).onCompleted(); @@ -268,7 +268,7 @@ public void onStart() { } }; - Observable.create(os).subscribe(ts); + Observable.unsafeCreate(os).subscribe(ts); ts.requestMore(1); @@ -288,7 +288,7 @@ public void call(Observer subscriber) { @SuppressWarnings("unchecked") Observer o = mock(Observer.class); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onNext(any(Integer.class)); verify(o).onError(any(TestException.class)); @@ -319,7 +319,7 @@ public Integer call(Integer state, Observer subscriber) { Observer o = mock(Observer.class); InOrder inOrder = inOrder(o); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onError(any(TestException.class)); inOrder.verify(o, times(count)).onNext(any(Integer.class)); @@ -357,7 +357,7 @@ public Iterator call(Iterator it, Observer ob Observer o = mock(Observer.class); InOrder inOrder = inOrder(o); - Observable.create(os).subscribe(o); + Observable.unsafeCreate(os).subscribe(o); verify(o, never()).onError(any(TestException.class)); inOrder.verify(o, times(n)).onNext(any()); @@ -385,7 +385,7 @@ public Integer call(Integer state, Observer observer) { Observer o = mock(Observer.class); InOrder inOrder = inOrder(o); - Observable.create(os).take(finalCount).subscribe(o); + Observable.unsafeCreate(os).take(finalCount).subscribe(o); verify(o, never()).onError(any(Throwable.class)); inOrder.verify(o, times(finalCount)).onNext(any()); @@ -416,7 +416,7 @@ public Integer call(Integer state, Observer observer) { onUnSubscribe); TestSubscriber ts = new TestSubscriber(0); - Observable.create(os).subscribe(ts); + Observable.unsafeCreate(os).subscribe(ts); ts.requestMore(finalCount); @@ -451,7 +451,7 @@ public Integer call(Integer state, Observer observer) { TestSubscriber ts = new TestSubscriber(o); - Observable.create(os).take(1).subscribe(ts); + Observable.unsafeCreate(os).take(1).subscribe(ts); verify(o, never()).onError(any(Throwable.class)); verify(onUnSubscribe, times(1)).call(any(Integer.class)); @@ -521,7 +521,7 @@ public Integer call(Integer state, Observer observer) { InOrder inOrder = inOrder(o); final TestSubscriber ts = new TestSubscriber(o); - Observable.create(os).subscribeOn(Schedulers.newThread()).subscribe(ts); + Observable.unsafeCreate(os).subscribeOn(Schedulers.newThread()).subscribe(ts); // wait until the first request has started processing if (!l2.await(2, TimeUnit.SECONDS)) { @@ -569,7 +569,7 @@ public void call() { final CountDownLatch latch = new CountDownLatch(1); final TestSubscriber ts = new TestSubscriber(o); - Observable.create(os).lift(new Operator() { + Observable.unsafeCreate(os).lift(new Operator() { @Override public Subscriber call(final Subscriber subscriber) { return new Subscriber(subscriber) { @@ -634,7 +634,7 @@ public Map call(Map state, Observer source = Observable.create(os); + Observable source = Observable.unsafeCreate(os); for (int i = 0; i < count; i++) { source.subscribe(); } @@ -678,7 +678,7 @@ public void call(Integer t) { subs.add(ts); } TestScheduler scheduler = new TestScheduler(); - Observable o2 = Observable.create(os).subscribeOn(scheduler); + Observable o2 = Observable.unsafeCreate(os).subscribeOn(scheduler); for (Subscriber ts : subs) { o2.subscribe(ts); } @@ -719,7 +719,7 @@ public Integer call(Integer calls, Observer observer) { TestSubscriber ts = new TestSubscriber(); TestScheduler scheduler = new TestScheduler(); - Observable.create(os).observeOn(scheduler).subscribe(ts); + Observable.unsafeCreate(os).observeOn(scheduler).subscribe(ts); scheduler.triggerActions(); ts.awaitTerminalEvent(); @@ -748,7 +748,7 @@ public void call(Observer observer) { }}, onUnSubscribe); final AtomicReference exception = new AtomicReference(); - Observable.create(os).subscribe(new Subscriber() { + Observable.unsafeCreate(os).subscribe(new Subscriber() { @Override public void onCompleted() { diff --git a/src/test/java/rx/observers/SerializedObserverTest.java b/src/test/java/rx/observers/SerializedObserverTest.java index b53ac9fd5d..83f49ecd52 100644 --- a/src/test/java/rx/observers/SerializedObserverTest.java +++ b/src/test/java/rx/observers/SerializedObserverTest.java @@ -50,7 +50,7 @@ private Observer serializedObserver(Observer o) { @Test public void testSingleThreadedBasic() { TestSingleThreadedObservable onSubscribe = new TestSingleThreadedObservable("one", "two", "three"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); Observer aw = serializedObserver(observer); @@ -70,7 +70,7 @@ public void testSingleThreadedBasic() { @Test public void testMultiThreadedBasic() { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyObserver = new BusyObserver(); Observer aw = serializedObserver(busyObserver); @@ -94,7 +94,7 @@ public void testMultiThreadedBasic() { @Test(timeout = 1000) public void testMultiThreadedWithNPE() throws InterruptedException { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyObserver = new BusyObserver(); Observer aw = serializedObserver(busyObserver); @@ -128,7 +128,7 @@ public void testMultiThreadedWithNPEinMiddle() { for (int i = 0; i < n; i++) { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null, "four", "five", "six", "seven", "eight", "nine"); - Observable w = Observable.create(onSubscribe); + Observable w = Observable.unsafeCreate(onSubscribe); BusyObserver busyObserver = new BusyObserver(); Observer aw = serializedObserver(busyObserver); @@ -391,7 +391,7 @@ private static void waitOnThreads(Future... futures) { } private static Observable infinite(final AtomicInteger produced) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber s) { diff --git a/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java b/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java index a7cec8ab86..1a9541997c 100644 --- a/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java +++ b/src/test/java/rx/schedulers/AbstractSchedulerConcurrencyTests.java @@ -297,7 +297,7 @@ public void testRecursionAndOuterUnsubscribe() throws InterruptedException { final CountDownLatch completionLatch = new CountDownLatch(1); final Worker inner = getScheduler().createWorker(); try { - Observable obs = Observable.create(new OnSubscribe() { + Observable obs = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { inner.schedule(new Action0() { diff --git a/src/test/java/rx/schedulers/AbstractSchedulerTests.java b/src/test/java/rx/schedulers/AbstractSchedulerTests.java index 5875328d70..ff5c94071a 100644 --- a/src/test/java/rx/schedulers/AbstractSchedulerTests.java +++ b/src/test/java/rx/schedulers/AbstractSchedulerTests.java @@ -322,7 +322,7 @@ public void call() { @Test public final void testRecursiveSchedulerInObservable() { - Observable obs = Observable.create(new OnSubscribe() { + Observable obs = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { final Scheduler.Worker inner = getScheduler().createWorker(); @@ -362,7 +362,7 @@ public void call(Integer v) { public final void testConcurrentOnNextFailsValidation() throws InterruptedException { final int count = 10; final CountDownLatch latch = new CountDownLatch(count); - Observable o = Observable.create(new OnSubscribe() { + Observable o = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber observer) { @@ -423,7 +423,7 @@ public final void testSubscribeOnNestedConcurrency() throws InterruptedException @Override public Observable call(final String v) { - return Observable.create(new OnSubscribe() { + return Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber observer) { diff --git a/src/test/java/rx/schedulers/TestSchedulerTest.java b/src/test/java/rx/schedulers/TestSchedulerTest.java index 6c7b76e28e..f26939d5bf 100644 --- a/src/test/java/rx/schedulers/TestSchedulerTest.java +++ b/src/test/java/rx/schedulers/TestSchedulerTest.java @@ -181,7 +181,7 @@ public final void testNestedSchedule() { final Action0 calledOp = mock(Action0.class); Observable poller; - poller = Observable.create(new OnSubscribe() { + poller = Observable.unsafeCreate(new OnSubscribe() { @Override public void call(final Subscriber aSubscriber) { inner.schedule(new Action0() { diff --git a/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java index 72149ee677..954a9b8950 100644 --- a/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java +++ b/src/test/java/rx/subjects/ReplaySubjectBoundedConcurrencyTest.java @@ -52,7 +52,7 @@ public void testReplaySubjectConcurrentSubscribersDoingReplayDontBlockEachOther( @Override public void run() { - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) { diff --git a/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java index 5e1c350462..69b4c8cf69 100644 --- a/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java +++ b/src/test/java/rx/subjects/ReplaySubjectConcurrencyTest.java @@ -52,7 +52,7 @@ public void testReplaySubjectConcurrentSubscribersDoingReplayDontBlockEachOther( @Override public void run() { - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) { @@ -174,7 +174,7 @@ public static void concurrencyTest(final ReplaySubject replay) throws Inte @Override public void run() { - Observable.create(new OnSubscribe() { + Observable.unsafeCreate(new OnSubscribe() { @Override public void call(Subscriber o) {