ScriptLanguage: move default method impls to iface

Author: ctrueden

src/main/java/org/scijava/script/AbstractScriptLanguage.java

@@ -31,15 +31,10 @@
 
 package org.scijava.script;
 
-import java.util.Collections;
-import java.util.List;
-
-import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.plugin.PluginInfo;
-import org.scijava.util.VersionUtils;
 
 /**
  * Abstract superclass for {@link ScriptLanguage} implementations.
@@ -61,45 +56,8 @@ public String toString() {
 		return getLanguageName();
 	}
 
-	// -- ScriptLanguage methods --
-
-	@Override
-	public boolean isCompiledLanguage() {
-		return false;
-	}
-
-	@Override
-	public Object decode(final Object object) {
-		// NB: No decoding by default.
-		return object;
-	}
-
-	// -- (Possibly) unsupported operations --
-
-	@Override
-	public String getMethodCallSyntax(final String obj, final String m,
-		final String... args)
-	{
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String getOutputStatement(final String toDisplay) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String getProgram(final String... statements) {
-		throw new UnsupportedOperationException();
-	}
-
 	// -- Default implementations --
 
-	@Override
-	public List<String> getExtensions() {
-		return Collections.<String> emptyList();
-	}
-
 	@Override
 	public String getEngineName() {
 		return inferNameFromClassName();
@@ -113,47 +71,6 @@ public String getLanguageName() {
 		return name != null && !name.isEmpty() ? name : inferNameFromClassName();
 	}
 
-	@Override
-	public List<String> getNames() {
-		return Collections.<String> singletonList(getEngineName());
-	}
-
-	@Override
-	public String getLanguageVersion() {
-		return VersionUtils.getVersion(getClass());
-	}
-
-	@Override
-	public List<String> getMimeTypes() {
-		return Collections.<String> emptyList();
-	}
-
-	@Override
-	public Object getParameter(final String key) {
-		if (key.equals(ScriptEngine.ENGINE)) {
-			return getEngineName();
-		}
-		else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
-			return getEngineVersion();
-		}
-		else if (key.equals(ScriptEngine.NAME)) {
-			final List<String> list = getNames();
-			return list.size() > 0 ? list.get(0) : null;
-		}
-		else if (key.equals(ScriptEngine.LANGUAGE)) {
-			return getLanguageName();
-		}
-		else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
-			return getLanguageVersion();
-		}
-		return null;
-	}
-
-	@Override
-	public String getEngineVersion() {
-		return "0.0";
-	}
-
 	// -- Helper methods --
 
 	private String inferNameFromClassName() {

src/main/java/org/scijava/script/ScriptLanguage.java

@@ -31,13 +31,17 @@
 
 package org.scijava.script;
 
+import java.util.Collections;
+import java.util.List;
+
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.module.Module;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
+import org.scijava.util.VersionUtils;
 
 /**
  * The base interface for scripting language adapters.
@@ -67,14 +71,84 @@ public interface ScriptLanguage extends ScriptEngineFactory, RichPlugin,
 {
 
 	/** True iff this language requires a compilation step. */
-	boolean isCompiledLanguage();
+	default boolean isCompiledLanguage() {
+		return false;
+	}
 
 	/**
 	 * Performs any necessary conversion of an encoded object retrieved from the
 	 * language's script engine.
 	 * 
 	 * @see ScriptEngine#get(String)
 	 */
-	Object decode(Object object);
+	default Object decode(final Object object) {
+		// NB: No decoding by default.
+		return object;
+	}
+
+	// -- ScriptEngineFactory methods --
+
+	@Override
+	default String getMethodCallSyntax(final String obj, final String m,
+		final String... args)
+	{
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default String getOutputStatement(final String toDisplay) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default String getProgram(final String... statements) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default List<String> getExtensions() {
+		return Collections.<String> emptyList();
+	}
+
+	@Override
+	default List<String> getNames() {
+		return Collections.<String> singletonList(getEngineName());
+	}
+
+	@Override
+	default String getLanguageVersion() {
+		return VersionUtils.getVersion(getClass());
+	}
+
+	@Override
+	default List<String> getMimeTypes() {
+		return Collections.<String> emptyList();
+	}
+
+	@Override
+	default Object getParameter(final String key) {
+		if (key.equals(ScriptEngine.ENGINE)) {
+			return getEngineName();
+		}
+		else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
+			return getEngineVersion();
+		}
+		else if (key.equals(ScriptEngine.NAME)) {
+			final List<String> list = getNames();
+			return list.size() > 0 ? list.get(0) : null;
+		}
+		else if (key.equals(ScriptEngine.LANGUAGE)) {
+			return getLanguageName();
+		}
+		else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
+			return getLanguageVersion();
+		}
+		return null;
+	}
+
+	@Override
+	default String getEngineVersion() {
+		return "0.0";
+	}
 
 }