ObjectService: push default impls to interface

Author: ctrueden

src/main/java/org/scijava/object/DefaultObjectService.java

@@ -32,15 +32,10 @@
 
 package org.scijava.object;
 
-import java.util.List;
-
-import org.scijava.Named;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.object.event.ObjectCreatedEvent;
 import org.scijava.object.event.ObjectDeletedEvent;
-import org.scijava.object.event.ObjectsAddedEvent;
-import org.scijava.object.event.ObjectsRemovedEvent;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
@@ -79,49 +74,10 @@ public EventService eventService() {
 	}
 
 	@Override
-	public ObjectIndex<Object> getIndex() {
+	public NamedObjectIndex<Object> getIndex() {
 		return objectIndex;
 	}
 
-	@Override
-	public <T> List<T> getObjects(final Class<T> type) {
-		final List<Object> list = objectIndex.get(type);
-		@SuppressWarnings("unchecked")
-		final List<T> result = (List<T>) list;
-		return result;
-	}
-
-	@Override
-	public void addObject(final Object obj) {
-		addObject(obj, null);
-	}
-
-	@Override
-	public void addObject(Object obj, String name) {
-		objectIndex.add(obj, name);		
-		eventService.publish(new ObjectsAddedEvent(obj));
-	}
-
-	@Override
-	public void removeObject(final Object obj) {
-		objectIndex.remove(obj);
-		eventService.publish(new ObjectsRemovedEvent(obj));
-	}
-
-	@Override
-	public String getName(Object obj) {
-		if (obj == null) throw new NullPointerException();
-		final String name = objectIndex.getName(obj);
-		if (name != null) return name;
-		if (obj instanceof Named) {
-			final String n = ((Named) obj).getName();
-			if (n != null) return n;
-		}
-		final String s = obj.toString();
-		if (s != null) return s;
-		return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
-	}
-
 	// -- Service methods --
 
 	@Override

src/main/java/org/scijava/object/ObjectService.java

@@ -36,6 +36,8 @@
 
 import org.scijava.Named;
 import org.scijava.event.EventService;
+import org.scijava.object.event.ObjectsAddedEvent;
+import org.scijava.object.event.ObjectsRemovedEvent;
 import org.scijava.service.SciJavaService;
 
 /**
@@ -50,10 +52,15 @@ default EventService eventService() {
 	}
 
 	/** Gets the index of available objects. */
-	ObjectIndex<Object> getIndex();
+	NamedObjectIndex<Object> getIndex();
 
 	/** Gets a list of all registered objects compatible with the given type. */
-	<T> List<T> getObjects(Class<T> type);
+	default <T> List<T> getObjects(final Class<T> type) {
+		final List<Object> list = getIndex().get(type);
+		@SuppressWarnings("unchecked")
+		final List<T> result = (List<T>) list;
+		return result;
+	}
 
 	/**
 	 * Gets the name belonging to a given object.
@@ -63,17 +70,36 @@ default EventService eventService() {
 	 * {@link Named}, or from the {@link Object#toString()} otherwise. It is
 	 * guaranteed that this method will not return {@code null}.
 	 * </p>
-	 */
-	String getName(Object obj);
+	 **/
+	default String getName(final Object obj) {
+		if (obj == null) throw new NullPointerException();
+		final String name = getIndex().getName(obj);
+		if (name != null) return name;
+		if (obj instanceof Named) {
+			final String n = ((Named) obj).getName();
+			if (n != null) return n;
+		}
+		final String s = obj.toString();
+		if (s != null) return s;
+		return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
+	}
 
 	/** Registers an object with the object service. */
-	void addObject(Object obj);
+	default void addObject(Object obj) {
+		addObject(obj, null);
+	}
 
 	/** Registers a named object with the object service. */
-	void addObject(Object obj, String name);
+	default void addObject(final Object obj, final String name) {
+		getIndex().add(obj, name);
+		eventService().publish(new ObjectsAddedEvent(obj));
+	}
 
 	/** Deregisters an object with the object service. */
-	void removeObject(Object obj);
+	default void removeObject(final Object obj) {
+		getIndex().remove(obj);
+		eventService().publish(new ObjectsRemovedEvent(obj));
+	}
 
 	// -- Deprecated methods --