Skip to content

(#1572) Covariance for func.FuncWithFallback #1607

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

Merged
merged 6 commits into from
May 13, 2021
Merged

(#1572) Covariance for func.FuncWithFallback #1607

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7da714d
(#1572) Generify ScalarWithFallback
DmitryBarskov May 8, 2021
dffe98b
(#1572) Generify FuncWithFallback
DmitryBarskov May 8, 2021
d5b26a8
(#1572) Generify fnc parameter of FuncWithFallback
DmitryBarskov May 8, 2021
c2243ce
(#1572) Generify Fallback parameter of ScalarWithFallback
DmitryBarskov May 9, 2021
42cdad6
(#1572) Covariance for Scalar param for ScalarWithFallback
DmitryBarskov May 12, 2021
37dec6f
(#1572) Update puzzle number
DmitryBarskov May 12, 2021
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
12 changes: 6 additions & 6 deletions src/main/java/org/cactoos/func/FuncWithFallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,21 @@ public final class FuncWithFallback<X, Y> implements Func<X, Y> {
/**
* The func.
*/
private final Func<X, Y> func;
private final Func<? super X, ? extends Y> func;

/**
* The fallbacks.
*/
private final Iterable<Fallback<Y>> fallbacks;
private final Iterable<Fallback<? extends Y>> fallbacks;

/**
* Ctor.
* @param fnc The func
* @param fbks The fallbacks
*/
@SafeVarargs
public FuncWithFallback(final Func<X, Y> fnc, final Fallback<Y>... fbks) {
public FuncWithFallback(final Func<? super X, ? extends Y> fnc,
final Fallback<? extends Y>... fbks) {
this(fnc, new IterableOf<>(fbks));
}

Expand All @@ -117,9 +118,8 @@ public FuncWithFallback(final Func<X, Y> fnc, final Fallback<Y>... fbks) {
* @param fnc The func
* @param fbks The fallbacks
*/
public FuncWithFallback(
final Func<X, Y> fnc, final Iterable<Fallback<Y>> fbks
) {
public FuncWithFallback(final Func<? super X, ? extends Y> fnc,
final Iterable<Fallback<? extends Y>> fbks) {
this.func = fnc;
this.fallbacks = fbks;
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/cactoos/scalar/ScalarWithFallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public final class ScalarWithFallback<T> implements Scalar<T> {
/**
* The fallback.
*/
private final Iterable<Fallback<T>> fallbacks;
private final Iterable<Fallback<? extends T>> fallbacks;

/**
* Ctor.
Expand All @@ -64,7 +64,7 @@ public final class ScalarWithFallback<T> implements Scalar<T> {
@SafeVarargs
public ScalarWithFallback(
final Scalar<T> origin,
final Fallback<T>... fbks
final Fallback<? extends T>... fbks
) {
this(origin, new IterableOf<>(fbks));
}
Expand All @@ -75,7 +75,7 @@ public ScalarWithFallback(
* @param fbks Fallbacks
*/
public ScalarWithFallback(final Scalar<T> origin,
final Iterable<Fallback<T>> fbks) {
final Iterable<Fallback<? extends T>> fbks) {
this.origin = origin;
this.fallbacks = fbks;
}
Expand Down Expand Up @@ -105,7 +105,7 @@ public T value() throws Exception {
*/
@SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
private T fallback(final Throwable exp) throws Exception {
final Iterator<Map.Entry<Fallback<T>, Integer>> candidates =
final Iterator<? extends Map.Entry<Fallback<? extends T>, Integer>> candidates =
new Sorted<>(
Comparator.comparing(Map.Entry::getValue),
new Filtered<>(
Expand All @@ -117,7 +117,7 @@ private T fallback(final Throwable exp) throws Exception {
)
)
),
new MapOf<>(
new MapOf<Fallback<? extends T>, Integer>(
fbk -> fbk,
fbk -> fbk.support(exp),
this.fallbacks
Expand Down