Close #822: Implement with(), without(), withAll(), withoutAll() as d…

…efault methods Signed-off-by: Mohammed Aboullaite <aboullaite.mohammed@gmail.com>
eclipse · May 12, 2020 · 1adf6f4 · 1adf6f4
1 parent a7589cb
commit 1adf6f4
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 220 deletions.
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBag.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBag.java
@@ -84,16 +84,32 @@ default MutableSet<T> selectUnique()
     }
 
     @Override
-    MutableBag<T> with(T element);
+    default MutableBag<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableBag<T> without(T element);
+    default MutableBag<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableBag<T> withAll(Iterable<? extends T> elements);
+    default MutableBag<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableBag<T> withoutAll(Iterable<? extends T> elements);
+    default MutableBag<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     MutableBag<T> newEmpty();

diff --git a/...pse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBagIterable.java b/...pse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBagIterable.java
@@ -114,16 +114,32 @@ default MutableBagIterable<T> selectDuplicates()
     MutableList<ObjectIntPair<T>> bottomOccurrences(int count);
 
     @Override
-    MutableBagIterable<T> with(T element);
+    default MutableBagIterable<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableBagIterable<T> without(T element);
+    default MutableBagIterable<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableBagIterable<T> withAll(Iterable<? extends T> elements);
+    default MutableBagIterable<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableBagIterable<T> withoutAll(Iterable<? extends T> elements);
+    default MutableBagIterable<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     <V> RichIterable<V> collectWithOccurrences(ObjectIntToObjectFunction<? super T, ? extends V> function);

diff --git a/...ollections-api/src/main/java/org/eclipse/collections/api/bag/sorted/MutableSortedBag.java b/...ollections-api/src/main/java/org/eclipse/collections/api/bag/sorted/MutableSortedBag.java
@@ -85,16 +85,32 @@ default MutableSortedSet<T> selectUnique()
     MutableSortedMap<T, Integer> toMapOfItemToCount();
 
     @Override
