Merge branch '__rultor'

yegor256 · Aug 3, 2019 · fd95524 · fd95524
2 parents b85b3e5 + 8541946
commit fd95524
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/src/main/java/org/cactoos/scalar/FirstOf.java b/src/main/java/org/cactoos/scalar/FirstOf.java
@@ -23,12 +23,9 @@
  */
 package org.cactoos.scalar;
 
-import java.util.NoSuchElementException;
 import org.cactoos.Func;
 import org.cactoos.Scalar;
 import org.cactoos.iterable.Filtered;
-import org.cactoos.iterable.HeadOf;
-import org.cactoos.iterable.IterableOf;
 
 /**
  * Find first element in a list that satisfies specified condition.
@@ -70,19 +67,10 @@ public FirstOf(final Func<T, Boolean> cond, final Iterable<T> src,
 
     @Override
     public T value() throws Exception {
-        return new ScalarWithFallback<>(
-            () -> new HeadOf<>(
-                1,
-                new Filtered<>(this.condition, this.source)
-            ).iterator().next(),
-            new IterableOf<FallbackFrom<T>>(
-                new FallbackFrom<>(
-                    new IterableOf<Class<? extends Throwable>>(
-                        NoSuchElementException.class
-                    ),
-                    t1 -> this.fallback.value()
-                )
-            )
+        return new ItemAt<>(
+            0,
+            this.fallback.value(),
+            new Filtered<>(this.condition, this.source)
         ).value();
     }
 }