Use the provided BshScriptEngine

We tried this once before (f17c2fd),
but it didn't take due to a bug in the engine surrounding nulls. But
this version of BeanShell, 2.1.0, no longer suffers from that issue.

Thanks to @subes for bringing it to attention.

Closes #2.

Co-authored-by: Mark Hiner <hinerm@gmail.com>

Author: ctrueden

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scripting-beanshell</artifactId>
-	<version>0.3.5-SNAPSHOT</version>
+	<version>0.4.0-SNAPSHOT</version>
 
 	<name>SciJava Scripting: BeanShell</name>
 	<description>JSR-223-compliant BeanShell scripting language plugin.</description>

src/main/java/org/scijava/plugins/scripting/beanshell/BeanshellBindings.java

@@ -31,34 +31,27 @@
 
 package org.scijava.plugins.scripting.beanshell;
 
-import bsh.Primitive;
-
-import java.util.Arrays;
-import java.util.List;
-
 import javax.script.ScriptEngine;
 
 import org.scijava.plugin.Plugin;
-import org.scijava.script.AbstractScriptLanguage;
+import org.scijava.script.AdaptedScriptLanguage;
 import org.scijava.script.ScriptLanguage;
 
+import bsh.BshScriptEngineFactory;
+import bsh.Primitive;
+
 /**
- * An adapter of the BeanShell interpreter to the SciJava scripting interface.
+ * An adapter of the {@link BshScriptEngineFactory} to the SciJava scripting interface.
  * 
+ * @author Mark Hiner
  * @author Johannes Schindelin
  * @see ScriptEngine
  */
 @Plugin(type = ScriptLanguage.class, name = "BeanShell")
-public class BeanshellScriptLanguage extends AbstractScriptLanguage {
+public class BeanshellScriptLanguage extends AdaptedScriptLanguage {
 
-	@Override
-	public List<String> getExtensions() {
-		return Arrays.asList("bsh", "bs");
-	}
-
-	@Override
-	public ScriptEngine getScriptEngine() {
-		return new BeanshellScriptEngine();
+	public BeanshellScriptLanguage() {
+		super(new BshScriptEngineFactory());
 	}
 
 	@Override

src/main/java/org/scijava/plugins/scripting/beanshell/BeanshellScriptEngine.java

@@ -48,6 +48,8 @@
 import org.scijava.script.ScriptModule;
 import org.scijava.script.ScriptService;
 
+import bsh.BshScriptEngine;
+
 /**
  * Unit tests for the Beanshell support.
  * 
@@ -80,14 +82,14 @@ public void testLocals() throws ScriptException {
 
 		final ScriptLanguage language = scriptService.getLanguageByExtension("bsh");
 		final ScriptEngine engine = language.getScriptEngine();
-		assertEquals(BeanshellScriptEngine.class, engine.getClass());
+		assertEquals(BshScriptEngine.class, engine.getClass());
 		engine.put("hello", 17);
 		assertEquals("17", engine.eval("hello").toString());
 		assertEquals("17", engine.get("hello").toString());
 
 		final Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
 		bindings.clear();
-		assertEquals("void", engine.get("hello").toString());
+		assertEquals(null, engine.get("hello"));
 	}
 
 	@Test
@@ -98,14 +100,14 @@ public void testParameters() throws InterruptedException, ExecutionException,
 		final ScriptService scriptService = context.getService(ScriptService.class);
 
 		final String script = "" + //
-			"// @ScriptService ss\n" + //
-			"// @OUTPUT String language\n" + //
-			"language = ss.getLanguageByName(\"Beanshell\").getLanguageName();\n";
+			"#@ ScriptService ss\n" + //
+			"#@output String language\n" + //
+			"language = ss.getLanguageByName(\"BeanShell\").getLanguageName();\n";
 		final ScriptModule m = scriptService.run("hello.bsh", script, true).get();
 
 		final Object actual = m.getOutput("language");
 		final String expected =
-			scriptService.getLanguageByName("Beanshell").getLanguageName();
+			scriptService.getLanguageByName("BeanShell").getLanguageName();
 		assertEquals(expected, actual);
 
 		final Object result = m.getReturnValue();