-    MutableSortedBag<T> with(T element);
+    default MutableSortedBag<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableSortedBag<T> without(T element);
+    default MutableSortedBag<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableSortedBag<T> withAll(Iterable<? extends T> elements);
+    default MutableSortedBag<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableSortedBag<T> withoutAll(Iterable<? extends T> elements);
+    default MutableSortedBag<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     MutableSortedBag<T> newEmpty();

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/FixedSizeList.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/FixedSizeList.java
@@ -21,6 +21,18 @@
 public interface FixedSizeList<T>
         extends MutableList<T>, FixedSizeCollection<T>
 {
+    @Override
+    MutableList<T> with(T element);
+
+    @Override
+    MutableList<T> without(T element);
+
+    @Override
+    MutableList<T> withAll(Iterable<? extends T> elements);
+
+    @Override
+    MutableList<T> withoutAll(Iterable<? extends T> elements);
+
     @Override
     FixedSizeList<T> toReversed();
 

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
@@ -51,16 +51,32 @@ public interface MutableList<T>
         extends MutableCollection<T>, List<T>, Cloneable, ListIterable<T>
 {
     @Override
-    MutableList<T> with(T element);
+    default MutableList<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableList<T> without(T element);
+    default MutableList<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableList<T> withAll(Iterable<? extends T> elements);
+    default MutableList<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableList<T> withoutAll(Iterable<? extends T> elements);
+    default MutableList<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     MutableList<T> newEmpty();

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/FixedSizeSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/FixedSizeSet.java
@@ -19,6 +19,18 @@
 public interface FixedSizeSet<T>
         extends MutableSet<T>, FixedSizeCollection<T>
 {
+    @Override
+    MutableSet<T> with(T element);
+
+    @Override
+    MutableSet<T> without(T element);
+
+    @Override
+    MutableSet<T> withAll(Iterable<? extends T> elements);
+
+    @Override
+    MutableSet<T> withoutAll(Iterable<? extends T> elements);
+
     @Override
     FixedSizeSet<T> tap(Procedure<? super T> procedure);
 }
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSet.java
@@ -43,16 +43,32 @@ public interface MutableSet<T>
         extends UnsortedSetIterable<T>, MutableSetIterable<T>, Cloneable
 {
     @Override
-    MutableSet<T> with(T element);
+    default MutableSet<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableSet<T> without(T element);
+    default MutableSet<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableSet<T> withAll(Iterable<? extends T> elements);
+    default MutableSet<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableSet<T> withoutAll(Iterable<? extends T> elements);
+    default MutableSet<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     MutableSet<T> newEmpty();

diff --git a/...pse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSetIterable.java b/...pse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSetIterable.java
@@ -70,4 +70,32 @@ public interface MutableSetIterable<T> extends SetIterable<T>, MutableCollection
     @Override
     @Deprecated
     MutableSetIterable<Pair<T, Integer>> zipWithIndex();
+
+    @Override
+    default MutableSetIterable<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
+
+    @Override
+    default MutableSetIterable<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
+
+    @Override
+    default MutableSetIterable<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
+
+    @Override
+    default MutableSetIterable<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 }
diff --git a/...ollections-api/src/main/java/org/eclipse/collections/api/set/sorted/MutableSortedSet.java b/...ollections-api/src/main/java/org/eclipse/collections/api/set/sorted/MutableSortedSet.java
@@ -51,16 +51,32 @@ public interface MutableSortedSet<T>
         extends MutableSetIterable<T>, SortedSetIterable<T>, SortedSet<T>, Cloneable
 {
     @Override
-    MutableSortedSet<T> with(T element);
+    default MutableSortedSet<T> with(T element)
+    {
+        this.add(element);
+        return this;
+    }
 
     @Override
-    MutableSortedSet<T> without(T element);
+    default MutableSortedSet<T> without(T element)
+    {
+        this.remove(element);
+        return this;
+    }
 
     @Override
-    MutableSortedSet<T> withAll(Iterable<? extends T> elements);
+    default MutableSortedSet<T> withAll(Iterable<? extends T> elements)
+    {
+        this.addAllIterable(elements);
+        return this;
+    }
 
     @Override
-    MutableSortedSet<T> withoutAll(Iterable<? extends T> elements);
+    default MutableSortedSet<T> withoutAll(Iterable<? extends T> elements)
+    {
+        this.removeAllIterable(elements);
+        return this;
+    }
 
     @Override
     MutableSortedSet<T> newEmpty();

diff --git a/...ollections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java b/...ollections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java
@@ -481,34 +481,6 @@ public <P> PartitionMutableBag<T> partitionWith(Predicate2<? super T, ? super P>
         }
     }
 
-    @Override
-    public MutableBag<T> with(T element)
-    {
-        this.add(element);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> without(T element)
-    {
-        this.remove(element);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> withAll(Iterable<? extends T> elements)
-    {
-        this.addAllIterable(elements);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> withoutAll(Iterable<? extends T> elements)
-    {
-        this.removeAllIterable(elements);
-        return this;
-    }
-
     @Override
     public MutableMap<T, Integer> toMapOfItemToCount()
     {

diff --git a/...e-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/SynchronizedBag.java b/...e-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/SynchronizedBag.java
@@ -98,34 +98,6 @@ protected MutableBag<T> getDelegate()
         return (MutableBag<T>) super.getDelegate();
     }
 
-    @Override
-    public MutableBag<T> with(T element)
-    {
-        this.add(element);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> without(T element)
-    {
-        this.remove(element);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> withAll(Iterable<? extends T> elements)
-    {
-        this.addAllIterable(elements);
-        return this;
-    }
-
-    @Override
-    public MutableBag<T> withoutAll(Iterable<? extends T> elements)
-    {
-        this.removeAllIterable(elements);
-        return this;
-    }
-
     @Override
     public MutableBag<T> newEmpty()
     {

diff --git a/.../src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/SynchronizedSortedBag.java b/.../src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/SynchronizedSortedBag.java
@@ -97,34 +97,6 @@ protected MutableSortedBag<T> getDelegate()
         return (MutableSortedBag<T>) super.getDelegate();
     }
 
-    @Override
-    public MutableSortedBag<T> with(T element)
-    {
-        this.add(element);
-        return this;
-    }
-
-    @Override
-    public MutableSortedBag<T> without(T element)
-    {
-        this.remove(element);
-        return this;
-    }
-
-    @Override
-    public MutableSortedBag<T> withAll(Iterable<? extends T> elements)
-    {
-        this.addAllIterable(elements);
-        return this;
-    }
-
-    @Override
-    public MutableSortedBag<T> withoutAll(Iterable<? extends T> elements)
-    {
-        this.removeAllIterable(elements);
-        return this;
-    }
-
     @Override
     public MutableSortedBag<T> newEmpty()
     {