Skip to content

AbstractConverter: make deprecated API consistent #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AbstractConverter: make deprecated API consistent #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
AbstractConverter: make deprecated API consistent 
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.
  • Loading branch information
@imagejan
imagejan committed Jan 19, 2021
commit 6c3ed41f66720fe77e1a12b306ffb973f1d22b8d
20 changes: 10 additions & 10 deletions src/main/java/org/scijava/convert/AbstractConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down