Refactor: Decompose creating CompletableFuture and process intent

Change-Id: I09de2965b7fbf593c1baf3b2e95ab15437f9a092

Refactor: Decompose creating CompletableFuture and process intent
Change-Id: I09de2965b7fbf593c1baf3b2e95ab15437f9a092
Sho SHIMIZU · Gerrit Code Review
Commit b0c4a0796efe23347c4395c40d5a316814a0cb43 b0c4a079 1 parent b8147732
Showing 1 changed file with 3 additions and 2 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
View file @b0c4a07
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
View file @b0c4a07
@@ -325,8 +325,9 @@ public class IntentManager
                     (we can also try to update these individually)
                  */
                     List<CompletableFuture<IntentData>> futures = operations.stream()
-                             .map(x -> createInitialPhase(x))
-                             .map(x -> CompletableFuture.supplyAsync(() -> process(x), workerExecutor))
+                             .map(IntentManager.this::createInitialPhase)
+                             .map(CompletableFuture::completedFuture)
+                             .map(x -> x.thenApplyAsync(IntentManager.this::process, workerExecutor))
                             .map(x -> x.thenApply(FinalIntentProcessPhase::data))
                             .map(x -> x.exceptionally(e -> {
                                 //FIXME