PrefService: push more methods into iface

Author: ctrueden

src/main/java/org/scijava/prefs/DefaultPrefService.java

@@ -214,12 +214,6 @@ public void remove(final String absolutePath, final String key) {
 		prefs(absolutePath).remove(key);
 	}
 
-	@Deprecated
-	@Override
-	public void putMap(final Map<String, String> map, final String key) {
-		putMap((Class<?>) null, map, key);
-	}
-
 	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map,
@@ -234,12 +228,6 @@ public void putMap(final String absolutePath, final Map<String, String> map) {
 		prefs(absolutePath).putMap(map);
 	}
 
-	@Deprecated
-	@Override
-	public Map<String, String> getMap(final String key) {
-		return getMap((Class<?>) null, key);
-	}
-
 	@Deprecated
 	@Override
 	public Map<String, String>
@@ -248,12 +236,6 @@ public Map<String, String> getMap(final String key) {
 		return prefs(absolutePath).node(key).getMap();
 	}
 
-	@Deprecated
-	@Override
-	public void putList(final List<String> list, final String key) {
-		putList((Class<?>) null, list, key);
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list,
@@ -268,30 +250,12 @@ public void putList(final String absolutePath, final List<String> list) {
 		prefs(absolutePath).putList(list);
 	}
 
-	@Deprecated
-	@Override
-	public List<String> getList(final String key) {
-		return getList((Class<?>) null, key);
-	}
-
 	@Deprecated
 	@Override
 	public List<String> getList(final String absolutePath, final String key) {
 		return prefs(absolutePath).node(key).getList();
 	}
 
-	@Deprecated
-	@Override
-	public Iterable<String> getIterable(final String key) {
-		return getIterable((Class<?>) null, key);
-	}
-
-	@Deprecated
-	@Override
-	public void putIterable(final Iterable<String> iterable, final String key) {
-		putIterable((Class<?>) null, iterable, key);
-	}
-
 	@Deprecated
 	@Override
 	public void clear(final Class<?> c, final String name) {

src/main/java/org/scijava/prefs/PrefService.java

@@ -225,7 +225,9 @@ default void clear(final String key) {
 	void remove(String absolutePath, String key);
 
 	@Deprecated
-	void putMap(Map<String, String> map, String key);
+	default void putMap(final Map<String, String> map, final String key) {
+		putMap((Class<?>) null, map, key);
+	}
 
 	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map);
@@ -234,13 +236,17 @@ default void clear(final String key) {
 	void putMap(String absolutePath, Map<String, String> map, String key);
 
 	@Deprecated
-	Map<String, String> getMap(String key);
+	default Map<String, String> getMap(final String key) {
+		return getMap((Class<?>) null, key);
+	}
 
 	@Deprecated
 	Map<String, String> getMap(String absolutePath, String key);
 
 	@Deprecated
-	void putList(List<String> list, String key);
+	default void putList(final List<String> list, final String key) {
+		putList((Class<?>) null, list, key);
+	}
 
 	@Deprecated
 	void putList(String absolutePath, List<String> list, String key);
@@ -249,16 +255,22 @@ default void clear(final String key) {
 	void putList(String absolutePath, List<String> list);
 
 	@Deprecated
-	List<String> getList(String key);
+	default List<String> getList(final String key) {
+		return getList((Class<?>) null, key);
+	}
 
 	@Deprecated
 	List<String> getList(String absolutePath, String key);
 
 	@Deprecated
-	void putIterable(Iterable<String> iterable, String key);
+	default void putIterable(final Iterable<String> iterable, final String key) {
+		putIterable((Class<?>) null, iterable, key);
+	}
 
 	@Deprecated
-	Iterable<String> getIterable(String key);
+	default Iterable<String> getIterable(final String key) {
+		return getIterable((Class<?>) null, key);
+	}
 
 	@Deprecated
 	void clear(Class<?> c, String name);