diff --git a/src/main/java/org/cactoos/collection/Reversed.java b/src/main/java/org/cactoos/collection/Reversed.java index 9541175c80..269e1d74cd 100644 --- a/src/main/java/org/cactoos/collection/Reversed.java +++ b/src/main/java/org/cactoos/collection/Reversed.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.cactoos.func.StickyFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; @@ -58,13 +58,15 @@ public Reversed(final X... src) { public Reversed(final Iterable src) { super( new UncheckedFunc<>( - new StickyFunc, Collection>( - input -> { - final List items = new LinkedList<>(); - input.forEach(items::add); - Collections.reverse(items); - return items; - } + new FuncOf, Collection>( + new org.cactoos.scalar.Sticky<>( + () -> { + final List items = new LinkedList<>(); + src.forEach(items::add); + Collections.reverse(items); + return items; + } + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/collection/Shuffled.java b/src/main/java/org/cactoos/collection/Shuffled.java index db13d9c54b..efc2b33053 100644 --- a/src/main/java/org/cactoos/collection/Shuffled.java +++ b/src/main/java/org/cactoos/collection/Shuffled.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.cactoos.func.StickyFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; @@ -57,13 +57,15 @@ public Shuffled(final T... src) { public Shuffled(final Iterable src) { super( new UncheckedFunc<>( - new StickyFunc, Collection>( - input -> { - final List items = new LinkedList<>(); - input.forEach(items::add); - Collections.shuffle(items); - return items; - } + new FuncOf, Collection>( + new org.cactoos.scalar.Sticky<>( + () -> { + final List items = new LinkedList<>(); + src.forEach(items::add); + Collections.shuffle(items); + return items; + } + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/collection/Solid.java b/src/main/java/org/cactoos/collection/Solid.java index 796e93a4ec..5344307f5d 100644 --- a/src/main/java/org/cactoos/collection/Solid.java +++ b/src/main/java/org/cactoos/collection/Solid.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.cactoos.func.SolidFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; @@ -58,13 +58,17 @@ public Solid(final T... array) { public Solid(final Iterable src) { super( new UncheckedFunc<>( - new SolidFunc, Collection>( - input -> { - final List items = new LinkedList<>(); - input.forEach(items::add); - Collections.shuffle(items); - return items; - } + new FuncOf, Collection>( + new org.cactoos.scalar.Solid<>( + new org.cactoos.scalar.Sticky<>( + () -> { + final List items = new LinkedList<>(); + src.forEach(items::add); + Collections.shuffle(items); + return items; + } + ) + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/collection/Sorted.java b/src/main/java/org/cactoos/collection/Sorted.java index 7fd701cc02..c8e1e6bcbc 100644 --- a/src/main/java/org/cactoos/collection/Sorted.java +++ b/src/main/java/org/cactoos/collection/Sorted.java @@ -27,7 +27,7 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import org.cactoos.func.StickyFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; import org.cactoos.list.ListOf; @@ -83,13 +83,15 @@ public Sorted(final Comparator cmp, final T... src) { public Sorted(final Comparator cmp, final Iterable src) { super( new UncheckedFunc<>( - new StickyFunc, Collection>( - input -> { - final List items = new LinkedList<>(); - input.forEach(items::add); - items.sort(cmp); - return items; - } + new FuncOf, Collection>( + new org.cactoos.scalar.Sticky<>( + () -> { + final List items = new LinkedList<>(); + src.forEach(items::add); + items.sort(cmp); + return items; + } + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/collection/Sticky.java b/src/main/java/org/cactoos/collection/Sticky.java index 151d6f7402..2cba437b22 100644 --- a/src/main/java/org/cactoos/collection/Sticky.java +++ b/src/main/java/org/cactoos/collection/Sticky.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.LinkedList; -import org.cactoos.func.StickyFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; @@ -55,12 +55,14 @@ public Sticky(final E... src) { public Sticky(final Iterable src) { super( new UncheckedFunc<>( - new StickyFunc, Collection>( - input -> { - final Collection temp = new LinkedList<>(); - input.forEach(temp::add); - return temp; - } + new FuncOf, Collection>( + new org.cactoos.scalar.Sticky<>( + () -> { + final Collection temp = new LinkedList<>(); + src.forEach(temp::add); + return temp; + } + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/collection/Synced.java b/src/main/java/org/cactoos/collection/Synced.java index 0686004ff7..8ffb48ddaa 100644 --- a/src/main/java/org/cactoos/collection/Synced.java +++ b/src/main/java/org/cactoos/collection/Synced.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; -import org.cactoos.func.SyncFunc; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; @@ -64,12 +64,14 @@ public Synced(final T... array) { public Synced(final Iterable src) { super( new UncheckedFunc<>( - new SyncFunc, Collection>( - input -> { - final Collection temp = new LinkedList<>(); - input.forEach(temp::add); - return Collections.synchronizedCollection(temp); - } + new FuncOf, Collection>( + new org.cactoos.scalar.Synced<>( + () -> { + final Collection temp = new LinkedList<>(); + src.forEach(temp::add); + return Collections.synchronizedCollection(temp); + } + ) ) ).apply(src) ); diff --git a/src/main/java/org/cactoos/set/SetOf.java b/src/main/java/org/cactoos/set/SetOf.java index 44b0e59013..0175736965 100644 --- a/src/main/java/org/cactoos/set/SetOf.java +++ b/src/main/java/org/cactoos/set/SetOf.java @@ -27,8 +27,10 @@ import java.util.HashSet; import java.util.Set; import org.cactoos.collection.CollectionEnvelope; +import org.cactoos.func.FuncOf; import org.cactoos.func.UncheckedFunc; import org.cactoos.iterable.IterableOf; +import org.cactoos.scalar.Unchecked; /** * Iterable as {@link Set}. @@ -60,12 +62,16 @@ public SetOf(final T... array) { */ public SetOf(final Iterable src) { super( - new UncheckedFunc, Set>( - input -> { - final Set tmp = new HashSet<>(); - input.forEach(tmp::add); - return Collections.unmodifiableSet(tmp); - } + new UncheckedFunc<>( + new FuncOf, Set>( + new Unchecked<>( + () -> { + final Set tmp = new HashSet<>(); + src.forEach(tmp::add); + return Collections.unmodifiableSet(tmp); + } + ) + ) ).apply(src) ); }