ScriptService: move default method impls to iface

Author: ctrueden

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

@@ -32,8 +32,6 @@
 package org.scijava.script;
 
 import java.io.File;
-import java.io.Reader;
-import java.io.StringReader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -120,21 +118,6 @@ public ScriptLanguageIndex getIndex() {
 		return scriptLanguageIndex();
 	}
 
-	@Override
-	public List<ScriptLanguage> getLanguages() {
-		return new ArrayList<>(getIndex());
-	}
-
-	@Override
-	public ScriptLanguage getLanguageByExtension(final String extension) {
-		return getIndex().getByExtension(extension);
-	}
-
-	@Override
-	public ScriptLanguage getLanguageByName(final String name) {
-		return getIndex().getByName(name);
-	}
-
 	// -- ScriptService methods - scripts --
 
 	@Override
@@ -189,34 +172,6 @@ public Future<ScriptModule> run(final File file, final boolean process,
 		return run(getOrCreate(file), process, inputMap);
 	}
 
-	@Override
-	public Future<ScriptModule> run(final String path, final String script,
-		final boolean process, final Object... inputs)
-	{
-		return run(path, new StringReader(script), process, inputs);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final String script,
-		final boolean process, final Map<String, Object> inputMap)
-	{
-		return run(path, new StringReader(script), process, inputMap);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final Reader reader,
-		final boolean process, final Object... inputs)
-	{
-		return run(new ScriptInfo(getContext(), path, reader), process, inputs);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final Reader reader,
-		final boolean process, final Map<String, Object> inputMap)
-	{
-		return run(new ScriptInfo(getContext(), path, reader), process, inputMap);
-	}
-
 	@Override
 	public Future<ScriptModule> run(final ScriptInfo info, final boolean process,
 		final Object... inputs)
@@ -231,21 +186,6 @@ public Future<ScriptModule> run(final ScriptInfo info, final boolean process,
 		return cast(moduleService.run(info, process, inputMap));
 	}
 
-	@Override
-	public boolean canHandleFile(final File file) {
-		return getIndex().canHandleFile(file);
-	}
-
-	@Override
-	public boolean canHandleFile(final String fileName) {
-		return getIndex().canHandleFile(fileName);
-	}
-
-	@Override
-	public void addAlias(final Class<?> type) {
-		addAlias(type.getSimpleName(), type);
-	}
-
 	@Override
 	public void addAlias(final String alias, final Class<?> type) {
 		aliasMap().put(alias, type);
@@ -274,13 +214,6 @@ public synchronized Class<?> lookupClass(final String alias)
 		}
 	}
 
-	// -- PTService methods --
-
-	@Override
-	public Class<ScriptLanguage> getPluginType() {
-		return ScriptLanguage.class;
-	}
-
 	// -- Service methods --
 
 	@Override

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

@@ -33,8 +33,9 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -83,13 +84,19 @@ public interface ScriptService extends SingletonService<ScriptLanguage>,
 	 * This method does the same thing as {@link #getInstances()}.
 	 * </p>
 	 */
-	List<ScriptLanguage> getLanguages();
+	default List<ScriptLanguage> getLanguages() {
+		return new ArrayList<>(getIndex());
+	}
 
 	/** Gets the scripting language that handles the given file extension. */
-	ScriptLanguage getLanguageByExtension(String extension);
+	default ScriptLanguage getLanguageByExtension(final String extension) {
+		return getIndex().getByExtension(extension);
+	}
 
 	/** Gets the scripting language with the given name. */
-	ScriptLanguage getLanguageByName(String name);
+	default ScriptLanguage getLanguageByName(final String name) {
+		return getIndex().getByName(name);
+	}
 
 	// -- Scripts --
 
@@ -180,8 +187,11 @@ Future<ScriptModule> run(File file, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, String script, boolean process,
-		Object... inputs) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final String script,
+		final boolean process, final Object... inputs)
+	{
+		return run(path, new StringReader(script), process, inputs);
+	}
 
 	/**
 	 * Executes the given script.
@@ -201,8 +211,11 @@ Future<ScriptModule> run(String path, String script, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, String script, boolean process,
-		Map<String, Object> inputMap) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final String script,
+		final boolean process, final Map<String, Object> inputMap)
+	{
+		return run(path, new StringReader(script), process, inputMap);
+	}
 
 	/**
 	 * Executes the given script.
@@ -224,8 +237,11 @@ Future<ScriptModule> run(String path, String script, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, Reader reader, boolean process,
-		Object... inputs) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final Reader reader,
+		final boolean process, final Object... inputs)
+	{
+		return run(new ScriptInfo(getContext(), path, reader), process, inputs);
+	}
 
 	/**
 	 * Executes the given script.
@@ -245,8 +261,11 @@ Future<ScriptModule> run(String path, Reader reader, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, Reader reader, boolean process,
-		Map<String, Object> inputMap) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final Reader reader,
+		final boolean process, final Map<String, Object> inputMap)
+	{
+		return run(new ScriptInfo(getContext(), path, reader), process, inputMap);
+	}
 
 	/**
 	 * Executes the given script.
@@ -286,18 +305,30 @@ Future<ScriptModule> run(ScriptInfo info, boolean process,
 		Map<String, Object> inputMap);
 
 	/** TODO */
-	boolean canHandleFile(File file);
+	default boolean canHandleFile(final File file) {
+		return getIndex().canHandleFile(file);
+	}
 
 	/** TODO */
-	boolean canHandleFile(String fileName);
+	default boolean canHandleFile(final String fileName) {
+		return getIndex().canHandleFile(fileName);
+	}
 
 	/** TODO */
-	void addAlias(Class<?> type);
+	default void addAlias(final Class<?> type) {
+		addAlias(type.getSimpleName(), type);
+	}
 
 	/** TODO */
 	void addAlias(String alias, Class<?> type);
 
 	/** TODO */
 	Class<?> lookupClass(String typeName) throws ScriptException;
 
+	// -- PTService methods --
+
+	@Override
+	default Class<ScriptLanguage> getPluginType() {
+		return ScriptLanguage.class;
+	}
 }