From 1b739e8000a89a764766d85eeca395e09ccd0b4a Mon Sep 17 00:00:00 2001
From: "Craig P. Motlin" <cmotlin@gmail.com>
Date: Fri, 11 Mar 2022 23:09:55 -0500
Subject: [PATCH] Add missing overrides in multi-reader interfaces.

Signed-off-by: Craig P. Motlin <cmotlin@gmail.com>
---
 .../collections/api/bag/MultiReaderBag.java   | 38 +++++++++++++++
 .../collections/api/list/MultiReaderList.java | 43 +++++++++++++++++
 .../collections/api/set/MultiReaderSet.java   | 41 ++++++++++++++++
 .../impl/bag/mutable/MultiReaderHashBag.java  |  4 +-
 .../list/mutable/MultiReaderFastList.java     | 48 ++-----------------
 .../set/mutable/MultiReaderUnifiedSet.java    | 34 ++-----------
 6 files changed, 131 insertions(+), 77 deletions(-)

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MultiReaderBag.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MultiReaderBag.java
index 40382d41ba..5ba013a17d 100644
--- a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MultiReaderBag.java
+++ b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MultiReaderBag.java
@@ -23,4 +23,42 @@ public interface MultiReaderBag<T>
     void withReadLockAndDelegate(Procedure<? super MutableBag<T>> procedure);
 
     void withWriteLockAndDelegate(Procedure<? super MutableBag<T>> procedure);
+
+    @Override
+    MultiReaderBag<T> newEmpty();
+
+    @Override
+    default MultiReaderBag<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderBag<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderBag<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderBag<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderBag<T> tap(Procedure<? super T> procedure)
+    {
+        this.forEach(procedure);
+        return this;
+    }
 }
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MultiReaderList.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MultiReaderList.java
index 670e16076c..3f59453a70 100644
--- a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MultiReaderList.java
+++ b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MultiReaderList.java
@@ -36,6 +36,49 @@ public interface MultiReaderList<T>
 
     void withWriteLockAndDelegate(Procedure<? super MutableList<T>> procedure);
 
+    @Override
+    MultiReaderList<T> newEmpty();
+
+    MultiReaderList<T> clone();
+
+    @Override
+    MultiReaderList<T> subList(int fromIndex, int toIndex);
+
+    @Override
+    default MultiReaderList<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderList<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderList<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderList<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderList<T> tap(Procedure<? super T> procedure)
+    {
+        this.forEach(procedure);
+        return this;
+    }
+
     @Override
     default MultiReaderList<T> sortThis(Comparator<? super T> comparator)
     {
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java
index 5684b14dc8..06a504ff60 100644
--- a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java
+++ b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java
@@ -23,4 +23,45 @@ public interface MultiReaderSet<T>
     void withReadLockAndDelegate(Procedure<? super MutableSet<T>> procedure);
 
     void withWriteLockAndDelegate(Procedure<? super MutableSet<T>> procedure);
+
+    @Override
+    MultiReaderSet<T> newEmpty();
+
+    @Override
+    MultiReaderSet<T> clone();
+
+    @Override
+    default MultiReaderSet<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderSet<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
+
+    @Override
+    default MultiReaderSet<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderSet<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MultiReaderSet<T> tap(Procedure<? super T> procedure)
+    {
+        this.forEach(procedure);
+        return this;
+    }
 }
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java
index 818f318f11..d75c100ec9 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java
@@ -385,7 +385,7 @@ public <P, V> MutableBag<V> collectWith(
     }
 
     @Override
-    public MutableBag<T> newEmpty()
+    public MultiReaderBag<T> newEmpty()
     {
         return MultiReaderHashBag.newBag();
     }
@@ -411,7 +411,7 @@ public <P> MutableBag<T> rejectWith(
     }
 
     @Override
