Merge branch 'master' into snyk-upgrade-e7e75c67d507d974f7794feeaa43c1c6

dgroup · web-flow · commit c5edcd023550 · 2021-06-01T18:57:41.000+03:00
diff --git a/src/main/java/io/github/dgroup/enumerable4j/Enumerable.java b/src/main/java/io/github/dgroup/enumerable4j/Enumerable.java
@@ -23,10 +23,8 @@
  */
 package io.github.dgroup.enumerable4j;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
@@ -96,7 +94,7 @@ default boolean none(Predicate<X> first, Predicate<X>... other) {
      */
     default Enumerable<X> select(Predicate<X> first, Predicate<X>... other) {
         return new Linked<>(
-            this.stream().filter(new Joined<>(first, other))
+            this.stream().filter(new Joined<>(first, other)).iterator()
         );
     }
 
@@ -121,7 +119,7 @@ default Enumerable<X> reject(Predicate<X> first, Predicate<X>... other) {
                 }
             }
         }
-        return new Linked<>(this.stream().filter(prd));
+        return new Linked<>(this.stream().filter(prd).iterator());
     }
 
     /**
@@ -158,12 +156,12 @@ default X find(X alt, Predicate<X> first, Predicate<X>... other) {
      * @param <Y> The type of target entity.
      * @return The enumerable.
      */
-    default <Y> Enumerable<Y> map(Function<? super X, ? extends Y> fnc) {
+    default <Y> Enumerable<Y> map(Function<? super X, Y> fnc) {
         final Enumerable<Y> out;
         if (fnc == null) {
             out = new Empty<>();
         } else {
-            out = new Linked<>(this.stream().map(fnc));
+            out = new Linked<>(this.stream().map(fnc).iterator());
         }
         return out;
     }
@@ -313,7 +311,7 @@ default Enumerable<X> take(long num) {
         } else if (num == 0) {
             out = new Empty<>();
         } else {
-            out = new Linked<>(this.stream().limit(num));
+            out = new Linked<>(this.stream().limit(num).iterator());
         }
         return out;
     }
@@ -332,7 +330,7 @@ default Enumerable<X> drop(long num) {
         } else if (num == 0) {
             out = this;
         } else {
-            out = new Linked<>(this.stream().skip(num));
+            out = new Linked<>(this.stream().skip(num).iterator());
         }
         return out;
     }
@@ -372,15 +370,9 @@ default <Y> Enumerable<X> uniq(Function<? super X, ? extends Y> fnc) {
             out = new Empty<>();
         } else {
             final Set<Y> keys = new HashSet<>(0);
-            final List<X> values = new ArrayList<>(0);
-            for (final X val : this) {
-                final Y key = fnc.apply(val);
-                if (!keys.contains(key)) {
-                    keys.add(key);
-                    values.add(val);
-                }
-            }
-            out = new Linked<>(values);
+            out = new Linked<>(
+                this.stream().filter(val -> keys.add(fnc.apply(val))).iterator()
+            );
         }
         return out;
     }
diff --git a/src/main/java/io/github/dgroup/enumerable4j/Linked.java b/src/main/java/io/github/dgroup/enumerable4j/Linked.java
@@ -23,8 +23,7 @@
  */
 package io.github.dgroup.enumerable4j;
 
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Iterator;
 import org.cactoos.list.ListEnvelope;
 import org.cactoos.list.ListOf;
 
@@ -55,9 +54,9 @@ public Linked(final Iterable<X> src) {
 
     /**
      * Ctor.
-     * @param stream The stream of source items.
+     * @param src The source items.
      */
-    public Linked(final Stream<X> stream) {
-        super(stream.collect(Collectors.toList()));
+    public Linked(final Iterator<X> src) {
+        super(new ListOf<>(src));
     }
 }
