Expand promise interface

snapscript · Jan 26, 2019 · 5c3d77e · 5c3d77e
1 parent 8e571ad
commit 5c3d77e
Show file tree

Hide file tree

Showing 20 changed files with 156 additions and 73 deletions.
diff --git a/snap-compile/src/main/java/org/snapscript/compile/StoreContext.java b/snap-compile/src/main/java/org/snapscript/compile/StoreContext.java
@@ -2,19 +2,18 @@
 
 import java.util.concurrent.Executor;
 
-import javafx.concurrent.Task;
 import org.snapscript.common.store.Store;
 import org.snapscript.compile.assemble.ExecutorLinker;
 import org.snapscript.compile.assemble.OperationEvaluator;
 import org.snapscript.compile.validate.ExecutableValidator;
 import org.snapscript.compile.verify.ExecutableVerifier;
 import org.snapscript.core.Context;
 import org.snapscript.core.ContextValidator;
-import org.snapscript.core.ExecutorScheduler;
+import org.snapscript.core.resume.ExecutorScheduler;
 import org.snapscript.core.ExpressionEvaluator;
 import org.snapscript.core.ResourceManager;
 import org.snapscript.core.StoreManager;
-import org.snapscript.core.TaskScheduler;
+import org.snapscript.core.resume.TaskScheduler;
 import org.snapscript.core.constraint.transform.ConstraintTransformer;
 import org.snapscript.core.convert.ConstraintMatcher;
 import org.snapscript.core.convert.proxy.ProxyWrapper;

diff --git a/snap-core/src/main/java/org/snapscript/core/Context.java b/snap-core/src/main/java/org/snapscript/core/Context.java
@@ -9,6 +9,7 @@
 import org.snapscript.core.link.PackageLinker;
 import org.snapscript.core.module.ModuleRegistry;
 import org.snapscript.core.platform.PlatformProvider;
+import org.snapscript.core.resume.TaskScheduler;
 import org.snapscript.core.stack.ThreadStack;
 import org.snapscript.core.trace.TraceInterceptor;
 import org.snapscript.core.type.TypeExtractor;

