diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultRuntime.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultRuntime.java index 65d38b9c27..0f322454ad 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultRuntime.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultRuntime.java @@ -21,11 +21,9 @@ */ import com.google.inject.Injector; -import com.walmartlabs.concord.svm.Runtime; +import com.walmartlabs.concord.svm.*; import com.walmartlabs.concord.runtime.v2.runner.vm.LoggedException; -import com.walmartlabs.concord.svm.State; -import com.walmartlabs.concord.svm.ThreadId; -import com.walmartlabs.concord.svm.VM; +import com.walmartlabs.concord.svm.Runtime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +51,7 @@ public void spawn(State state, ThreadId threadId) { } @Override - public VM.EvalResult eval(State state, ThreadId threadId) throws Exception { + public EvalResult eval(State state, ThreadId threadId) throws Exception { try { return vm.eval(this, state, threadId); } catch (LoggedException e) { diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/EvalResult.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/EvalResult.java new file mode 100644 index 0000000000..b95e9a5c3e --- /dev/null +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/EvalResult.java @@ -0,0 +1,20 @@ +package com.walmartlabs.concord.svm; + +import java.io.Serial; +import java.io.Serializable; + +public class EvalResult implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private final Frame lastFrame; + + public EvalResult(Frame lastFrame) { + this.lastFrame = lastFrame; + } + + public Frame lastFrame() { + return lastFrame; + } +} diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Runtime.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Runtime.java index 86609e7ba6..473c6b2312 100644 --- a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Runtime.java +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Runtime.java @@ -27,7 +27,7 @@ public interface Runtime { */ void spawn(State state, ThreadId threadId); - VM.EvalResult eval(State state, ThreadId threadId) throws Exception; + EvalResult eval(State state, ThreadId threadId) throws Exception; /** * Returns an instance of the specified service using the underlying injector. diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/VM.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/VM.java index 4527b1d04a..cf5ca6f427 100644 --- a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/VM.java +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/VM.java @@ -23,7 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; import java.util.Collection; import java.util.Map; import java.util.Set; @@ -60,7 +59,7 @@ public void start(State state) throws Exception { throw e; } - listeners.fireAfterProcessEnds(runtime, state, result.lastFrame); + listeners.fireAfterProcessEnds(runtime, state, result.lastFrame()); log.debug("start -> done"); } @@ -92,7 +91,7 @@ public void resume(State state, Set eventRefs) throws Exception { throw e; } - listeners.fireAfterProcessEnds(runtime, state, result.lastFrame); + listeners.fireAfterProcessEnds(runtime, state, result.lastFrame()); log.debug("resume ['{}'] -> done", eventRefs); } @@ -249,19 +248,4 @@ private static void wakeSuspended(State state) { } } } - - public static class EvalResult implements Serializable { - - private static final long serialVersionUID = 1L; - - private final Frame lastFrame; - - private EvalResult(Frame lastFrame) { - this.lastFrame = lastFrame; - } - - public Frame lastFrame() { - return lastFrame; - } - } }