Push default WrapperService behavior to iface

ctrueden · ctrueden · commit 54e4fb39df8a · 2016-08-18T14:26:30.000-05:00
Thanks, Java 8.
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -31,8 +31,6 @@
 
 package org.scijava.plugin;
 
-import org.scijava.log.LogService;
-
 /**
  * Abstract base class for {@link WrapperService}s.
  * 
@@ -43,44 +41,5 @@
 public abstract class AbstractWrapperService<DT, PT extends WrapperPlugin<DT>>
 	extends AbstractTypedService<DT, PT> implements WrapperService<DT, PT>
 {
-
-	@Parameter(required = false)
-	private LogService log;
-
-	// -- WrapperService methods --
-
-	@Override
-	public <D extends DT> PT create(final D data) {
-		final PT instance = findWrapper(data);
-		if (instance != null) instance.set(data);
-		return instance;
-	}
-
-	// -- Service methods --
-
-	@Override
-	public void initialize() {
-		if (log != null) {
-			log.debug("Found " + getPlugins().size() + " " +
-				getPluginType().getSimpleName() + " plugins.");
-		}
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final DT data) {
-		return findWrapper(data) != null;
-	}
-
-	// -- Helper methods --
-
-	private <D extends DT> PT findWrapper(final D data) {
-		for (final PluginInfo<PT> plugin : getPlugins()) {
-			final PT instance = pluginService().createInstance(plugin);
-			if (instance != null && instance.supports(data)) return instance;
-		}
-		return null;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -62,6 +62,26 @@ public interface WrapperService<DT, PT extends WrapperPlugin<DT>> extends
 	 * @return An appropriate plugin instance, or null if the data is not
 	 *         compatible with any available plugin.
 	 */
-	<D extends DT> PT create(D data);
+	default <D extends DT> PT create(final D data) {
+		final PT instance = find(data);
+		if (instance != null) instance.set(data);
+		return instance;
+	}
 
+	// -- Service methods --
+
+	@Override
+	default void initialize() {
+		if (log() != null) {
+			log().debug("Found " + getPlugins().size() + " " +
+				getPluginType().getSimpleName() + " plugins.");
+		}
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default boolean supports(final DT data) {
+		return find(data) != null;
+	}
 }
