From 67fe9deca2e9db7f1b1df793da9e95e563f4c9c5 Mon Sep 17 00:00:00 2001 From: Julien Ponge Date: Mon, 15 Sep 2025 22:59:12 +0200 Subject: [PATCH] style: misc code polishing edits --- .../operators/multi/builders/NeverMulti.java | 1 + .../uni/builders/UniCreateFromPublisher.java | 1 + .../mutiny/CompositeExceptionTest.java | 8 +++--- .../mutiny/groups/UniOnFailureRetryTest.java | 2 +- .../helpers/test/AssertSubscriberTest.java | 28 +++++++++++-------- .../mutiny/operators/MultiCollectTest.java | 3 +- .../mutiny/operators/MultiMergeTest.java | 2 +- .../mutiny/operators/UniOnEventTest.java | 6 ++-- .../mutiny/operators/uni/UniJoinTest.java | 2 +- 9 files changed, 29 insertions(+), 24 deletions(-) diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/builders/NeverMulti.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/builders/NeverMulti.java index 238da0b9c..0d4bd9e0e 100644 --- a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/builders/NeverMulti.java +++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/builders/NeverMulti.java @@ -20,6 +20,7 @@ public final class NeverMulti extends AbstractMulti { * @param the value type * @return the {@code multi} */ + @SuppressWarnings("unchecked") public static Multi never() { return (Multi) NEVER; } diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java index fa4c4a986..ed88b09d3 100644 --- a/implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java +++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java @@ -22,6 +22,7 @@ public UniCreateFromPublisher(Flow.Publisher publisher) { } @Override + @SuppressWarnings("unchecked") public void subscribe(UniSubscriber subscriber) { new PublisherSubscriber(publisher, subscriber).forward(); } diff --git a/implementation/src/test/java/io/smallrye/mutiny/CompositeExceptionTest.java b/implementation/src/test/java/io/smallrye/mutiny/CompositeExceptionTest.java index 86e2c8af7..6cce577db 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/CompositeExceptionTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/CompositeExceptionTest.java @@ -22,8 +22,8 @@ public void testCreationWithArrays() { CompositeException ce2 = new CompositeException(IO, IAE, OUPS); assertThat(ce1).hasMessageContaining("iae").hasMessageContaining("io").hasMessageContaining("oups"); - assertThat(ce1).getCause().isEqualTo(IAE); - assertThat(ce2).getCause().isEqualTo(IO); + assertThat(ce1).cause().isEqualTo(IAE); + assertThat(ce2).cause().isEqualTo(IO); assertThat(ce1.getCauses()).containsExactly(IAE, IO, OUPS); assertThat(ce1.getSuppressed()).containsExactly(IO, OUPS); @@ -43,8 +43,8 @@ public void testCreationWithList() { CompositeException ce2 = new CompositeException(Arrays.asList(IO, IAE, OUPS)); assertThat(ce1).hasMessageContaining("iae").hasMessageContaining("io").hasMessageContaining("oups"); - assertThat(ce1).getCause().isEqualTo(IAE); - assertThat(ce2).getCause().isEqualTo(IO); + assertThat(ce1).cause().isEqualTo(IAE); + assertThat(ce2).cause().isEqualTo(IO); assertThat(ce1.getCauses()).containsExactly(IAE, IO, OUPS); assertThat(ce1.getSuppressed()).containsExactly(IO, OUPS); diff --git a/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java b/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java index 5b78b6d5b..8cb29bf3c 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/groups/UniOnFailureRetryTest.java @@ -209,7 +209,7 @@ public void testRetryWithBackOffReachingMaxAttempt() { .onFailure().retry().withBackOff(Duration.ofMillis(10), Duration.ofSeconds(20)).withJitter(1.0) .atMost(4) .await().atMost(Duration.ofSeconds(5)); - }).getCause() // Expected exception is wrapped in a java.util.concurrent.CompletionException + }).cause() // Expected exception is wrapped in a java.util.concurrent.CompletionException .hasMessageContaining("boom") .hasSuppressedException(new IllegalStateException("Retries exhausted: 4/4")); } diff --git a/implementation/src/test/java/io/smallrye/mutiny/helpers/test/AssertSubscriberTest.java b/implementation/src/test/java/io/smallrye/mutiny/helpers/test/AssertSubscriberTest.java index 4281c698d..bdef9263e 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/helpers/test/AssertSubscriberTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/helpers/test/AssertSubscriberTest.java @@ -82,22 +82,26 @@ public void testAssertItemsMessages() { subscriber.assertItems("a", "b", "c"); - String m1 = "\nExpected to have received exactly:\n" + - "\n" + - "but received:\n" + - ".\n" + - "Mismatches are:\n" + - "\t- Missing expected item "; + String m1 = """ + + Expected to have received exactly: + + but received: + . + Mismatches are: + \t- Missing expected item """; assertThatThrownBy(() -> subscriber.assertItems("a", "b", "c", "d")) .isInstanceOf(AssertionError.class) .hasMessage(m1); - String m2 = "\nExpected to have received exactly\n" + - "\n" + - "but received\n" + - ".\n" + - "The following items were not expected:\n" + - ""; + String m2 = """ + + Expected to have received exactly + + but received + . + The following items were not expected: + """; assertThatThrownBy(() -> subscriber.assertItems("a", "b")) .isInstanceOf(AssertionError.class) .hasMessage(m2); diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/MultiCollectTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/MultiCollectTest.java index 6a61b0630..b05d8e88b 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/operators/MultiCollectTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/operators/MultiCollectTest.java @@ -535,8 +535,7 @@ public String toString() { } public boolean equals(Object object) { - if (object instanceof TestObject) { - TestObject test = (TestObject) object; + if (object instanceof TestObject test) { return test.key.equals(this.key) && test.value.equals(this.value); } diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/MultiMergeTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/MultiMergeTest.java index 42a19336e..59b258373 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/operators/MultiMergeTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/operators/MultiMergeTest.java @@ -210,7 +210,7 @@ public void testWithFailureCollectionWithMerge() { public void failureMustTriggerCancellations() { AtomicBoolean firstCancelled = new AtomicBoolean(); Multi first = Multi.createBy().repeating().uni( - () -> Uni.createFrom().item(123).onItem().delayIt().by(Duration.ofSeconds(5))).atMost(10l) + () -> Uni.createFrom().item(123).onItem().delayIt().by(Duration.ofSeconds(5))).atMost(10L) .onCancellation().invoke(() -> firstCancelled.set(true)); Multi second = Multi.createFrom().failure(new IOException("boom")); AssertSubscriber sub = Multi.createBy().merging().streams(first, second) diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnEventTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnEventTest.java index b896c5a77..dfa36b38c 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnEventTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnEventTest.java @@ -542,7 +542,7 @@ public void testActionsOnTerminationWithFailure() { subscriber.assertFailed().assertFailedWith(CompositeException.class, "boom"); CompositeException compositeException = (CompositeException) subscriber.getFailure(); - assertThat(compositeException).getRootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); + assertThat(compositeException).rootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); assertThat(compositeException.getCauses().get(1)).isInstanceOf(IOException.class).hasMessageContaining("tada"); assertThat(Item).doesNotHaveValue(1); assertThat(subscription.get()).isNotNull(); @@ -590,7 +590,7 @@ public void testActionsOnTerminationWithSupplierOnFailure() { subscriber.assertFailed().assertFailedWith(CompositeException.class, "boom"); CompositeException compositeException = (CompositeException) subscriber.getFailure(); - assertThat(compositeException).getRootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); + assertThat(compositeException).rootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); assertThat(compositeException.getCauses().get(1)).isInstanceOf(IOException.class).hasMessageContaining("tada"); assertThat(Item).doesNotHaveValue(1); assertThat(subscription.get()).isNotNull(); @@ -615,7 +615,7 @@ public void testActionsOnTerminationWithMapperThrowingException() { subscriber.assertFailed().assertFailedWith(CompositeException.class, "boom"); CompositeException compositeException = (CompositeException) subscriber.getFailure(); - assertThat(compositeException).getRootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); + assertThat(compositeException).rootCause().isInstanceOf(IOException.class).hasMessageContaining("boom"); assertThat(compositeException.getCauses().get(1)).isInstanceOf(RuntimeException.class).hasMessageContaining("tada"); assertThat(Item).doesNotHaveValue(1); assertThat(subscription.get()).isNotNull(); diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/uni/UniJoinTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/uni/UniJoinTest.java index e92308e51..fb39e9ebd 100644 --- a/implementation/src/test/java/io/smallrye/mutiny/operators/uni/UniJoinTest.java +++ b/implementation/src/test/java/io/smallrye/mutiny/operators/uni/UniJoinTest.java @@ -72,7 +72,7 @@ void oneIsNull() { } @Nested - @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressWarnings({ "ResultOfMethodCallIgnored", "unchecked" }) class Emptyness { @Test void emptyArraysJoinFirst() {