Skip to content

Commit e912237

Browse files
authored
3.x: Make DisposableContainer public API (#6745)
1 parent 445def8 commit e912237

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import io.reactivex.rxjava3.annotations.NonNull;
1818
import io.reactivex.rxjava3.exceptions.*;
19-
import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
2019
import io.reactivex.rxjava3.internal.functions.ObjectHelper;
2120
import io.reactivex.rxjava3.internal.util.*;
2221

src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java renamed to src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
* the License for the specific language governing permissions and limitations under the License.
1212
*/
1313

14-
package io.reactivex.rxjava3.internal.disposables;
15-
16-
import io.reactivex.rxjava3.disposables.Disposable;
14+
package io.reactivex.rxjava3.disposables;
1715

1816
/**
1917
* Common interface to add and remove disposables from a container.
@@ -38,7 +36,7 @@ public interface DisposableContainer {
3836
boolean remove(Disposable d);
3937

4038
/**
41-
* Removes (but does not dispose) the given disposable if it is part of this
39+
* Removes but does not dispose the given disposable if it is part of this
4240
* container.
4341
* @param d the disposable to remove, not null
4442
* @return true if the operation was successful

src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import java.util.*;
1616

17-
import io.reactivex.rxjava3.disposables.Disposable;
17+
import io.reactivex.rxjava3.disposables.*;
1818
import io.reactivex.rxjava3.exceptions.*;
1919
import io.reactivex.rxjava3.internal.functions.ObjectHelper;
2020
import io.reactivex.rxjava3.internal.util.ExceptionHelper;

src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import io.reactivex.rxjava3.annotations.*;
1919
import io.reactivex.rxjava3.core.Scheduler;
20-
import io.reactivex.rxjava3.disposables.Disposable;
20+
import io.reactivex.rxjava3.disposables.*;
2121
import io.reactivex.rxjava3.internal.disposables.*;
2222
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2323

src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
import java.util.concurrent.*;
1717
import java.util.concurrent.atomic.AtomicReferenceArray;
1818

19-
import io.reactivex.rxjava3.disposables.Disposable;
20-
import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
19+
import io.reactivex.rxjava3.disposables.*;
2120
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2221

2322
public final class ScheduledRunnable extends AtomicReferenceArray<Object>

0 commit comments

Comments
 (0)