AbstractConverter: make deprecated API consistent

imagejan · imagejan · commit 6c3ed41f6672 · 2021-01-19T20:50:22.000+01:00
The canConvert(Class, Class) signature is deprecated in the Converter interface, so let's deprecate the overridden method as well, as it's the case for canConvert(Class, Type) already.
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -98,19 +98,9 @@ public boolean canConvert(final Object src, final Type dest) {
 	public boolean canConvert(final Object src, final Class<?> dest) {
 		if (src == null) return false;
 		final Class<?> srcClass = src.getClass();
-
 		return canConvert(srcClass, dest);
 	}
 
-	@Override
-	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		if (src == null) return false;
-		final Class<?> saneSrc = Types.box(src);
-		final Class<?> saneDest = Types.box(dest);
-		return Types.isAssignable(saneSrc, getInputType()) &&
-			Types.isAssignable(getOutputType(), saneDest);
-	}
-
 	@Override
 	public Object convert(final Object src, final Type dest) {
 		final Class<?> destClass = Types.raw(dest);
@@ -148,6 +138,16 @@ public Class<ConversionRequest> getType() {
 
 	// -- Deprecated API --
 
+	@Override
+	@Deprecated
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		if (src == null) return false;
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
+		return Types.isAssignable(saneSrc, getInputType()) &&
+			Types.isAssignable(getOutputType(), saneDest);
+	}
+
 	@Override
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Type dest) {
