Merge pull request #1526 from smallrye/refactor/UniRetry-until-use-di…

…rect-unis refactor(UniRetry): use direct value Uni objects rather than emitters
smallrye · Feb 27, 2024 · cc800eb · cc800eb
2 parents 7b57fe7 + 02d5a1a
commit cc800eb
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java
@@ -140,18 +140,17 @@ public Uni<T> expireIn(long expireIn) {
     public Uni<T> until(Predicate<? super Throwable> predicate) {
         ParameterValidation.nonNull(predicate, "predicate");
         Function<Multi<Throwable>, Flow.Publisher<Long>> whenStreamFactory = stream -> stream.onItem()
-                .transformToUni(failure -> Uni.createFrom().<Long> emitter(emitter -> {
+                .transformToUniAndConcatenate(failure -> {
                     try {
                         if (predicate.test(failure)) {
-                            emitter.complete(1L);
+                            return Uni.createFrom().item(1L);
                         } else {
-                            emitter.fail(failure);
+                            return Uni.createFrom().failure(failure);
                         }
-                    } catch (Throwable ex) {
-                        emitter.fail(ex);
+                    } catch (Throwable err) {
+                        return Uni.createFrom().failure(err);
                     }
-                }))
-                .concatenate();
+                });
         return when(whenStreamFactory);
     }