Cleanups - part 1

akarnokd · akarnokd · commit 32994e57d625 · 2026-03-18T17:41:05.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ ext {
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
-    jmhLibVersion = "1.21"
+    jmhLibVersion = "1.37"
     guavaVersion = "33.5.0-jre"
     jupiterVersion = "5.11.3"
     jupiterLauncherVersion = "1.11.3"
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/BinaryFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/BinaryFlatMapPerf.java
@@ -22,6 +22,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports") 
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/CallableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/CallableAsyncPerf.java
@@ -21,6 +21,7 @@
 import io.reactivex.rxjava4.internal.schedulers.SingleScheduler;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/EachTypeFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/EachTypeFlatMapPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlatMapJustPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlatMapJustPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlattenCrossMapPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlattenCrossMapPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlattenJustPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlattenJustPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlattenRangePerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlattenRangePerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlowableFlatMapCompletableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlowableFlatMapCompletableAsyncPerf.java
@@ -23,6 +23,7 @@
 import io.reactivex.rxjava4.internal.functions.Functions;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/FlowableFlatMapCompletableSyncPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/FlowableFlatMapCompletableSyncPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.internal.functions.Functions;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/InputWithIncrementingInteger.java b/src/jmh/java/io/reactivex/rxjava4/core/InputWithIncrementingInteger.java
@@ -25,6 +25,7 @@
 /**
  * Exposes an Observable and Observer that increments n Integers and consumes them in a Blackhole.
  */
+@SuppressWarnings("exports")
 public abstract class InputWithIncrementingInteger {
     final class DefaultSubscriberImpl extends DefaultSubscriber<Integer> {
         @Override
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/JustAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/JustAsyncPerf.java
@@ -21,6 +21,7 @@
 import io.reactivex.rxjava4.internal.schedulers.SingleScheduler;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/LatchedSingleObserver.java b/src/jmh/java/io/reactivex/rxjava4/core/LatchedSingleObserver.java
@@ -19,6 +19,7 @@
 
 import io.reactivex.rxjava4.disposables.Disposable;
 
+@SuppressWarnings("exports")
 public final class LatchedSingleObserver<T> implements SingleObserver<T> {
     final CountDownLatch cdl;
     final Blackhole bh;
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/ObservableFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/ObservableFlatMapPerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/OperatorMergePerf.java b/src/jmh/java/io/reactivex/rxjava4/core/OperatorMergePerf.java
@@ -22,6 +22,7 @@
 import io.reactivex.rxjava4.functions.Function;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
 public class OperatorMergePerf {
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfAsyncConsumer.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfAsyncConsumer.java
@@ -23,6 +23,7 @@
 /**
  * A multi-type asynchronous consumer.
  */
+@SuppressWarnings("exports")
 public final class PerfAsyncConsumer extends CountDownLatch implements FlowableSubscriber<Object>, Observer<Object>,
 SingleObserver<Object>, CompletableObserver, MaybeObserver<Object> {
 
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfBoundedSubscriber.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfBoundedSubscriber.java
@@ -21,6 +21,7 @@
 /**
  * Performance subscriber with a one-time request from the upstream.
  */
+@SuppressWarnings("exports")
 public class PerfBoundedSubscriber extends CountDownLatch implements FlowableSubscriber<Object> {
 
     final Blackhole bh;
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfConsumer.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfConsumer.java
@@ -21,6 +21,7 @@
 /**
  * A multi-type synchronous consumer.
  */
+@SuppressWarnings("exports")
 public final class PerfConsumer implements FlowableSubscriber<Object>, Observer<Object>,
 SingleObserver<Object>, CompletableObserver, MaybeObserver<Object> {
 
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfInteropConsumer.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfInteropConsumer.java
@@ -22,6 +22,7 @@
  * A multi-type synchronous consumer that doesn't implement FlowableSubscriber and
  * thus should be treated by Flowable as a candidate for strict interop.
  */
+@SuppressWarnings("exports")
 public final class PerfInteropConsumer implements Subscriber<Object>, Observer<Object>,
 SingleObserver<Object>, CompletableObserver, MaybeObserver<Object> {
 
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfObserver.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfObserver.java
@@ -19,6 +19,7 @@
 
 import io.reactivex.rxjava4.disposables.Disposable;
 
+@SuppressWarnings("exports")
 public final class PerfObserver implements Observer<Object> {
     final CountDownLatch cdl;
     final Blackhole bh;
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PerfSubscriber.java b/src/jmh/java/io/reactivex/rxjava4/core/PerfSubscriber.java
@@ -18,6 +18,7 @@
 import org.openjdk.jmh.infra.Blackhole;
 import org.reactivestreams.Subscription;
 
+@SuppressWarnings("exports")
 public class PerfSubscriber implements FlowableSubscriber<Object> {
 
     public final CountDownLatch latch = new CountDownLatch(1);
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/PublishProcessorPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/PublishProcessorPerf.java
@@ -21,6 +21,7 @@
 import io.reactivex.rxjava4.processors.PublishProcessor;
 import io.reactivex.rxjava4.subjects.PublishSubject;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/RangePerf.java b/src/jmh/java/io/reactivex/rxjava4/core/RangePerf.java
@@ -21,6 +21,7 @@
 import io.reactivex.rxjava4.internal.schedulers.SingleScheduler;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/ReducePerf.java b/src/jmh/java/io/reactivex/rxjava4/core/ReducePerf.java
@@ -21,6 +21,7 @@
 
 import io.reactivex.rxjava4.functions.BiFunction;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/RxVsStreamPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/RxVsStreamPerf.java
@@ -22,6 +22,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/StrictPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/StrictPerf.java
@@ -20,6 +20,7 @@
 import org.openjdk.jmh.infra.Blackhole;
 import org.reactivestreams.*;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/core/XMapYPerf.java b/src/jmh/java/io/reactivex/rxjava4/core/XMapYPerf.java
@@ -22,6 +22,7 @@
 
 import io.reactivex.rxjava4.functions.Function;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/jmh/java/io/reactivex/rxjava4/parallel/ParallelPerf.java b/src/jmh/java/io/reactivex/rxjava4/parallel/ParallelPerf.java
@@ -25,6 +25,7 @@
 import io.reactivex.rxjava4.functions.Function;
 import io.reactivex.rxjava4.schedulers.Schedulers;
 
+@SuppressWarnings("exports")
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
diff --git a/src/main/java/io/reactivex/rxjava4/exceptions/Exceptions.java b/src/main/java/io/reactivex/rxjava4/exceptions/Exceptions.java
@@ -67,8 +67,6 @@ public static void throwIfFatal(@NonNull Throwable t) {
         // values here derived from https://github.com/ReactiveX/RxJava/issues/748#issuecomment-32471495
         if (t instanceof VirtualMachineError) {
             throw (VirtualMachineError) t;
-        } else if (t instanceof ThreadDeath) {
-            throw (ThreadDeath) t;
         } else if (t instanceof LinkageError) {
             throw (LinkageError) t;
         }
diff --git a/src/test/java/io/reactivex/rxjava4/core/Retry.java b/src/test/java/io/reactivex/rxjava4/core/Retry.java
@@ -21,6 +21,7 @@
  * Test rule to retry flaky tests.
  * <a href="http://stackoverflow.com/a/8301639/61158">From Stackoverflow</a>.
  */
+@SuppressWarnings("exports")
 public class Retry implements TestRule {
 
     final class RetryStatement extends Statement {
diff --git a/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java b/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java
@@ -20,6 +20,7 @@
 
 import io.reactivex.rxjava4.testsupport.SuppressUndeliverableRule;
 
+@SuppressWarnings("exports")
 public abstract class RxJavaTest {
     @Rule
     public Timeout globalTimeout = new Timeout(5, TimeUnit.MINUTES);
diff --git a/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java b/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java
@@ -140,63 +140,12 @@ public void onNext(Integer t) {
         });
     }
 
-    @Test(expected = ThreadDeath.class)
-    public void threadDeathIsThrown() {
-        Observable.just(1).subscribe(new Observer<Integer>() {
-
-            @Override
-            public void onSubscribe(Disposable d) {
-
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                e.printStackTrace();
-            }
-
-            @Override
-            public void onNext(Integer t) {
-                throw new ThreadDeath();
-            }
-
-        });
-    }
 
     @Test
     public void utilityClass() {
         TestHelper.checkUtilityClass(Exceptions.class);
     }
 
-    @Test
-    public void manualThrowIfFatal() {
-
-        try {
-            Exceptions.throwIfFatal(new ThreadDeath());
-            fail("Didn't throw fatal exception");
-        } catch (ThreadDeath ex) {
-            // expected
-        }
-
-        try {
-            Exceptions.throwIfFatal(new LinkageError());
-            fail("Didn't throw fatal error");
-        } catch (LinkageError ex) {
-            // expected
-        }
-
-        try {
-            ExceptionHelper.wrapOrThrow(new LinkageError());
-            fail("Didn't propagate Error");
-        } catch (LinkageError ex) {
-            // expected
-        }
-    }
-
     @Test
     public void manualPropagate() {
 
diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java
@@ -67,7 +67,7 @@ public Supplier<Integer> supplier() {
 
             @Override
             public BiConsumer<Integer, Integer> accumulator() {
-                return (a, b) -> { };
+                return (_, _) -> { };
             }
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java
@@ -365,7 +365,7 @@ public void addRemoveRace() {
     public void valuesAreReclaimable() throws Exception {
         ConnectableObservable<byte[]> source =
                 Observable.range(0, 200)
-                        .map($ -> new byte[1024 * 1024])
+                        .map(_ -> new byte[1024 * 1024])
                         .publish();
 
         System.out.println("Bounded Replay Leak check: Wait before GC");
diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/MarbleDimensions.java b/src/test/java/io/reactivex/rxjava4/internal/util/MarbleDimensions.java
@@ -15,7 +15,7 @@
 
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.URL;
+import java.net.URI;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.regex.*;
@@ -69,7 +69,7 @@ public static void main(String[] args) throws Throwable {
                         Thread.sleep(SLEEP_PER_IMAGE_MILLIS);
 
                         try {
-                            BufferedImage bimg = ImageIO.read(new URL(url));
+                            BufferedImage bimg = ImageIO.read(new URI(url).toURL());
 
                             if (bimg == null) {
                                 throw new IOException("not found");
diff --git a/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java
@@ -494,7 +494,7 @@ public void run() {
                 running.countDown();
             }
             for (int i = 0; i < numStringsToSend; i++) {
-                observer.onNext(Thread.currentThread().getId() + "-" + i);
+                observer.onNext(Thread.currentThread().threadId() + "-" + i);
                 if (latch != null) {
                     latch.countDown();
                 }
diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java
@@ -495,7 +495,7 @@ public void run() {
                 running.countDown();
             }
             for (int i = 0; i < numStringsToSend; i++) {
-                subscriber.onNext(Thread.currentThread().getId() + "-" + i);
+                subscriber.onNext(Thread.currentThread().threadId() + "-" + i);
                 if (latch != null) {
                     latch.countDown();
                 }