diff --git a/snap-core/src/main/java/org/snapscript/core/Promise.java b/snap-core/src/main/java/org/snapscript/core/Promise.java
diff --git a/snap-core/src/main/java/org/snapscript/core/error/ErrorHandler.java b/snap-core/src/main/java/org/snapscript/core/error/ErrorHandler.java
@@ -16,7 +16,7 @@ public class ErrorHandler {
    private final CompileErrorHandler compile;
 
    public ErrorHandler(TypeExtractor extractor, ThreadStack stack) {
-      this(extractor, stack, false);
+      this(extractor, stack, true);
    }
 
    public ErrorHandler(TypeExtractor extractor, ThreadStack stack, boolean replace) {

diff --git a/...main/java/org/snapscript/core/Answer.java → ...va/org/snapscript/core/resume/Answer.java b/...main/java/org/snapscript/core/Answer.java → ...va/org/snapscript/core/resume/Answer.java
@@ -1,4 +1,4 @@
-package org.snapscript.core;
+package org.snapscript.core.resume;
 
 public interface Answer {
    void success(Object value);

diff --git a/...rg/snapscript/core/ExecutorScheduler.java → ...script/core/resume/ExecutorScheduler.java b/...rg/snapscript/core/ExecutorScheduler.java → ...script/core/resume/ExecutorScheduler.java
@@ -1,4 +1,4 @@
-package org.snapscript.core;
+package org.snapscript.core.resume;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -7,9 +7,9 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.snapscript.common.Consumer;
 import org.snapscript.core.error.InternalStateException;
 import org.snapscript.core.variable.Value;
 
@@ -23,46 +23,28 @@ public ExecutorScheduler(Executor executor) {
 
    @Override
    public Promise schedule(Task task) {
-      PromiseFuture promise = new PromiseFuture(task);
+      PromiseFuture promise = new PromiseFuture(executor, task);
 
       if(task != null) {
-         promise.execute(executor);
+         promise.execute();
       }
       return promise;
    }
 
-   private static class PromiseJob implements Runnable {
-
-      private final PromiseAnswer answer;
-      private final Task task;
-
-      public PromiseJob(PromiseAnswer answer, Task task) {
-         this.answer = answer;
-         this.task = task;
-      }
-
-      @Override
-      public void run() {
-         try {
-            task.execute(answer);
-         }catch(Throwable e){
-            e.printStackTrace();
-         }
-      }
-   }
-
    private static class PromiseFuture implements Promise {
 
       private final PromiseDispatcher dispatcher;
       private final PromiseAnswer answer;
-      private final PromiseJob job;
+      private final PromiseTask task;
       private final FutureTask future;
+      private final Executor executor;
 
-      public PromiseFuture(Task task) {
+      public PromiseFuture(Executor executor, Task task) {
          this.dispatcher = new PromiseDispatcher();
          this.future = new FutureTask(dispatcher);
          this.answer = new PromiseAnswer(dispatcher, future);
-         this.job = new PromiseJob(answer, task);
+         this.task = new PromiseTask(answer, task);
+         this.executor = executor;
       }
 
       @Override
@@ -84,7 +66,16 @@ public Object get(long wait) {
       }
 
       @Override
-      public Promise  join() {
+      public Object get(long wait, TimeUnit unit) {
+         try {
+            return future.get(wait, unit);
+         } catch(Exception e) {
+            throw new InternalStateException("Could not get value", e);
+         }
+      }
+
+      @Override
+      public Promise join() {
          try {
             future.get();
          } catch(Exception e) {
@@ -94,7 +85,7 @@ public Promise  join() {
       }
 
       @Override
-      public Promise  join(long wait) {
+      public Promise join(long wait) {
          try {
             future.get(wait, MILLISECONDS);
          } catch(Exception e) {
@@ -103,6 +94,16 @@ public Promise  join(long wait) {
          return this;
       }
 
+      @Override
+      public Promise join(long wait, TimeUnit unit) {
+         try {
+            future.get(wait, unit);
+         } catch(Exception e) {
+            return this;
+         }
+         return this;
+      }
+
       @Override
       public Promise failure(Task task) {
          if(task != null) {
@@ -111,6 +112,16 @@ public Promise failure(Task task) {
          return this;
       }
 
+      @Override
+      public Promise failure(Runnable task) {
+         Task adapter = new RunnableTask(task);
+
+         if(task != null) {
+            dispatcher.failure(adapter);
+         }
+         return this;
+      }
+
       @Override
       public Promise success(Task task) {
          if(task != null) {
@@ -119,11 +130,21 @@ public Promise success(Task task) {
          return this;
       }
 
-      public void execute(Executor executor) {
+      @Override
+      public Promise success(Runnable task) {
+         Task adapter = new RunnableTask(task);
+
+         if(task != null) {
+            dispatcher.success(adapter);
+         }
+         return this;
+      }
+
+      public void execute() {
          if(executor != null) {
-            executor.execute(job);
+            executor.execute(task);
          } else {
-            job.run();
+            task.run();
          }
       }
    }
@@ -241,4 +262,23 @@ public void failure(Throwable cause) {
       }
    }
 
+   private static class PromiseTask implements Runnable {
+
+      private final PromiseAnswer answer;
+      private final Task task;
+
+      public PromiseTask(PromiseAnswer answer, Task task) {
+         this.answer = answer;
+         this.task = task;
+      }
+
+      @Override
+      public void run() {
+         try {
+            task.execute(answer);
+         }catch(Throwable cause){
+            answer.failure(cause);
+         }
+      }
+   }
 }
diff --git a/snap-core/src/main/java/org/snapscript/core/resume/Promise.java b/snap-core/src/main/java/org/snapscript/core/resume/Promise.java
@@ -0,0 +1,16 @@
+package org.snapscript.core.resume;
+
+import java.util.concurrent.TimeUnit;
+
+public interface Promise<T> {
+   T get();
+   T get(long wait);
+   T get(long wait, TimeUnit unit);
+   Promise<T> join();
+   Promise<T> join(long wait);
+   Promise<T> join(long wait, TimeUnit unit);
+   Promise<T> success(Task<T> task);
+   Promise<T> success(Runnable task);
+   Promise<T> failure(Task<Throwable> task);
+   Promise<T> failure(Runnable task);
+}
diff --git a/...a/org/snapscript/core/PromiseWrapper.java → ...napscript/core/resume/PromiseWrapper.java b/...a/org/snapscript/core/PromiseWrapper.java → ...napscript/core/resume/PromiseWrapper.java
@@ -1,10 +1,10 @@
-package org.snapscript.core;
+package org.snapscript.core.resume;
 
 import static org.snapscript.core.constraint.Constraint.NONE;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
-import org.snapscript.common.Consumer;
 import org.snapscript.core.constraint.Constraint;
 import org.snapscript.core.scope.Scope;
 import org.snapscript.core.type.Type;
@@ -68,6 +68,11 @@ public Object get(long wait) {
          return object;
       }
 
+      @Override
+      public Object get(long wait, TimeUnit unit) {
+         return object;
+      }
+
       @Override
       public Promise join() {
          return this;
@@ -78,15 +83,35 @@ public Promise join(long wait) {
          return this;
       }
 
+      @Override
+      public Promise join(long wait, TimeUnit unit) {
+         return this;
+      }
+
       @Override
       public Promise success(Task task) {
-         task.execute(object);
+         if(task != null) {
+            task.execute(object);
+         }
+         return this;
+      }
+
+      @Override
+      public Promise success(Runnable task) {
+         if(task != null) {
+            task.run();
+         }
          return this;
       }
 
       @Override
       public Promise failure(Task task) {
          return this;
       }
+
+      @Override
+      public Promise failure(Runnable task) {
+         return this;
+      }
    }
 }
diff --git a/snap-core/src/main/java/org/snapscript/core/resume/RunnableTask.java b/snap-core/src/main/java/org/snapscript/core/resume/RunnableTask.java
@@ -0,0 +1,15 @@
+package org.snapscript.core.resume;
+
+public class RunnableTask implements Task {
+
+   private final Runnable task;
+
+   public RunnableTask(Runnable task) {
+      this.task = task;
+   }
+
+   @Override
+   public void execute(Object value) {
+      task.run();
+   }
+}
diff --git a/...c/main/java/org/snapscript/core/Task.java → ...java/org/snapscript/core/resume/Task.java b/...c/main/java/org/snapscript/core/Task.java → ...java/org/snapscript/core/resume/Task.java
@@ -1,4 +1,4 @@
-package org.snapscript.core;
+package org.snapscript.core.resume;
 
 public interface Task<T> {
    void execute(T value);

diff --git a/...va/org/snapscript/core/TaskScheduler.java → ...snapscript/core/resume/TaskScheduler.java b/...va/org/snapscript/core/TaskScheduler.java → ...snapscript/core/resume/TaskScheduler.java
@@ -1,4 +1,4 @@
-package org.snapscript.core;
+package org.snapscript.core.resume;
 
 public interface TaskScheduler {
    Promise schedule(Task<Answer> task);

diff --git a/snap-core/src/main/resources/import.txt b/snap-core/src/main/resources/import.txt
@@ -111,8 +111,8 @@ xml = javax.xml {}
 
 # snap imports
 
-core = org.snapscript.core { Promise }
-resume = org.snapscript.core.resume { Yield }
+core = org.snapscript.core { Context }
+resume = org.snapscript.core.resume { Yield, Promise, Task, Answer }
 compile = org.snapscript.compile {}
 common = org.snapscript.common {}
 
diff --git a/snap-core/src/test/java/org/snapscript/core/FunctionBinderTest.java b/snap-core/src/test/java/org/snapscript/core/FunctionBinderTest.java
@@ -22,6 +22,8 @@
 import org.snapscript.core.module.ModuleRegistry;
 import org.snapscript.core.module.Path;
 import org.snapscript.core.platform.PlatformProvider;
+import org.snapscript.core.resume.ExecutorScheduler;
+import org.snapscript.core.resume.TaskScheduler;
 import org.snapscript.core.scope.EmptyModel;
 import org.snapscript.core.scope.Model;
 import org.snapscript.core.scope.ModelScope;

diff --git a/snap-core/src/test/java/org/snapscript/core/MockContext.java b/snap-core/src/test/java/org/snapscript/core/MockContext.java
@@ -15,6 +15,8 @@
 import org.snapscript.core.module.ModuleRegistry;
 import org.snapscript.core.module.Path;
 import org.snapscript.core.platform.PlatformProvider;
+import org.snapscript.core.resume.ExecutorScheduler;
+import org.snapscript.core.resume.TaskScheduler;
 import org.snapscript.core.stack.ThreadStack;
 import org.snapscript.core.trace.TraceInterceptor;
 import org.snapscript.core.type.CacheTypeLoader;

diff --git a/snap-tree/src/main/java/org/snapscript/tree/resume/AsyncExecution.java b/snap-tree/src/main/java/org/snapscript/tree/resume/AsyncExecution.java
@@ -2,13 +2,13 @@
 
 import java.util.Iterator;
 
-import org.snapscript.core.Answer;
+import org.snapscript.core.resume.Answer;
 import org.snapscript.core.Bug;
 import org.snapscript.core.Execution;
-import org.snapscript.core.Promise;
-import org.snapscript.core.PromiseWrapper;
-import org.snapscript.core.Task;
-import org.snapscript.core.TaskScheduler;
+import org.snapscript.core.resume.Promise;
+import org.snapscript.core.resume.PromiseWrapper;
+import org.snapscript.core.resume.Task;
+import org.snapscript.core.resume.TaskScheduler;
 import org.snapscript.core.result.Result;
 import org.snapscript.core.resume.Yield;
 import org.snapscript.core.scope.Scope;