Skip to content

Commit 7da714d

Browse files
committed
(yegor256#1572) Generify ScalarWithFallback
1 parent 3b73725 commit 7da714d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/java/org/cactoos/scalar/ScalarWithFallback.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public final class ScalarWithFallback<T> implements Scalar<T> {
5454
/**
5555
* The fallback.
5656
*/
57-
private final Iterable<Fallback<T>> fallbacks;
57+
private final Iterable<Fallback<? extends T>> fallbacks;
5858

5959
/**
6060
* Ctor.
@@ -64,7 +64,7 @@ public final class ScalarWithFallback<T> implements Scalar<T> {
6464
@SafeVarargs
6565
public ScalarWithFallback(
6666
final Scalar<T> origin,
67-
final Fallback<T>... fbks
67+
final Fallback<? extends T>... fbks
6868
) {
6969
this(origin, new IterableOf<>(fbks));
7070
}
@@ -75,7 +75,7 @@ public ScalarWithFallback(
7575
* @param fbks Fallbacks
7676
*/
7777
public ScalarWithFallback(final Scalar<T> origin,
78-
final Iterable<Fallback<T>> fbks) {
78+
final Iterable<Fallback<? extends T>> fbks) {
7979
this.origin = origin;
8080
this.fallbacks = fbks;
8181
}
@@ -105,7 +105,7 @@ public T value() throws Exception {
105105
*/
106106
@SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
107107
private T fallback(final Throwable exp) throws Exception {
108-
final Iterator<Map.Entry<Fallback<T>, Integer>> candidates =
108+
final Iterator<? extends Map.Entry<Fallback<? extends T>, Integer>> candidates =
109109
new Sorted<>(
110110
Comparator.comparing(Map.Entry::getValue),
111111
new Filtered<>(
@@ -117,7 +117,7 @@ private T fallback(final Throwable exp) throws Exception {
117117
)
118118
)
119119
),
120-
new MapOf<>(
120+
new MapOf<Fallback<? extends T>, Integer>(
121121
fbk -> fbk,
122122
fbk -> fbk.support(exp),
123123
this.fallbacks

0 commit comments

Comments
 (0)