(#1569) Added more possible wildcards.

yegor256 · Oct 7, 2021 · afced03 · afced03
1 parent 6faa771
commit afced03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/cactoos/scalar/CallableEnvelope.java b/src/main/java/org/cactoos/scalar/CallableEnvelope.java
@@ -38,13 +38,13 @@ public abstract class CallableEnvelope<T> implements Callable<T> {
     /**
      * Callable to decorate.
      */
-    private final Callable<T> origin;
+    private final Callable<? extends T> origin;
 
     /**
      * Ctor.
      * @param callable The Callable
      */
-    public CallableEnvelope(final Callable<T> callable) {
+    public CallableEnvelope(final Callable<? extends T> callable) {
         this.origin = callable;
     }
 

diff --git a/src/main/java/org/cactoos/scalar/EqualsNullable.java b/src/main/java/org/cactoos/scalar/EqualsNullable.java
@@ -35,12 +35,12 @@ public final class EqualsNullable implements Scalar<Boolean> {
     /**
      * The first object for comparison.
      */
-    private final Scalar<Object> first;
+    private final Scalar<? extends Object> first;
 
     /**
      * The second object for comparison.
      */
-    private final Scalar<Object> second;
+    private final Scalar<? extends Object> second;
 
     /**
      * Accepts 2 objects to compare.
@@ -56,7 +56,7 @@ public EqualsNullable(final Object first, final Object second) {
      * @param first Scalar to get value to compare
      * @param second Object to compare with
      */
-    public EqualsNullable(final Scalar<Object> first, final Object second) {
+    public EqualsNullable(final Scalar<? extends Object> first, final Object second) {
         this(first, () -> second);
     }
 
@@ -65,7 +65,7 @@ public EqualsNullable(final Scalar<Object> first, final Object second) {
      * @param first Object to compare
      * @param second Scalar to get value to compare
      */
-    public EqualsNullable(final Object first, final Scalar<Object> second) {
+    public EqualsNullable(final Object first, final Scalar<? extends Object> second) {
         this(() -> first, second);
     }
 
@@ -74,8 +74,8 @@ public EqualsNullable(final Object first, final Scalar<Object> second) {
      * @param first Scalar to get value to compare
      * @param second Scalar to get value to compare with
      */
-    public EqualsNullable(final Scalar<Object> first,
-        final Scalar<Object> second) {
+    public EqualsNullable(final Scalar<? extends Object> first,
+        final Scalar<? extends Object> second) {
         this.first = first;
         this.second = second;
     }

diff --git a/src/main/java/org/cactoos/scalar/ScalarEnvelope.java b/src/main/java/org/cactoos/scalar/ScalarEnvelope.java
@@ -38,13 +38,13 @@ public abstract class ScalarEnvelope<T> implements Scalar<T> {
     /**
      * The delegate scalar.
      */
-    private final Scalar<T> scalar;
+    private final Scalar<? extends T> scalar;
 
     /**
      * Ctor.
      * @param scalar The scalar
      */
-    public ScalarEnvelope(final Scalar<T> scalar) {
+    public ScalarEnvelope(final Scalar<? extends T> scalar) {
         this.scalar = scalar;
     }