Merge branch '__rultor'

src/main/java/org/cactoos/bytes/CheckedBytes.java

@@ -43,14 +43,14 @@ public final class CheckedBytes<E extends Exception> implements Bytes {
     /**
      * Function that wraps exception of {@link #origin} to the required type.
      */
-    private final Func<Exception, E> func;
+    private final Func<? super Exception, ? extends E> func;
 
     /**
      * Ctor.
      * @param orig Origin bytes.
      * @param fnc Function that wraps exceptions.
      */
-    public CheckedBytes(final Bytes orig, final Func<Exception, E> fnc) {
+    public CheckedBytes(final Bytes orig, final Func<? super Exception, ? extends E> fnc) {
         this.origin = orig;
         this.func = fnc;
     }

src/main/java/org/cactoos/bytes/UncheckedBytes.java

@@ -44,7 +44,7 @@ public final class UncheckedBytes implements Bytes {
     /**
      * Fallback.
      */
-    private final Func<Exception, byte[]> fallback;
+    private final Func<? super Exception, byte[]> fallback;
 
     /**
      * Ctor.
@@ -67,7 +67,7 @@ public UncheckedBytes(final Bytes bts) {
      * @since 0.5
      */
     public UncheckedBytes(final Bytes bts,
-        final Func<Exception, byte[]> fbk) {
+        final Func<? super Exception, byte[]> fbk) {
         this.bytes = bts;
         this.fallback = fbk;
     }

src/main/java/org/cactoos/collection/package-info.java

@@ -26,5 +26,8 @@
  * Collections, tests.
  *
  * @since 0.14
+ * @todo #1533:30min Continue to exploit generic variance for package
+ *  org.cactoos.collection to ensure typing works as best as
+ *  possible as it is explained in #1533 issue.
  */
 package org.cactoos.collection;

src/main/java/org/cactoos/experimental/package-info.java

@@ -33,5 +33,7 @@
  * whatsoever.
  *
  * @since 1.0.0
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.experimental
+ *  to ensure typing works as best as possible as it is explained in #1533 issue.
  */
 package org.cactoos.experimental;

src/main/java/org/cactoos/func/package-info.java

@@ -26,5 +26,8 @@
  * Functions.
  *
  * @since 0.1
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.func
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.func;

src/main/java/org/cactoos/io/package-info.java

@@ -26,5 +26,8 @@
  * Input/Output.
  *
  * @since 0.1
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.io
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.io;

src/main/java/org/cactoos/iterable/package-info.java

@@ -26,5 +26,8 @@
  * Iterables.
  *
  * @since 0.12
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.iterable
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.iterable;

src/main/java/org/cactoos/iterator/package-info.java

@@ -26,5 +26,8 @@
  * Iterators.
  *
  * @since 0.12
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.iterator
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.iterator;

src/main/java/org/cactoos/list/package-info.java

@@ -26,5 +26,8 @@
  * Lists, tests.
  *
  * @since 0.14
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.list
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.list;

src/main/java/org/cactoos/map/package-info.java

@@ -26,5 +26,8 @@
  * Maps.
  *
  * @since 0.14
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.map
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.map;

src/main/java/org/cactoos/proc/package-info.java

@@ -26,5 +26,8 @@
  * Procedures.
  *
  * @since 0.47
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.proc
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.proc;

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

@@ -44,20 +44,20 @@ public final class Checked<T, E extends Exception> implements Scalar<T> {
     /**
      * Function that wraps exception.
      */
-    private final Func<Exception, E> func;
+    private final Func<? super Exception, ? extends E> func;
 
     /**
      * Original scalar.
      */
-    private final Scalar<T> origin;
+    private final Scalar<? extends T> origin;
 
     /**
      * Ctor.
      * @param scalar Encapsulated scalar
      * @param fnc Func that wraps exception
      */
-    public Checked(final Scalar<T> scalar,
-        final Func<Exception, E> fnc) {
+    public Checked(final Scalar<? extends T> scalar,
+        final Func<? super Exception, ? extends E> fnc) {
         this.func = fnc;
         this.origin = scalar;
     }

src/main/java/org/cactoos/scalar/package-info.java

@@ -26,5 +26,8 @@
  * Scalars.
  *
  * @since 0.12
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.scalar
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.scalar;

src/main/java/org/cactoos/set/package-info.java

@@ -26,5 +26,8 @@
  * Sets.
  *
  * @since 0.49.2
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.set
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.set;

src/main/java/org/cactoos/text/package-info.java

@@ -26,5 +26,8 @@
  * Text.
  *
  * @since 0.1
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.text
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.text;

src/main/java/org/cactoos/time/package-info.java

@@ -26,5 +26,8 @@
  * Time.
  *
  * @since 1.0
+ * @todo #1533:30min Exploit generic variance for package org.cactoos.time
+ *  to ensure typing works as best as possible as it is explained in
+ *  #1533 issue.
  */
 package org.cactoos.time;

src/test/java/org/cactoos/scalar/CheckedTest.java

@@ -25,35 +25,75 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import org.hamcrest.MatcherAssert;
+import java.nio.channels.AcceptPendingException;
 import org.hamcrest.Matchers;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
+import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.Throws;
 
 /**
  * Test case for {@link Checked}.
  * @since 0.30
  * @checkstyle JavadocMethodCheck (500 lines)
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 public final class CheckedTest {
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void runtimeExceptionGoesOut() throws Exception {
-        new Checked<>(
-            () -> {
-                throw new IllegalStateException("runtime");
-            },
-            IOException::new
-        ).value();
+        new Assertion<>(
+            "Must throw runtime exception",
+            () -> new Checked<>(
+                () -> {
+                    throw new IllegalStateException("runtime");
+                },
+                IOException::new
+            ).value(),
+            new Throws<>(IllegalStateException.class)
+        ).affirm();
     }
 
-    @Test(expected = IOException.class)
+    @Test
+    public void usesGenericVarianceOnExceptionTypes() throws Exception {
+        new Assertion<>(
+            "Must use generic variance on exception types",
+            () -> new Checked<String, IllegalStateException>(
+                () -> {
+                    throw new IllegalStateException();
+                },
+                (Throwable ex) -> {
+                    return new AcceptPendingException();
+                }
+            ).value(),
+            new Throws<>(IllegalStateException.class)
+        ).affirm();
+    }
+
+    @SuppressWarnings("PMD.AvoidDuplicateLiterals")
+    public void usesContravarianceOnResultType() throws Exception {
+        new Assertion<>(
+            "Must use contravariance on result",
+            new Checked<CharSequence, IOException>(
+                () -> new String("contravariance"),
+                IOException::new
+            ).value(),
+            new IsEqual<>("contravariance")
+        );
+    }
+
+    @Test
     public void throwsIoException() throws Exception {
-        new Checked<>(
-            () -> {
-                throw new InterruptedException("interrupt");
-            },
-            IOException::new
-        ).value();
+        new Assertion<>(
+            "Must throw io exception",
+            () -> new Checked<>(
+                () -> {
+                    throw new InterruptedException("interrupt");
+                },
+                IOException::new
+            ).value(),
+            new Throws<>(IOException.class)
+        ).affirm();
     }
 
     @Test
@@ -66,10 +106,11 @@ public void ioExceptionGoesOut() throws Exception {
                 IOException::new
             ).value();
         } catch (final IOException exp) {
-            MatcherAssert.assertThat(
+            new Assertion<>(
+                "Must not have cause when throwing io exception",
                 exp.getCause(),
                 Matchers.nullValue()
-            );
+            ).affirm();
         }
     }
 
@@ -83,28 +124,26 @@ public void fileNotFoundExceptionGoesOut() throws Exception {
                 IOException::new
             ).value();
         } catch (final FileNotFoundException exp) {
-            MatcherAssert.assertThat(
+            new Assertion<>(
+                "Must not have cause when throwing file not found exception",
                 exp.getCause(),
                 Matchers.nullValue()
-            );
+            ).affirm();
         }
     }
 
     @Test
     public void throwsIoExceptionWithModifiedMessage() throws Exception {
         final String message = "error msg";
-        try {
-            new Checked<>(
+        new Assertion<>(
+            "Must throw io exception with modified message",
+            () -> new Checked<>(
                 () -> {
                     throw new IOException("io");
                 },
                 exp -> new IOException(message, exp)
-            ).value();
-        } catch (final IOException exp) {
-            MatcherAssert.assertThat(
-                exp.getMessage(),
-                Matchers.containsString(message)
-            );
-        }
+            ).value(),
+            new Throws<>(message, IOException.class)
+        ).affirm();
     }
 }