run on separate thread

Author: bergman

flo-workflow/src/main/java/com/spotify/flo/context/OverridingContext.java

@@ -26,7 +26,6 @@
 import com.spotify.flo.Task;
 import com.spotify.flo.TaskContextStrict;
 import java.util.Optional;
-import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,21 +45,30 @@ public static EvalContext composeWith(EvalContext baseContext) {
 
   @Override
   public <T> Value<T> evaluateInternal(Task<T> task, EvalContext context) {
-    final Optional<T> lookup =
+    final Optional<? extends TaskContextStrict<?, T>> taskContextStrict =
         task.contexts().stream()
             .filter(c -> c instanceof TaskContextStrict)
             .map(c -> (TaskContextStrict<?, T>) c)
-            .map(l -> l.lookup(task))
-            .findFirst()
-            .flatMap(Function.identity());
+            .findFirst();
 
-    if (lookup.isPresent()) {
-      final T t = lookup.get();
-      LOG.debug("Not expanding {}, lookup = {}", colored(task.id()), t);
-      return context.immediateValue(t);
+    if (taskContextStrict.isPresent()) {
+      return context.value(() -> taskContextStrict.get().lookup(task))
+          .flatMap(v -> {
+            if (v.isPresent()) {
+              final T t = v.get();
+              LOG.debug("Not expanding {}, lookup = {}", colored(task.id()), t);
+              return context.immediateValue(t);
+            } else {
+              return delegateEvaluation(task, context);
+            }
+          });
     } else {
-      LOG.debug("Expanding {}", colored(task.id()));
-      return delegate.evaluateInternal(task, context);
+      return delegateEvaluation(task, context);
     }
   }
+
+  private <T> Value<T> delegateEvaluation(Task<T> task, EvalContext context) {
+    LOG.debug("Expanding {}", colored(task.id()));
+    return delegate.evaluateInternal(task, context);
+  }
 }