Revert BEP refactor (#3130)

* Revert "BEP refactor (#2285)" - This reverts commit 4348c94. * Test BEP in flatmap * Revert copyright year Signed-off-by: Daniel Kec <daniel.kec@oracle.com>
helidon-io · Jun 20, 2021 · 1c08b6a · 1c08b6a
1 parent e915fd8
commit 1c08b6a
Show file tree

Hide file tree

Showing 6 changed files with 243 additions and 334 deletions.
diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/BiConsumerChain.java b/common/reactive/src/main/java/io/helidon/common/reactive/BiConsumerChain.java
@@ -30,6 +30,13 @@ public void accept(T t, S s) {
         }
     }
 
+    BiConsumerChain<T, S> combineWith(BiConsumer<? super T, ? super S> another) {
+        BiConsumerChain<T, S> newChain = new BiConsumerChain<>();
+        newChain.addAll(this);
+        newChain.add(another);
+        return newChain;
+    }
+
     static <T, S> BiConsumer<T, S> combine(
             BiConsumer<T, S> current,
             BiConsumer<T, S> another) {
@@ -39,18 +46,12 @@ static <T, S> BiConsumer<T, S> combine(
         if (another == null) {
             return current;
         }
-        BiConsumerChain<T, S> newChain = new BiConsumerChain<>();
         if (current instanceof BiConsumerChain) {
-            newChain.addAll((BiConsumerChain<T, S>) current);
-        } else {
-            newChain.add(current);
-        }
-
-        if (another instanceof BiConsumerChain) {
-            newChain.addAll((BiConsumerChain<T, S>) another);
-        } else {
-            newChain.add(another);
+            return ((BiConsumerChain<T, S>) current).combineWith(another);
         }
+        BiConsumerChain<T, S> newChain = new BiConsumerChain<>();
+        newChain.add(current);
+        newChain.add(another);
         return newChain;
     }
 }