Merge pull request #1390 from motlin/OrderedIterable.detectIndex

Change OrderedIterable.indexOf() to have a default implementation.
eclipse · Sep 14, 2022 · 2ab2bf5 · 2ab2bf5
2 parents ac96a96 + 2574f63
commit 2ab2bf5
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 61 deletions.
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MutableList.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MutableList.java
@@ -436,4 +436,10 @@ default ImmutableList<T> toImmutableList()
     {
         return this.toImmutable();
     }
+
+    @Override
+    default int indexOf(Object o)
+    {
+        return ListIterable.super.indexOf(o);
+    }
 }
diff --git a/...se-collections-api/src/main/java/org/eclipse/collections/api/ordered/OrderedIterable.java b/...se-collections-api/src/main/java/org/eclipse/collections/api/ordered/OrderedIterable.java
@@ -11,8 +11,10 @@
 package org.eclipse.collections.api.ordered;
 
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Optional;
 
 import org.eclipse.collections.api.RichIterable;
@@ -59,7 +61,20 @@ public interface OrderedIterable<T> extends RichIterable<T>
      *
      * @see List#indexOf(Object)
      */
-    int indexOf(Object object);
+    default int indexOf(Object object)
+    {
+        int i = 0;
+        Iterator<T> iterator = this.iterator();
+        while (iterator.hasNext())
+        {
+            if (Objects.equals(iterator.next(), object))
+            {
+                return i;
+            }
+            i++;
+        }
+        return -1;
+    }
 
     /**
      * Returns the first element of an iterable. In the case of a List it is the element at the first index. In the

diff --git a/.../main/java/org/eclipse/collections/impl/bag/sorted/immutable/ImmutableEmptySortedBag.java b/.../main/java/org/eclipse/collections/impl/bag/sorted/immutable/ImmutableEmptySortedBag.java
@@ -454,12 +454,6 @@ public MutableStack<T> toStack()
         return Stacks.mutable.empty();
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        return -1;
-    }
-
     @Override
     public int compareTo(SortedBag<T> o)
     {

diff --git a/...ections/src/main/java/org/eclipse/collections/impl/list/immutable/ImmutableEmptyList.java b/...ections/src/main/java/org/eclipse/collections/impl/list/immutable/ImmutableEmptyList.java
@@ -407,12 +407,6 @@ public T getOnly()
         throw new IllegalStateException("Size must be 1 but was " + this.size());
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        return -1;
-    }
-
     @Override
     public boolean equals(Object otherList)
     {

diff --git a/...ons/src/main/java/org/eclipse/collections/impl/map/ordered/mutable/OrderedMapAdapter.java b/...ons/src/main/java/org/eclipse/collections/impl/map/ordered/mutable/OrderedMapAdapter.java
@@ -582,12 +582,6 @@ public int detectLastIndex(Predicate<? super V> predicate)
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".detectLastIndex() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super V, ? super S> predicate)
     {

diff --git a/...in/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java b/...in/java/org/eclipse/collections/impl/map/sorted/immutable/AbstractImmutableSortedMap.java
@@ -547,12 +547,6 @@ public ImmutableList<V> distinct()
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".distinct() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super V, ? super S> predicate)
     {

diff --git a/...c/main/java/org/eclipse/collections/impl/map/sorted/mutable/AbstractMutableSortedMap.java b/...c/main/java/org/eclipse/collections/impl/map/sorted/mutable/AbstractMutableSortedMap.java
@@ -337,12 +337,6 @@ public int detectLastIndex(Predicate<? super V> predicate)
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".detectLastIndex() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super V, ? super S> predicate)
     {

diff --git a/...ns/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/UnmodifiableTreeMap.java b/...ns/src/main/java/org/eclipse/collections/impl/map/sorted/mutable/UnmodifiableTreeMap.java
@@ -1332,12 +1332,6 @@ public int detectLastIndex(Predicate<? super V> predicate)
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".detectLastIndex() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super V, ? super S> predicate)
     {

diff --git a/.../main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableEmptySortedSet.java b/.../main/java/org/eclipse/collections/impl/set/sorted/immutable/ImmutableEmptySortedSet.java
@@ -272,12 +272,6 @@ public T last()
         throw new NoSuchElementException();
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        return -1;
-    }
-
     @Override
     public Comparator<? super T> comparator()
     {

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
@@ -1077,12 +1077,6 @@ public ImmutableStack<T> distinct()
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".distinct() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super T, ? super S> predicate)
     {

diff --git a/...tions/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableEmptyStack.java b/...tions/src/main/java/org/eclipse/collections/impl/stack/immutable/ImmutableEmptyStack.java
@@ -743,12 +743,6 @@ public ImmutableStack<T> distinct()
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".distinct() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super T, ? super S> 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
@@ -450,12 +450,6 @@ public ImmutableStack<T> distinct()
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".distinct() not implemented yet");
     }
 
-    @Override
-    public int indexOf(Object object)
-    {
-        throw new UnsupportedOperationException(this.getClass().getSimpleName() + ".indexOf() not implemented yet");
-    }
-
     @Override
     public <S> boolean corresponds(OrderedIterable<S> other, Predicate2<? super T, ? super S> predicate)
     {