Update to beakerx-base version 0.9.1

Author: ctrueden

pom.xml

@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>com.github.twosigma.beakerx</groupId>
 			<artifactId>beaker-kernel-base</artifactId>
-			<version>2d1a1e2</version>
+			<version>0.9.1</version>
 		</dependency>
 
 		<!-- The package to convert images to PNG/JPEG -->

src/main/java/org/scijava/jupyter/kernel/ScijavaKernel.java

@@ -21,12 +21,9 @@
 
 import com.twosigma.beakerx.handler.KernelHandler;
 import com.twosigma.beakerx.kernel.Kernel;
-import com.twosigma.beakerx.kernel.KernelParameters;
 import com.twosigma.beakerx.kernel.KernelSocketsFactory;
 import com.twosigma.beakerx.kernel.handler.CommOpenHandler;
 import com.twosigma.beakerx.message.Message;
-import java.util.HashMap;
-import java.util.Map;
 
 import net.imagej.table.process.ResultsPostprocessor;
 
@@ -56,7 +53,6 @@ public class ScijavaKernel extends Kernel {
     private transient LogService log;
 
     private final ScijavaKernelConfigurationFile config;
-    private final ScijavaEvaluator evaluator;
 
     public ScijavaKernel(final Context context, final String id, final ScijavaEvaluator evaluator,
 	    ScijavaKernelConfigurationFile config, KernelSocketsFactory kernelSocketsFactory) {
@@ -65,7 +61,6 @@ public ScijavaKernel(final Context context, final String id, final ScijavaEvalua
 	this.context = context;
 	this.context.inject(this);
 	this.config = config;
-	this.evaluator = evaluator;
 
 	// Don't show output when it is null
 	Kernel.showNullExecutionResult = false;
@@ -106,12 +101,6 @@ private void setLogLevel(String logLevel) {
 	}
     }
 
-    @Override
-    public KernelParameters getKernelParameters() {
-	Map<String, Object> kernelParameters = new HashMap<>();
-	return new KernelParameters(kernelParameters);
-    }
-
     public static void main(String... args) {
 	final Context context = new Context();
 

src/main/java/org/scijava/jupyter/kernel/evaluator/ScijavaEvaluator.java

@@ -23,10 +23,11 @@
 import com.twosigma.beakerx.evaluator.Evaluator;
 import com.twosigma.beakerx.jvm.object.SimpleEvaluationObject;
 import com.twosigma.beakerx.kernel.Classpath;
+import com.twosigma.beakerx.kernel.EvaluatorParameters;
 import com.twosigma.beakerx.kernel.ImportPath;
 import com.twosigma.beakerx.kernel.Imports;
-import com.twosigma.beakerx.kernel.KernelParameters;
 import com.twosigma.beakerx.kernel.PathToJar;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -48,6 +49,7 @@
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
 import org.scijava.thread.ThreadService;
+import org.scijava.util.FileUtils;
 
 /**
  *
@@ -92,7 +94,7 @@ public ScijavaEvaluator(Context context, String shellId, String sessionId) {
     }
 
     @Override
-    public void setShellOptions(KernelParameters kp) throws IOException {
+    public void setShellOptions(EvaluatorParameters kp) throws IOException {
         log.debug("Set shell options : " + kp);
     }
 
@@ -113,7 +115,7 @@ public AutocompleteResult autocomplete(String code, int index) {
         if (completer != null) {
             AutoCompletionResult result = completer.autocomplete(line, index, scriptEngine);
 
-            matches = (List<String>) result.getMatches();
+            matches = result.getMatches();
             startIndex = index;
 
         } else {
@@ -252,11 +254,6 @@ public void removeImport(ImportPath ip) {
         log.debug("addJarToClasspath()");
     }
 
-    @Override
-    public void initKernel(KernelParameters kp) {
-        log.debug("initKernel()");
-    }
-
     @Override
     public List<Path> addJarsToClasspath(List<PathToJar> list) {
         log.debug("addJarsToClasspath()");
@@ -269,4 +266,28 @@ public boolean addJarToClasspath(PathToJar ptj) {
         return true;
     }
 
+    @Override
+    public void cancelExecution() {
+        log.debug("cancelExecution()");
+    }
+
+    @Override
+    public Path getTempFolder() {
+        log.debug("getTempFolder()");
+        try {
+            return FileUtils.createTemporaryDirectory("scijava-jupyter-kernel", null).toPath();
+        }
+        catch (final IOException exc) {
+            throw new RuntimeException(exc);
+        }
+    }
+
+    @Override
+    public Class<?> loadClass(String clazzName) throws ClassNotFoundException {
+        log.debug("loadClass()");
+        final ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+        final ClassLoader cl = ccl == null ? ClassLoader.getSystemClassLoader() : ccl;
+        return cl.loadClass(clazzName);
+    }
+
 }