Add command dependency in DebugAdapter

akaroml · akaroml · commit 9f616f4bec54 · 2017-12-19T13:13:11.000+08:00
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java
@@ -16,8 +16,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import com.microsoft.java.debug.core.Configuration;
 import com.microsoft.java.debug.core.adapter.handler.AttachRequestHandler;
@@ -67,17 +69,24 @@ public CompletableFuture<Messages.Response> dispatchRequest(Messages.Request req
 
         Command command = Command.parse(request.command);
         List<Command> dependencies = getCommandDependencies(command);
+        CompletableFuture<Object> aggregatedDependencyFuture = new CompletableFuture<>();
+        if (dependencies.size() == 0) {
+            aggregatedDependencyFuture.complete(null);
+        } else {
+            AtomicInteger unresolvedFutureCount = new AtomicInteger(dependencies.size());
+            for (CompletableFuture<Messages.Response> result : getFutures(dependencies)) {
+                result.whenComplete((res, err) -> {
+                    if (unresolvedFutureCount.decrementAndGet() == 0) {
+                        aggregatedDependencyFuture.complete(null);
+                    }
+                });
+            }
+        }
 
-        getLastResults(dependencies)
-
-        CompletableFuture<Messages.Response> thisResponse = CompletableFuture
-            .allOf(getLastResults(dependencies))
-            .thenCompose((Void v) -> {
-                return processRequest(request, response);
-            });
+        CompletableFuture<Messages.Response> thisFuture = aggregatedDependencyFuture.thenCompose(o -> processRequest(request, response));
+        setFuture(command, thisFuture);
 
-        setLastResult(command, thisResponse);
-        return thisResponse;
+        return thisFuture;
     }
 
     private CompletableFuture<Messages.Response> processRequest(Messages.Request request, Messages.Response response) {
@@ -149,15 +158,15 @@ private List<Command> getCommandDependencies(Command command) {
         return commandDependencies.computeIfAbsent(command, key -> new ArrayList());
     }
 
-    private CompletableFuture<Messages.Response> getLastResult(Command command) {
+    private CompletableFuture<Messages.Response> getFuture(Command command) {
         return lastResponses.computeIfAbsent(command, key -> CompletableFuture.completedFuture(new Messages.Response()));
     }
 
-    private List<CompletableFuture<Messages.Response>> getLastResults(List<Command> commands) {
-        return new ArrayList(commands.stream().map(cmd -> getLastResult(cmd)).toArray(CompletableFuture[]::new));
+    private List<CompletableFuture<Messages.Response>> getFutures(List<Command> commands) {
+        return commands.stream().map(cmd -> getFuture(cmd)).collect(Collectors.toList());
     }
 
-    private void setLastResult(Command command, CompletableFuture<Messages.Response> response) {
+    private void setFuture(Command command, CompletableFuture<Messages.Response> response) {
         lastResponses.put(command, response);
     }
 }
