Remove 'Completable' prefix from nested interfaces, move its subscription to top-level. (#4425)

Author: JakeWharton

src/main/java/rx/Completable.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx;
+
+import rx.annotations.Experimental;
+
+/**
+ * Represents the subscription API callbacks when subscribing to a Completable instance.
+ */
+@Experimental
+public interface CompletableSubscriber {
+    /**
+     * Called once the deferred computation completes normally.
+     */
+    void onCompleted();
+
+    /**
+     * Called once if the deferred computation 'throws' an exception.
+     * @param e the exception, not null.
+     */
+    void onError(Throwable e);
+
+    /**
+     * Called once by the Completable to set a Subscription on this instance which
+     * then can be used to cancel the subscription at any time.
+     * @param d the Subscription instance to call dispose on for cancellation, not null
+     */
+    void onSubscribe(Subscription d);
+}

src/main/java/rx/CompletableSubscriber.java

@@ -2021,7 +2021,7 @@ public void onCompleted() {
                     }
                 };
 
-                final Completable.CompletableSubscriber so = new Completable.CompletableSubscriber() {
+                final CompletableSubscriber so = new CompletableSubscriber() {
                     @Override
                     public void onCompleted() {
                         onError(new CancellationException("Stream was canceled before emitting a terminal event."));

src/main/java/rx/Single.java

@@ -17,15 +17,15 @@
 package rx.internal.operators;
 
 import rx.Completable;
-import rx.Completable.CompletableOnSubscribe;
-import rx.Completable.CompletableSubscriber;
+import rx.Completable.OnSubscribe;
+import rx.CompletableSubscriber;
 import rx.Single;
 import rx.SingleSubscriber;
 import rx.Subscription;
 import rx.exceptions.Exceptions;
 import rx.functions.Func1;
 
-public final class CompletableFlatMapSingleToCompletable<T> implements CompletableOnSubscribe {
+public final class CompletableFlatMapSingleToCompletable<T> implements OnSubscribe {
 
     final Single<T> source;
 

src/main/java/rx/internal/operators/CompletableFlatMapSingleToCompletable.java

@@ -19,13 +19,13 @@
 import java.util.concurrent.atomic.*;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.exceptions.MissingBackpressureException;
 import rx.internal.util.unsafe.SpscArrayQueue;
 import rx.plugins.RxJavaHooks;
 import rx.subscriptions.SerialSubscription;
 
-public final class CompletableOnSubscribeConcat implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeConcat implements OnSubscribe {
     final Observable<Completable> sources;
     final int prefetch;
 

src/main/java/rx/internal/operators/CompletableOnSubscribeConcat.java

@@ -19,10 +19,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.subscriptions.SerialSubscription;
 
-public final class CompletableOnSubscribeConcatArray implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeConcatArray implements OnSubscribe {
     final Completable[] sources;
 
     public CompletableOnSubscribeConcatArray(Completable[] sources) {

src/main/java/rx/internal/operators/CompletableOnSubscribeConcatArray.java

@@ -20,10 +20,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.subscriptions.*;
 
-public final class CompletableOnSubscribeConcatIterable implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeConcatIterable implements OnSubscribe {
     final Iterable<? extends Completable> sources;
 
     public CompletableOnSubscribeConcatIterable(Iterable<? extends Completable> sources) {

src/main/java/rx/internal/operators/CompletableOnSubscribeConcatIterable.java

@@ -21,13 +21,13 @@
 import java.util.concurrent.atomic.*;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.Observable;
 import rx.exceptions.CompositeException;
 import rx.plugins.RxJavaHooks;
 import rx.subscriptions.CompositeSubscription;
 
-public final class CompletableOnSubscribeMerge implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeMerge implements OnSubscribe {
     final Observable<Completable> source;
     final int maxConcurrency;
     final boolean delayErrors;

src/main/java/rx/internal/operators/CompletableOnSubscribeMerge.java

@@ -19,11 +19,11 @@
 import java.util.concurrent.atomic.*;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.plugins.RxJavaHooks;
 import rx.subscriptions.CompositeSubscription;
 
-public final class CompletableOnSubscribeMergeArray implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeMergeArray implements OnSubscribe {
     final Completable[] sources;
 
     public CompletableOnSubscribeMergeArray(Completable[] sources) {

src/main/java/rx/internal/operators/CompletableOnSubscribeMergeArray.java

@@ -21,10 +21,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import rx.*;
-import rx.Completable.*;
+import rx.Completable.OnSubscribe;
 import rx.subscriptions.CompositeSubscription;
 
-public final class CompletableOnSubscribeMergeDelayErrorArray implements CompletableOnSubscribe {
+public final class CompletableOnSubscribeMergeDelayErrorArray implements OnSubscribe {
     final Completable[] sources;
 
     public CompletableOnSubscribeMergeDelayErrorArray(Completable[] sources) {