-    public MutableBag<T> tap(Procedure<? super T> procedure)
+    public MultiReaderBag<T> tap(Procedure<? super T> procedure)
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MultiReaderFastList.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MultiReaderFastList.java
index ab3b11d609..4ff54be5c0 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MultiReaderFastList.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/mutable/MultiReaderFastList.java
@@ -200,7 +200,7 @@ public ImmutableList<T> toImmutable()
     }
 
     @Override
-    public MutableList<T> clone()
+    public MultiReaderList<T> clone()
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
@@ -322,33 +322,13 @@ public <P, V> MutableList<V> collectWith(
     }
 
     @Override
-    public MutableList<T> newEmpty()
+    public MultiReaderList<T> newEmpty()
     {
         return MultiReaderFastList.newList();
     }
 
     @Override
-    public MutableList<T> reject(Predicate<? super T> predicate)
-    {
-        try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
-        {
-            return this.delegate.reject(predicate);
-        }
-    }
-
-    @Override
-    public <P> MutableList<T> rejectWith(
-            Predicate2<? super T, ? super P> predicate,
-            P parameter)
-    {
-        try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
-        {
-            return this.delegate.rejectWith(predicate, parameter);
-        }
-    }
-
-    @Override
-    public MutableList<T> tap(Procedure<? super T> procedure)
+    public MultiReaderList<T> tap(Procedure<? super T> procedure)
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
@@ -357,26 +337,6 @@ public MutableList<T> tap(Procedure<? super T> procedure)
         }
     }
 
-    @Override
-    public MutableList<T> select(Predicate<? super T> predicate)
-    {
-        try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
-        {
-            return this.delegate.select(predicate);
-        }
-    }
-
-    @Override
-    public <P> MutableList<T> selectWith(
-            Predicate2<? super T, ? super P> predicate,
-            P parameter)
-    {
-        try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
-        {
-            return this.delegate.selectWith(predicate, parameter);
-        }
-    }
-
     @Override
     public PartitionMutableList<T> partition(Predicate<? super T> predicate)
     {
@@ -546,7 +506,7 @@ public MultiReaderList<T> sortThisByDouble(DoubleFunction<? super T> function)
     }
 
     @Override
-    public MutableList<T> subList(int fromIndex, int toIndex)
+    public MultiReaderList<T> subList(int fromIndex, int toIndex)
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/MultiReaderUnifiedSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/MultiReaderUnifiedSet.java
index 3336872e70..e1650ce3c8 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/MultiReaderUnifiedSet.java
+++ b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/MultiReaderUnifiedSet.java
@@ -192,7 +192,7 @@ public MutableSet<T> asUnmodifiable()
     }
 
     @Override
-    public MutableSet<T> clone()
+    public MultiReaderSet<T> clone()
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
@@ -313,7 +313,7 @@ public <P, V> MutableSet<V> collectWith(
     }
 
     @Override
-    public MutableSet<T> newEmpty()
+    public MultiReaderSet<T> newEmpty()
     {
         return MultiReaderUnifiedSet.newSet();
     }
@@ -339,7 +339,7 @@ public <P> MutableSet<T> rejectWith(
     }
 
     @Override
-    public MutableSet<T> tap(Procedure<? super T> procedure)
+    public MultiReaderSet<T> tap(Procedure<? super T> procedure)
     {
         try (LockWrapper wrapper = this.lockWrapper.acquireReadLock())
         {
@@ -395,34 +395,6 @@ public <S> MutableSet<S> selectInstancesOf(Class<S> clazz)
         }
     }
 
-    @Override
-    public MutableSet<T> with(T element)
-    {
-        this.add(element);
-        return this;
-    }
-
-    @Override
-    public MutableSet<T> without(T element)
-    {
-        this.remove(element);
-        return this;
-    }
-
-    @Override
-    public MutableSet<T> withAll(Iterable<? extends T> elements)
-    {
-        this.addAllIterable(elements);
-        return this;
-    }
-
-    @Override
-    public MutableSet<T> withoutAll(Iterable<? extends T> elements)
-    {
-        this.removeAllIterable(elements);
-        return this;
-    }
-
     @Override
     public boolean equals(Object o)
     {