simplifying ScriptTask

kernel/src/main/java/jj/document/servable/DocumentRequestProcessor.java

@@ -105,15 +105,15 @@ public String baseName() {
 	}
 
 	public void process() {
-		taskRunner.execute(new DocumentRequestProcessTask(documentScriptEnvironment, continuationCoordinator));
+		taskRunner.execute(new DocumentRequestProcessTask(documentScriptEnvironment));
 	}
 
 	private final class DocumentRequestProcessTask extends ScriptTask<DocumentScriptEnvironment> {
 
 		private boolean run = false;
 
-		protected DocumentRequestProcessTask(DocumentScriptEnvironment scriptEnvironment, ContinuationCoordinator continuationCoordinator) {
-			super("processing document request at " + scriptEnvironment.name(), scriptEnvironment, continuationCoordinator);
+		protected DocumentRequestProcessTask(DocumentScriptEnvironment scriptEnvironment) {
+			super("processing document request at " + scriptEnvironment.name(), scriptEnvironment);
 		}
 
 		@Override

kernel/src/main/java/jj/http/server/websocket/ConnectionEventExecutor.java

@@ -56,7 +56,6 @@ public void submit(final WebSocketConnection connection, final String event, fin
 			new ConnectionEventTask(
 				"host event " + event + " on WebSocket connection",
 				connection,
-				continuationCoordinator,
 				args,
 				event
 			)
@@ -74,11 +73,10 @@ private final class ConnectionEventTask extends ScriptTask<WebSocketConnectionHo
 		private ConnectionEventTask(
 			String name,
 			WebSocketConnection connection,
-			ContinuationCoordinator continuationCoordinator,
 			Object[] args,
 			String event
 		) {
-			super(name, connection.webSocketConnectionHost(), continuationCoordinator);
+			super(name, connection.webSocketConnectionHost());
 			this.args = args;
 			this.connection = connection;
 			this.event = event;

kernel/src/main/java/jj/jasmine/SpecCoordinator.java

@@ -61,17 +61,14 @@ class SpecCoordinator {
 	void scriptInitialized(final ScriptEnvironmentInitialized event) {
 		// right now, checking this way for testing purposes, to let mocks in
 		if (JasmineScriptEnvironment.class.isAssignableFrom(event.scriptEnvironment().getClass())) {
-			taskRunner.execute(new SpecEvaluationTask((JasmineScriptEnvironment)event.scriptEnvironment(), continuationCoordinator));
+			taskRunner.execute(new SpecEvaluationTask((JasmineScriptEnvironment)event.scriptEnvironment()));
 		}
 	}
 
 	private final class SpecEvaluationTask extends ScriptTask<JasmineScriptEnvironment> {
 
-		SpecEvaluationTask(
-			final JasmineScriptEnvironment scriptEnvironment,
-			final ContinuationCoordinator continuationCoordinator
-		) {
-			super("spec execution for " + scriptEnvironment, scriptEnvironment, continuationCoordinator);
+		SpecEvaluationTask(final JasmineScriptEnvironment scriptEnvironment) {
+			super("spec execution for " + scriptEnvironment, scriptEnvironment);
 		}
 
 		@Override
@@ -87,17 +84,14 @@ protected boolean errored(Throwable cause) {
 
 		@Override
 		protected void complete() throws Exception {
-			taskRunner.execute(new TargetEvaluationTask(scriptEnvironment, continuationCoordinator));
+			taskRunner.execute(new TargetEvaluationTask(scriptEnvironment));
 		}
 	}
 
 	private final class TargetEvaluationTask extends ScriptTask<JasmineScriptEnvironment> {
 
-		TargetEvaluationTask(
-			final JasmineScriptEnvironment scriptEnvironment,
-			final ContinuationCoordinator continuationCoordinator
-		) {
-			super("target execution for " + scriptEnvironment, scriptEnvironment, continuationCoordinator);
+		TargetEvaluationTask(final JasmineScriptEnvironment scriptEnvironment) {
+			super("target execution for " + scriptEnvironment, scriptEnvironment);
 		}
 
 		@Override
@@ -113,17 +107,14 @@ protected boolean errored(Throwable cause) {
 
 		@Override
 		protected void complete() throws Exception {
-			taskRunner.execute(new RunnerEvaluationTask(scriptEnvironment, continuationCoordinator));
+			taskRunner.execute(new RunnerEvaluationTask(scriptEnvironment));
 		}
 	}
 
 	private final class RunnerEvaluationTask extends ScriptTask<JasmineScriptEnvironment> {
 
-		RunnerEvaluationTask(
-			final JasmineScriptEnvironment scriptEnvironment,
-			final ContinuationCoordinator continuationCoordinator
-		) {
-			super("runner execution for " + scriptEnvironment, scriptEnvironment, continuationCoordinator);
+		RunnerEvaluationTask(final JasmineScriptEnvironment scriptEnvironment) {
+			super("runner execution for " + scriptEnvironment, scriptEnvironment);
 		}
 
 		@Override

kernel/src/main/java/jj/repl/ReplHandler.java

@@ -106,7 +106,7 @@ protected void messageReceived(final ChannelHandlerContext ctx, final String msg
 					"repl-console"
 				);
 
-				taskRunner.execute(new ScriptTask<ReplScriptEnvironment>("repl execution:\n" + msg, rse, continuationCoordinator) {
+				taskRunner.execute(new ScriptTask<ReplScriptEnvironment>("repl execution:\n" + msg, rse) {
 
 					@Override
 					protected void begin() throws Exception {

kernel/src/main/java/jj/script/AbstractScriptEnvironment.java

@@ -105,6 +105,8 @@ protected Dependencies(
 
 	private final ContinuationCoordinator continuationCoordinator;
 
+	private final ContinuationPendingCache continuationPendingCache;
+
 	private final Dependencies dependencies;
 
 	private volatile ScriptExecutionState state = Unitialized;
@@ -114,6 +116,7 @@ protected Dependencies(
 	protected AbstractScriptEnvironment(Dependencies dependencies) {
 		super(dependencies);
 		this.contextProvider = dependencies.scriptEnvironmentDependencies.contextProvider;
+		this.continuationPendingCache = dependencies.scriptEnvironmentDependencies.continuationPendingCache;
 		this.continuationCoordinator = dependencies.scriptEnvironmentDependencies.continuationCoordinator;
 		this.dependencies = dependencies;
 	}
@@ -148,6 +151,10 @@ public boolean initializationDidError() {
 	ContinuationPendingKey resumeContinuation(ContinuationPendingKey pendingKey, Object result) {
 		return continuationCoordinator.resumeContinuation(this, pendingKey, result);
 	}
+
+	<T extends ScriptEnvironment> void awaitContinuation(ScriptTask<T> task) {
+		continuationPendingCache.storeForContinuation(task);
+	}
 
 	/**
 	 * mark this environment as being initialized

kernel/src/main/java/jj/script/ContinuationCoordinator.java

@@ -59,11 +59,5 @@ public interface ContinuationCoordinator {
 	 * @param result
 	 */
 	void resume(ContinuationPendingKey pendingKey, Object result);
-
-	/**
-	 * Pass a task instance in to await a continuation
-	 * @param task
-	 */
-	void awaitContinuation(ScriptTask<? extends ScriptEnvironment> task);
 
 }

kernel/src/main/java/jj/script/ContinuationCoordinatorImpl.java

@@ -126,11 +126,6 @@ public ContinuationPendingKey execute(final ScriptEnvironment scriptEnvironment,
 		return null;
 	}
 
-	@Override
-	public void awaitContinuation(ScriptTask<? extends ScriptEnvironment> task) {
-		cache.storeForContinuation(task);
-	}
-
 	/**
 	 * Resumes a continuation that was previously saved from an execution in this class
 	 * @param pendingKey

kernel/src/main/java/jj/script/ContinuationPendingCache.java

@@ -44,7 +44,7 @@ class ContinuationPendingCache {
 	}
 
 	private final ScriptTask<ScriptEnvironment> reserved = 
-		new ScriptTask<ScriptEnvironment>("", null, null) {
+		new ScriptTask<ScriptEnvironment>("", null) {
 
 			@Override
 			protected void begin() throws Exception {
@@ -53,7 +53,7 @@ protected void begin() throws Exception {
 		};
 
 	private final ScriptTask<ScriptEnvironment> alreadyResumed =
-		new ScriptTask<ScriptEnvironment>("", null, null) {
+		new ScriptTask<ScriptEnvironment>("", null) {
 
 			@Override
 			protected void begin() throws Exception {

kernel/src/main/java/jj/script/ScriptEnvironmentInitializer.java

@@ -80,7 +80,7 @@ protected HashMap<ScriptEnvironment, List<TaskOrKey>> initialValue() {
 	}
 
 	void initializeScript(AbstractScriptEnvironment se) {
-		taskRunner.execute(new InitializerTask("initializing " + se, se, continuationCoordinator));
+		taskRunner.execute(new InitializerTask("initializing " + se, se));
 	}
 
 	void scriptEnvironmentInitialized(ScriptEnvironment scriptEnvironment) {
@@ -132,8 +132,8 @@ private class InitializerTask extends ScriptTask<AbstractScriptEnvironment> {
 		 * @param name
 		 * @param scriptEnvironment
 		 */
-		protected InitializerTask(String name, AbstractScriptEnvironment scriptEnvironment, ContinuationCoordinator continuationCoordinator) {
-			super(name, scriptEnvironment, continuationCoordinator);
+		protected InitializerTask(String name, AbstractScriptEnvironment scriptEnvironment) {
+			super(name, scriptEnvironment);
 		}
 
 		protected void begin() throws Exception {

kernel/src/main/java/jj/script/ScriptTask.java

@@ -29,8 +29,6 @@ public abstract class ScriptTask<T extends ScriptEnvironment> extends DelayedTas
 
 	protected final T scriptEnvironment;
 
-	protected final ContinuationCoordinator continuationCoordinator;
-
 	/** assign the result of any operation against the ContinuationCoordinator to this field */
 	protected ContinuationPendingKey pendingKey;
 
@@ -45,10 +43,9 @@ public abstract class ScriptTask<T extends ScriptEnvironment> extends DelayedTas
 	 */
 	protected Object result;
 
-	protected ScriptTask(final String name, final T scriptEnvironment, final ContinuationCoordinator continuationCoordinator) {
+	protected ScriptTask(final String name, final T scriptEnvironment) {
 		super(name);
 		this.scriptEnvironment = scriptEnvironment;
-		this.continuationCoordinator = continuationCoordinator;
 	}
 
 	@Override
@@ -65,7 +62,7 @@ protected final void run() throws Exception {
 		if (pendingKey == null) {
 			complete();
 		} else {
-			continuationCoordinator.awaitContinuation(this);
+			((AbstractScriptEnvironment)scriptEnvironment).awaitContinuation(this);
 		}
 	}
 

kernel/src/main/java/jj/script/Timers.java

@@ -100,36 +100,33 @@ private String setTimer(final Callable function, final int delay, final boolean
 		final String key = "jj-timer-" + cancelIds.next();
 		final ScriptEnvironment rootEnvironment = env.currentRootScriptEnvironment();
 
-		ScriptTask<ScriptEnvironment> task = new ScriptTask<ScriptEnvironment>(
-			repeat ? "setInterval" : "setTimeout",
-			env.current(),
-			continuationCoordinator
-		) {
-			@Override
-			protected void begin() throws Exception {
-				// if this is setTimeout, kill the cancelation structure
-				if (!repeat) {
-					killTimerCancelKey(rootEnvironment, key);
+		ScriptTask<ScriptEnvironment> task =
+			new ScriptTask<ScriptEnvironment>(repeat ? "setInterval" : "setTimeout", env.current()) {
+				@Override
+				protected void begin() throws Exception {
+					// if this is setTimeout, kill the cancelation structure
+					if (!repeat) {
+						killTimerCancelKey(rootEnvironment, key);
+					}
+					
+					pendingKey = continuationCoordinator.execute(scriptEnvironment, function, args);
 				}
 
-				pendingKey = continuationCoordinator.execute(scriptEnvironment, function, args);
-			}
-
-			@Override
-			protected void complete() throws Exception {
-				// we need to repeat once the task is complete, as an artifact of the resumable structure
-				// to do otherwise would require a way to clone tasks, which should actually be doable?
-				// but for now, repeat on complete
-				if (repeat) {
-					repeat();
+				@Override
+				protected void complete() throws Exception {
+					// we need to repeat once the task is complete, as an artifact of the resumable structure
+					// to do otherwise would require a way to clone tasks, which should actually be doable?
+					// but for now, repeat on complete
+					if (repeat) {
+						repeat();
+					}
 				}
-			}
-
-			@Override
-			protected long delay() {
-				return delay;
-			}
-		};
+
+				@Override
+				protected long delay() {
+					return delay;
+				}
+			};
 
 		taskRunner.execute(task);
 

kernel/src/main/java/jj/script/api/ServerEventCallableInvoker.java

@@ -60,11 +60,8 @@ protected void invoke(final Object event) {
 		assert callable != null : "invoker invoked without set callable";
 
 		if (alive) {
-			taskRunner.execute(new ScriptTask<ScriptEnvironment>(
-				"invoking " + target.name() + " function with server event " + event.getClass().getName(),
-				target,
-				continuationCoordinator
-			) {
+			String name = "invoking " + target.name() + " function with server event " + event.getClass().getName();
+			taskRunner.execute(new ScriptTask<ScriptEnvironment>(name, target) {
 				@Override
 				protected void begin() throws Exception {
 					if (alive) {

kernel/src/test/java/jj/script/ContinuationPendingCacheTest.java

@@ -54,7 +54,7 @@ private static final class HelperTask extends ScriptTask<ScriptEnvironment> {
 		/** it will never run so nulls are cool!
 		 */
 		protected HelperTask(ContinuationPendingKey pendingKey) {
-			super("", null, null);
+			super("", null);
 			this.pendingKey = pendingKey;
 		}