commit b0c4a0796efe23347c4395c40d5a316814a0cb43
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Jan 14 16:22:50 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 15 22:14:36 2016 +0000
tree 60387033aff4dbdab0afc05cb356e213ba9d6ab7
parent b81477320921c05ef90637fcca68d1f29ee70617

Refactor: Decompose creating CompletableFuture and process intent

Change-Id: I09de2965b7fbf593c1baf3b2e95ab15437f9a092

core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 6802aba..a530797 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -325,8 +325,9 @@
                     (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