refactoring - shortcircuiting CodeEvaluator/JShell integration

Author: andrus

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernelBuilder.java

@@ -6,8 +6,6 @@
 import org.dflib.jjava.jupyter.kernel.magic.MagicTranspiler;
 import org.dflib.jjava.jupyter.kernel.magic.MagicsResolver;
 import org.dflib.jjava.kernel.execution.CodeEvaluator;
-import org.dflib.jjava.kernel.execution.JJavaExecutionControl;
-import org.dflib.jjava.kernel.execution.JJavaLoaderDelegate;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,9 +55,7 @@ protected JShell buildJShell(CodeEvaluator evaluator) {
     protected CodeEvaluator buildCodeEvaluator(String name) {
         long timeoutDuration = this.timeoutUnit != null ? this.timeoutDuration : -1;
         TimeUnit timeoutUnit = this.timeoutUnit != null ? this.timeoutUnit : TimeUnit.MILLISECONDS;
-        return new CodeEvaluator(
-                name,
-                new JJavaExecutionControl(new JJavaLoaderDelegate(), timeoutDuration, timeoutUnit));
+        return new CodeEvaluator(name, timeoutDuration, timeoutUnit);
     }
 
     protected MagicsResolver buildMagicsResolver(MagicTranspiler transpiler) {

jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java

@@ -16,6 +16,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -38,11 +39,17 @@ public class CodeEvaluator {
     }
 
     private final String name;
+    private final long timeoutDuration;
+    private final TimeUnit timeoutUnit;
+    private final JJavaLoaderDelegate loaderDelegate;
     private final JJavaExecutionControl execControl;
 
-    public CodeEvaluator(String name, JJavaExecutionControl execControl) {
+    public CodeEvaluator(String name, long timeoutDuration, TimeUnit timeoutUnit) {
         this.name = name;
-        this.execControl = execControl;
+        this.timeoutDuration = timeoutDuration;
+        this.timeoutUnit = timeoutUnit;
+        this.loaderDelegate = new JJavaLoaderDelegate();
+        this.execControl = new JJavaExecutionControl(loaderDelegate, timeoutDuration, timeoutUnit);
     }
 
     public ExecutionControlProvider getExecControlProvider() {
@@ -120,7 +127,7 @@ protected Object evalSingle(JShell shell, String code, EvalTimer timer) {
                         EvalException ee = (EvalException) e;
                         switch (ee.getExceptionClassName()) {
                             case JJavaExecutionControl.EXECUTION_TIMEOUT_NAME:
-                                throw new EvaluationTimeoutException(execControl.getTimeoutDuration(), execControl.getTimeoutUnit(), code.trim());
+                                throw new EvaluationTimeoutException(timeoutDuration, timeoutUnit, code.trim());
                             case JJavaExecutionControl.EXECUTION_INTERRUPTED_NAME:
                                 throw new EvaluationInterruptedException(code.trim());
                             default:
@@ -239,7 +246,7 @@ public void interrupt() {
     }
 
     public ClassLoader getClassLoader() {
-        return execControl.getClassLoader();
+        return loaderDelegate.getClassLoader();
     }
 
     static final class SimpleExecControlProvider implements ExecutionControlProvider {

jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/JJavaExecutionControl.java

@@ -25,7 +25,7 @@
  * An ExecutionControl very similar to {@link jdk.jshell.execution.LocalExecutionControl} but which
  * also logs the actual result of an invocation before being serialized.
  */
-public class JJavaExecutionControl extends DirectExecutionControl {
+class JJavaExecutionControl extends DirectExecutionControl {
 
     // generate a semi-unique thread name prefix for each JVM run for easier detection of JJavaExecutionControl-produced threads
     private static final String THREAD_NAME_PREFIX = "jjava-exec-"
@@ -68,21 +68,6 @@ public JJavaExecutionControl(JJavaLoaderDelegate loaderDelegate, long timeoutDur
         this.executor = Executors.newCachedThreadPool(r -> new Thread(r, THREAD_NAME_PREFIX + EXECUTOR_THREAD_ID.getAndIncrement()));
     }
 
-    /**
-     * Returns JShell ClassLoader
-     */
-    public ClassLoader getClassLoader() {
-        return loaderDelegate.getClassLoader();
-    }
-
-    public long getTimeoutDuration() {
-        return timeoutDuration;
-    }
-
-    public TimeUnit getTimeoutUnit() {
-        return timeoutUnit;
-    }
-
     @Override
     public void stop() {
         executor.shutdownNow();

jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/JJavaLoaderDelegate.java

@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class JJavaLoaderDelegate implements LoaderDelegate {
+class JJavaLoaderDelegate implements LoaderDelegate {
 
     private static final String CLASSPATH_PROPERTY = "java.class.path";
     private static final String PATH_SEPARATOR = System.getProperty("path.separator");

…java/kernel/JJavaLoaderDelegateTest.java …l/execution/JJavaLoaderDelegateTest.javajjava-kernel/src/test/java/org/dflib/jjava/kernel/JJavaLoaderDelegateTest.java renamed to jjava-kernel/src/test/java/org/dflib/jjava/kernel/execution/JJavaLoaderDelegateTest.java jjava-kernel/src/test/java/org/dflib/jjava/kernel/JJavaLoaderDelegateTest.java renamed to jjava-kernel/src/test/java/org/dflib/jjava/kernel/execution/JJavaLoaderDelegateTest.java

@@ -1,7 +1,6 @@
-package org.dflib.jjava.kernel;
+package org.dflib.jjava.kernel.execution;
 
 import jdk.jshell.spi.ExecutionControl;
-import org.dflib.jjava.kernel.execution.JJavaLoaderDelegate;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;