4.x: Disposable no longer impls AutoCloseable (#8184)

* 4.x: Disposable no longer impls AutoCloseable

* Remove Disposable::close, fix code coverage

Author: akarnokd

build.gradle

@@ -297,7 +297,7 @@ if (project.hasProperty("releaseMode")) {
   }
   mavenPublishing {
       // or when publishing to https://central.sonatype.com/
-      publishToMavenCentral(true, DeploymentValidation.PUBLISHED)
+      publishToMavenCentral(true, com.vanniktech.maven.publish.DeploymentValidation.PUBLISHED)
 
       // signAllPublications()
   }

src/main/java/io/reactivex/rxjava4/disposables/Disposable.java

@@ -25,7 +25,7 @@
 /**
  * Represents a disposable resource.
  */
-public interface Disposable extends AutoCloseable {
+public interface Disposable {
     /**
      * Dispose the resource, the operation should be idempotent.
      */
@@ -37,14 +37,6 @@ public interface Disposable extends AutoCloseable {
      */
     boolean isDisposed();
 
-    /**
-     * Dispose the resource, the operation should be idempotent.
-     * @since 4.0.0
-     */
-    default void close() {
-        dispose();
-    }
-
     /**
      * Construct a {@code Disposable} by wrapping a {@link Runnable} that is
      * executed exactly once when the {@code Disposable} is disposed.
@@ -75,9 +67,9 @@ static Disposable fromAction(@NonNull Action action) {
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
+     * canceled exactly once when the {@code Disposable} is disposed.
      * <p>
-     * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
+     * The {@code Future} is canceled with {@code mayInterruptIfRunning == true}.
      * @param future the {@code Future} to wrap
      * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code future} is {@code null}
@@ -92,7 +84,7 @@ static Disposable fromFuture(@NonNull Future<?> future) {
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
+     * canceled exactly once when the {@code Disposable} is disposed.
      * @param future the {@code Future} to wrap
      * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
      * @return the new {@code Disposable} instance
@@ -107,7 +99,7 @@ static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt)
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
+     * canceled exactly once when the {@code Disposable} is disposed.
      * @param subscription the {@code Runnable} to wrap
      * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code subscription} is {@code null}
@@ -147,6 +139,17 @@ static AutoCloseable toAutoCloseable(@NonNull Disposable disposable) {
         return disposable::dispose;
     }
 
+    /**
+     * Wraps this {@code Disposable} into an {@link AutoCloseable} instance
+     * that can be used with try-with-resources constructs.
+     * @return the new {@code AutoCloseable} instance
+     * @since 4.0.0
+     */
+    @NonNull
+    default AutoCloseable asAutoCloseable() {
+        return this::dispose;
+    }
+
     /**
      * Returns a new, non-disposed {@code Disposable} instance.
      * @return a new, non-disposed {@code Disposable} instance

src/main/java/io/reactivex/rxjava4/disposables/DisposableContainer.java

@@ -95,13 +95,13 @@ default Disposable subscribe(Disposable d) {
      * cases where the dispose signal has no side effects to work with.
      * @since 4.0.0
      */
-    static DisposableContainer NEVER = new NeverDisposableContainer();
+    DisposableContainer NEVER = new NeverDisposableContainer();
 
     /**
      * Implementation of a never disposable container.
      * @since 4.0.0
      */
-    static record NeverDisposableContainer() implements DisposableContainer {
+    record NeverDisposableContainer() implements DisposableContainer {
 
         @Override
         public void dispose() {

src/main/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRefCount.java

@@ -92,7 +92,6 @@ protected void subscribeActual(Subscriber<? super T> s) {
         }
     }
 
-    @SuppressWarnings("resource")
     void cancel(RefConnection rc) {
         SequentialDisposable sd;
         synchronized (this) {

src/main/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAmb.java

@@ -69,7 +69,6 @@ public void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        @SuppressWarnings("resource")
         AmbCoordinator<T> ac = new AmbCoordinator<>(observer, count);
         ac.subscribe(sources);
     }

src/main/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCombineLatest.java

@@ -73,7 +73,6 @@ public void subscribeActual(Observer<? super R> observer) {
             return;
         }
 
-        @SuppressWarnings("resource")
         LatestCoordinator<T, R> lc = new LatestCoordinator<>(observer, combiner, count, bufferSize, delayError);
         lc.subscribe(sources);
     }

src/main/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRefCount.java

@@ -89,7 +89,6 @@ protected void subscribeActual(Observer<? super T> observer) {
         }
     }
 
-    @SuppressWarnings("resource")
     void cancel(RefConnection rc) {
         SequentialDisposable sd;
         synchronized (this) {

src/main/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZip.java

@@ -69,7 +69,6 @@ public void subscribeActual(Observer<? super R> observer) {
             return;
         }
 
-        @SuppressWarnings("resource")
         ZipCoordinator<T, R> zc = new ZipCoordinator<>(observer, zipper, count, delayError);
         zc.subscribe(sources, bufferSize);
     }

src/main/java/io/reactivex/rxjava4/internal/schedulers/DeferredExecutorScheduler.java

@@ -105,7 +105,6 @@ public Disposable schedule(@NonNull Runnable run) {
                 task = interruptibleTask;
                 disposable = interruptibleTask;
             } else {
-                @SuppressWarnings("resource")
                 BooleanRunnable runnableTask = new BooleanRunnable(decoratedRun);
 
                 task = runnableTask;

src/main/java/io/reactivex/rxjava4/internal/schedulers/ExecutorScheduler.java

@@ -167,7 +167,6 @@ public Disposable schedule(@NonNull Runnable run) {
                 task = interruptibleTask;
                 disposable = interruptibleTask;
             } else {
-                @SuppressWarnings("resource")
                 BooleanRunnable runnableTask = new BooleanRunnable(decoratedRun);
 
                 task = runnableTask;