Simplify by not using Optional

This commit is contained in:
Reinhard Pointner 2019-06-10 17:07:37 +07:00
parent 8328d0d94b
commit e5ecc6a04f
1 changed files with 2 additions and 4 deletions

View File

@ -1,6 +1,5 @@
package net.filebot.web;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
@ -26,9 +25,8 @@ public class MappedEpisode extends Episode {
}
private <T> T getFirst(Function<Episode, T> getter) {
return Optional.ofNullable(getter.apply(mapping)).orElseGet(() -> {
return Optional.ofNullable(getter.apply(getOriginal())).orElse(null);
});
T mappingValue = getter.apply(mapping);
return mappingValue != null ? mappingValue : getter.apply(getOriginal());
}
@Override