2.x: make internal naming consistent, refactor some classes 9/14-2 (#4554)

Author: akarnokd

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

@@ -828,7 +828,7 @@ public final Completable andThen(CompletableSource next) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingAwait() {
-        BlockingObserver<Void> observer = new BlockingObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
         subscribe(observer);
         observer.blockingGet();
     }
@@ -848,7 +848,7 @@ public final void blockingAwait() {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final boolean blockingAwait(long timeout, TimeUnit unit) {
-        BlockingObserver<Void> observer = new BlockingObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
         subscribe(observer);
         return observer.blockingAwait(timeout, unit);
     }
@@ -865,7 +865,7 @@ public final boolean blockingAwait(long timeout, TimeUnit unit) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Throwable blockingGet() {
-        BlockingObserver<Void> observer = new BlockingObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
         subscribe(observer);
         return observer.blockingGetError();
     }
@@ -886,7 +886,7 @@ public final Throwable blockingGet() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Throwable blockingGet(long timeout, TimeUnit unit) {
         ObjectHelper.requireNonNull(unit, "unit is null");
-        BlockingObserver<Void> observer = new BlockingObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
         subscribe(observer);
         return observer.blockingGetError(timeout, unit);
     }

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

@@ -30,7 +30,7 @@
 import io.reactivex.internal.operators.observable.ObservableFromPublisher;
 import io.reactivex.internal.operators.single.*;
 import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscribers.flowable.*;
+import io.reactivex.internal.subscribers.*;
 import io.reactivex.internal.util.*;
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.schedulers.*;

src/main/java/io/reactivex/Maybe.java

@@ -22,7 +22,7 @@
 import io.reactivex.exceptions.Exceptions;
 import io.reactivex.functions.*;
 import io.reactivex.internal.functions.*;
-import io.reactivex.internal.observers.BlockingObserver;
+import io.reactivex.internal.observers.BlockingMultiObserver;
 import io.reactivex.internal.operators.flowable.*;
 import io.reactivex.internal.operators.maybe.*;
 import io.reactivex.internal.util.*;
@@ -1888,7 +1888,7 @@ public final Maybe<T> ambWith(MaybeSource<? extends T> other) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingGet() {
-        BlockingObserver<T> observer = new BlockingObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
         subscribe(observer);
         return observer.blockingGet();
     }
@@ -1906,7 +1906,7 @@ public final T blockingGet() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingGet(T defaultValue) {
         ObjectHelper.requireNonNull(defaultValue, "defaultValue is null");
-        BlockingObserver<T> observer = new BlockingObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
         subscribe(observer);
         return observer.blockingGet(defaultValue);
     }
@@ -2770,7 +2770,7 @@ public final <R> R to(Function<? super Maybe<T>, R> convert) {
     }
 
     /**
-     * Converts this Maybe into an Completable instance composing cancellation
+     * Converts this Maybe into a Completable instance composing cancellation
      * through and dropping a success value if emitted.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>

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

@@ -16,20 +16,20 @@
 import java.util.*;
 import java.util.concurrent.*;
 
-import org.reactivestreams.*;
+import org.reactivestreams.Publisher;
 
 import io.reactivex.annotations.*;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.exceptions.Exceptions;
 import io.reactivex.functions.*;
 import io.reactivex.internal.functions.*;
 import io.reactivex.internal.fuseable.ScalarCallable;
+import io.reactivex.internal.observers.*;
 import io.reactivex.internal.operators.completable.CompletableFromObservable;
 import io.reactivex.internal.operators.flowable.FlowableFromObservable;
 import io.reactivex.internal.operators.maybe.MaybeFromObservable;
 import io.reactivex.internal.operators.observable.*;
 import io.reactivex.internal.operators.single.SingleFromObservable;
-import io.reactivex.internal.subscribers.observable.*;
 import io.reactivex.internal.util.*;
 import io.reactivex.observables.*;
 import io.reactivex.observers.*;
@@ -9939,7 +9939,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(Observer<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "s is null");
+        ObjectHelper.requireNonNull(observer, "observer is null");
         try {
             observer = RxJavaPlugins.onSubscribe(this, observer);
 

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

@@ -1907,7 +1907,7 @@ public final Completable flatMapCompletable(final Function<? super T, ? extends
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingGet() {
-        BlockingObserver<T> observer = new BlockingObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
         subscribe(observer);
         return observer.blockingGet();
     }

src/main/java/io/reactivex/internal/disposables/ObserverFullArbiter.java

@@ -65,7 +65,7 @@ void disposeResource() {
         }
     }
 
-    public boolean setSubscription(Disposable s) {
+    public boolean setDisposable(Disposable s) {
         if (cancelled) {
             return false;
         }

src/main/java/io/reactivex/internal/fuseable/ConditionalSubscriber.java

@@ -16,7 +16,7 @@
 import org.reactivestreams.Subscriber;
 
 /**
- * An Subscriber with an additional onNextIf(T) method that
+ * A Subscriber with an additional onNextIf(T) method that
  * tells the caller the specified value has been accepted or
  * not.
  *

src/main/java/io/reactivex/internal/subscribers/observable/BasicFuseableObserver.java renamed to src/main/java/io/reactivex/internal/observers/BasicFuseableObserver.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers.observable;
+package io.reactivex.internal.observers;
 
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;

src/main/java/io/reactivex/internal/subscribers/observable/BasicIntQueueDisposable.java renamed to src/main/java/io/reactivex/internal/observers/BasicIntQueueDisposable.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers.observable;
+package io.reactivex.internal.observers;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

src/main/java/io/reactivex/internal/subscribers/observable/BasicQueueDisposable.java renamed to src/main/java/io/reactivex/internal/observers/BasicQueueDisposable.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers.observable;
+package io.reactivex.internal.observers;
 
 import io.reactivex.internal.fuseable.QueueDisposable;