Refactor: Use Tools.allOf() to wait until all tasks become completed

Change-Id: I2f032e4d8dd525c4dd40d7ad954dca8c5d33b159

@@ -21,6 +21,7 @@ import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.util.Tools;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.event.AbstractListenerManager;
@@ -322,16 +323,17 @@ public class IntentManager
                  3. accumulate results and submit batch write of IntentData to store
                  3. accumulate results and submit batch write of IntentData to store
                     (we can also try to update these individually)
                     (we can also try to update these individually)
                  */
                  */
-                    store.batchWrite(operations.stream()
+                    List<CompletableFuture<IntentData>> futures = operations.stream()
                             .map(IntentManager.this::submitIntentData)
                             .map(IntentManager.this::submitIntentData)
+                            .map(x -> x.thenApply(FinalIntentProcessPhase::data))
                             .map(x -> x.exceptionally(e -> {
                             .map(x -> x.exceptionally(e -> {
                                 //FIXME
                                 //FIXME
                                 log.warn("Future failed: {}", e);
                                 log.warn("Future failed: {}", e);
                                 return null;
                                 return null;
                             }))
                             }))
-                            .map(CompletableFuture::join)
+                            .collect(Collectors.toList());
+                    store.batchWrite(Tools.allOf(futures).join().stream()
                             .filter(Objects::nonNull)
                             .filter(Objects::nonNull)
-                            .map(FinalIntentProcessPhase::data)
                             .collect(Collectors.toList()));
                             .collect(Collectors.toList()));
                 } catch (Exception e) {
                 } catch (Exception e) {
                     log.error("Error submitting batches:", e);
                     log.error("Error submitting batches:", e);