Merge pull request #934 from motlin/remove-toStack

Remove implementations of OrderedIterable.toStack() that can use the default implementation instead.
eclipse · Aug 13, 2020 · 6eb479f · 6eb479f
2 parents 19c4676 + 5a8c177
commit 6eb479f
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 87 deletions.
diff --git a/...ions/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java b/...ions/src/main/java/org/eclipse/collections/impl/list/immutable/AbstractImmutableList.java
@@ -842,12 +842,6 @@ protected MutableCollection<T> newMutable(int size)
         return FastList.newList(size);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStack(this);
-    }
-
     @Override
     public ReverseIterable<T> asReversed()
     {

diff --git a/...lections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java b/...lections/src/main/java/org/eclipse/collections/impl/list/mutable/AbstractMutableList.java
@@ -45,7 +45,6 @@
 import org.eclipse.collections.api.block.procedure.Procedure2;
 import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
 import org.eclipse.collections.api.factory.Lists;
-import org.eclipse.collections.api.factory.Stacks;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.list.ParallelListIterable;
 import org.eclipse.collections.api.list.primitive.MutableBooleanList;
@@ -504,12 +503,6 @@ public MutableSet<T> toSet()
         return UnifiedSet.newSet(this);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return Stacks.mutable.withAll(this);
-    }
-
     @Override
     public MutableList<T> asUnmodifiable()
     {

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/ListAdapter.java
@@ -30,10 +30,8 @@
 import org.eclipse.collections.api.list.ParallelListIterable;
 import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.api.partition.list.PartitionMutableList;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.impl.block.procedure.CollectionAddProcedure;
 import org.eclipse.collections.impl.lazy.parallel.list.NonParallelListIterable;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.eclipse.collections.impl.utility.ListIterate;
 import org.eclipse.collections.impl.utility.OrderedIterate;
@@ -342,12 +340,6 @@ public PartitionMutableList<T> partitionWhile(Predicate<? super T> predicate)
         return ListIterate.partitionWhile(this.delegate, predicate);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStack(this.delegate);
-    }
-
     @Override
     public ParallelListIterable<T> asParallel(ExecutorService executorService, int batchSize)
     {

diff --git a/...ions/src/main/java/org/eclipse/collections/impl/list/mutable/UnmodifiableMutableList.java b/...ions/src/main/java/org/eclipse/collections/impl/list/mutable/UnmodifiableMutableList.java
@@ -50,12 +50,10 @@
 import org.eclipse.collections.api.multimap.list.MutableListMultimap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.api.partition.list.PartitionMutableList;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.collection.mutable.AbstractUnmodifiableMutableCollection;
 import org.eclipse.collections.impl.collection.mutable.UnmodifiableCollectionSerializationProxy;
 import org.eclipse.collections.impl.lazy.ReverseIterable;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 
 /**
  * An unmodifiable view of a list.
@@ -209,12 +207,6 @@ public MutableList<T> shuffleThis(Random rnd)
         throw new UnsupportedOperationException("Cannot call shuffleThis() on " + this.getClass().getSimpleName());
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStack(this.getMutableList());
-    }
-
     @Override
     public <V extends Comparable<? super V>> MutableList<T> sortThisBy(Function<? super T, ? extends V> function)
     {

diff --git a/.../java/org/eclipse/collections/impl/map/ordered/mutable/UnmodifiableMutableOrderedMap.java b/.../java/org/eclipse/collections/impl/map/ordered/mutable/UnmodifiableMutableOrderedMap.java
@@ -93,7 +93,6 @@
 import org.eclipse.collections.api.partition.list.PartitionMutableList;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.set.sorted.MutableSortedSet;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.UnmodifiableIteratorAdapter;
 import org.eclipse.collections.impl.tuple.AbstractImmutableEntry;
@@ -1566,12 +1565,6 @@ public void forEachWithIndex(
         this.delegate.forEachWithIndex(fromIndex, toIndex, objectIntProcedure);
     }
 
-    @Override
-    public MutableStack<V> toStack()
-    {
-        return this.delegate.toStack();
-    }
-
     @Override
     public <VV, R extends Collection<VV>> R collectWithIndex(
             ObjectIntToObjectFunction<? super V, ? extends VV> function,

diff --git a/...tions/src/main/java/org/eclipse/collections/impl/set/sorted/mutable/SortedSetAdapter.java b/...tions/src/main/java/org/eclipse/collections/impl/set/sorted/mutable/SortedSetAdapter.java
@@ -52,7 +52,6 @@
 import org.eclipse.collections.api.set.sorted.MutableSortedSet;
 import org.eclipse.collections.api.set.sorted.ParallelSortedSetIterable;
 import org.eclipse.collections.api.set.sorted.SortedSetIterable;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.block.factory.Comparators;
 import org.eclipse.collections.impl.block.factory.Functions;
@@ -81,7 +80,6 @@
 import org.eclipse.collections.impl.list.mutable.primitive.ShortArrayList;
 import org.eclipse.collections.impl.multimap.set.sorted.TreeSortedSetMultimap;
 import org.eclipse.collections.impl.partition.set.sorted.PartitionTreeSortedSet;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.eclipse.collections.impl.utility.ListIterate;
@@ -137,12 +135,6 @@ public ImmutableSortedSet<T> toImmutable()
         return SortedSets.immutable.withSortedSet(this.delegate);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStack(this);
-    }
-
     public static <T> MutableSortedSet<T> adapt(SortedSet<T> set)
     {
         if (set instanceof MutableSortedSet<?>)

diff --git a/...lections/src/main/java/org/eclipse/collections/impl/set/sorted/mutable/TreeSortedSet.java b/...lections/src/main/java/org/eclipse/collections/impl/set/sorted/mutable/TreeSortedSet.java
@@ -56,7 +56,6 @@
 import org.eclipse.collections.api.set.sorted.MutableSortedSet;
 import org.eclipse.collections.api.set.sorted.ParallelSortedSetIterable;
 import org.eclipse.collections.api.set.sorted.SortedSetIterable;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.block.factory.Comparators;
 import org.eclipse.collections.impl.block.factory.Functions;
@@ -92,7 +91,6 @@
 import org.eclipse.collections.impl.list.mutable.primitive.ShortArrayList;
 import org.eclipse.collections.impl.multimap.set.sorted.TreeSortedSetMultimap;
 import org.eclipse.collections.impl.partition.set.sorted.PartitionTreeSortedSet;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.eclipse.collections.impl.utility.ListIterate;
@@ -204,12 +202,6 @@ public ImmutableSortedSet<T> toImmutable()
         return SortedSets.immutable.withSortedSet(this);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStack(this);
-    }
-
     @Override
     public boolean add(T element)
     {

diff --git a/.../src/main/java/org/eclipse/collections/impl/set/sorted/mutable/UnmodifiableSortedSet.java b/.../src/main/java/org/eclipse/collections/impl/set/sorted/mutable/UnmodifiableSortedSet.java
@@ -51,7 +51,6 @@
 import org.eclipse.collections.api.set.sorted.MutableSortedSet;
 import org.eclipse.collections.api.set.sorted.ParallelSortedSetIterable;
 import org.eclipse.collections.api.set.sorted.SortedSetIterable;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.collection.mutable.AbstractUnmodifiableMutableCollection;
 import org.eclipse.collections.impl.collection.mutable.UnmodifiableCollectionSerializationProxy;
@@ -452,12 +451,6 @@ public int compareTo(SortedSetIterable<T> o)
         return this.getSortedSet().compareTo(o);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return this.getSortedSet().toStack();
-    }
-
     @Override
     public int indexOf(Object object)
     {

diff --git a/...tions/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java b/...tions/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableArrayStack.java
@@ -81,7 +81,6 @@
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.set.sorted.MutableSortedSet;
 import org.eclipse.collections.api.stack.ImmutableStack;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.stack.StackIterable;
 import org.eclipse.collections.api.stack.primitive.ImmutableBooleanStack;
 import org.eclipse.collections.api.stack.primitive.ImmutableByteStack;
@@ -100,7 +99,6 @@
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.multimap.list.FastListMultimap;
 import org.eclipse.collections.impl.partition.stack.PartitionArrayStack;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 import org.eclipse.collections.impl.stack.mutable.primitive.BooleanArrayStack;
 import org.eclipse.collections.impl.stack.mutable.primitive.ByteArrayStack;
 import org.eclipse.collections.impl.stack.mutable.primitive.CharArrayStack;
@@ -299,12 +297,6 @@ public boolean containsAllArguments(Object... elements)
         return this.delegate.asReversed().containsAllArguments(elements);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStackFromTopToBottom(this);
-    }
-
     @Override
     public ImmutableStack<T> select(Predicate<? super T> predicate)
     {

diff --git a/...ns/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableNotEmptyStack.java b/...ns/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableNotEmptyStack.java
@@ -45,7 +45,6 @@
 import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.api.partition.stack.PartitionImmutableStack;
 import org.eclipse.collections.api.stack.ImmutableStack;
-import org.eclipse.collections.api.stack.MutableStack;
 import org.eclipse.collections.api.stack.StackIterable;
 import org.eclipse.collections.api.stack.primitive.ImmutableBooleanStack;
 import org.eclipse.collections.api.stack.primitive.ImmutableByteStack;
@@ -74,7 +73,6 @@
 import org.eclipse.collections.impl.partition.stack.PartitionArrayStack;
 import org.eclipse.collections.impl.partition.stack.PartitionArrayStack.PartitionPredicate2Procedure;
 import org.eclipse.collections.impl.partition.stack.PartitionArrayStack.PartitionProcedure;
-import org.eclipse.collections.impl.stack.mutable.ArrayStack;
 
 final class ImmutableNotEmptyStack<T>
         extends AbstractRichIterable<T>
@@ -189,12 +187,6 @@ public T getLast()
         throw new UnsupportedOperationException("Cannot call getLast() on " + this.getClass().getSimpleName());
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStackFromTopToBottom(this);
-    }
-
     @Override
     public ImmutableStack<T> select(Predicate<? super T> predicate)
     {

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/stack/mutable/ArrayStack.java
@@ -998,12 +998,6 @@ public MutableSortedSet<T> toSortedSet(Comparator<? super T> comparator)
         return this.delegate.asReversed().toSortedSet(comparator);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return ArrayStack.newStackFromTopToBottom(this);
-    }
-
     @Override
     public ImmutableStack<T> toImmutable()
     {

diff --git a/...llections/src/main/java/org/eclipse/collections/impl/stack/mutable/UnmodifiableStack.java b/...llections/src/main/java/org/eclipse/collections/impl/stack/mutable/UnmodifiableStack.java
@@ -650,12 +650,6 @@ public MutableSortedSet<T> toSortedSet(Comparator<? super T> comparator)
         return this.mutableStack.toSortedSet(comparator);
     }
 
-    @Override
-    public MutableStack<T> toStack()
-    {
-        return this.mutableStack.toStack();
-    }
-
     @Override
     public ImmutableStack<T> toImmutable()
     {