Fix missing assertion in test and reduce the amount of duplication be…

…tween MultiResource and MultiResourceUni
smallrye · Mar 11, 2021 · 24ebf3a · 24ebf3a
1 parent 30da80a
commit 24ebf3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiResource.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiResource.java
@@ -40,12 +40,16 @@ public MultiResource(Supplier<? extends R> resourceSupplier,
      * @return the multi
      */
     public Multi<I> withFinalizer(Consumer<? super R> finalizer) {
+        Function<? super R, Uni<Void>> actual = getUniFunction(finalizer);
+        return withFinalizer(actual, (r, ignored) -> actual.apply(r), actual);
+    }
+
+    static <R> Function<? super R, Uni<Void>> getUniFunction(Consumer<? super R> finalizer) {
         Consumer<? super R> callback = Infrastructure.decorate(ParameterValidation.nonNull(finalizer, "finalizer"));
-        Function<? super R, Uni<Void>> actual = r -> {
+        return r -> {
             callback.accept(r);
             return Uni.createFrom().voidItem();
         };
-        return withFinalizer(actual, (r, ignored) -> actual.apply(r), actual);
     }
 
     /**

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiResourceUni.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiResourceUni.java
@@ -1,5 +1,7 @@
 package io.smallrye.mutiny.groups;
 
+import static io.smallrye.mutiny.groups.MultiResource.getUniFunction;
+
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -41,11 +43,7 @@ public MultiResourceUni(Supplier<Uni<R>> resourceSupplier,
      * @return the multi
      */
     public Multi<I> withFinalizer(Consumer<? super R> finalizer) {
-        Consumer<? super R> callback = Infrastructure.decorate(ParameterValidation.nonNull(finalizer, "finalizer"));
-        Function<? super R, Uni<Void>> actual = r -> {
-            callback.accept(r);
-            return Uni.createFrom().voidItem();
-        };
+        Function<? super R, Uni<Void>> actual = getUniFunction(finalizer);
         return withFinalizer(actual, (r, ignored) -> actual.apply(r), actual);
     }
 

diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniCreateFromEmitterTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniCreateFromEmitterTest.java
@@ -139,7 +139,7 @@ public void testThatEmitterIsDisposed() {
 
         subscriber.assertCompleted();
         assertThat(reference.get()).isInstanceOf(DefaultUniEmitter.class)
-                .satisfies(e -> ((DefaultUniEmitter<? super Void>) e).isTerminated());
+                .satisfies(e -> assertThat(((DefaultUniEmitter<? super Void>) e).isTerminated()).isTrue());
     }
 
     @Test