Replace UnifiedSet.newSet(initialCapacity) with Sets.mutable.withInit…

…ialCapacity().
eclipse · Apr 14, 2022 · 6999ba9 · 6999ba9
1 parent 95fa9ab
commit 6999ba9
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 34 deletions.
diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/AbstractBag.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bag/AbstractBag.java
@@ -61,6 +61,7 @@
 import org.eclipse.collections.api.collection.primitive.MutableLongCollection;
 import org.eclipse.collections.api.collection.primitive.MutableShortCollection;
 import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.factory.SortedSets;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.multimap.MutableMultimap;
@@ -71,7 +72,6 @@
 import org.eclipse.collections.impl.Counter;
 import org.eclipse.collections.impl.bag.mutable.HashBag;
 import org.eclipse.collections.impl.bag.sorted.mutable.TreeBag;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.tuple.primitive.PrimitiveTuples;
 import org.eclipse.collections.impl.utility.Iterate;
 
@@ -898,7 +898,7 @@ public MutableList<T> toSortedList(Comparator<? super T> comparator)
     @Override
     public MutableSet<T> toSet()
     {
-        MutableSet<T> result = UnifiedSet.newSet(this.sizeDistinct());
+        MutableSet<T> result = Sets.mutable.withInitialCapacity(this.sizeDistinct());
         this.forEachWithOccurrences((each, occurrences) -> result.add(each));
         return result;
     }

diff --git a/...llections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java b/...llections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableArrayBag.java
@@ -29,6 +29,7 @@
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
 import org.eclipse.collections.api.factory.Bags;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.api.multimap.bag.ImmutableBagMultimap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
@@ -39,7 +40,6 @@
 import org.eclipse.collections.impl.list.fixed.ArrayAdapter;
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.multimap.bag.HashBagMultimap;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.eclipse.collections.impl.utility.Iterate;
 
@@ -508,7 +508,7 @@ public <S> ImmutableBag<Pair<T, S>> zip(Iterable<S> that)
     @Deprecated
     public ImmutableSet<Pair<T, Integer>> zipWithIndex()
     {
-        return this.zipWithIndex(UnifiedSet.newSet(this.size())).toImmutable();
+        return this.zipWithIndex(Sets.mutable.withInitialCapacity(this.size())).toImmutable();
     }
 
     protected Object writeReplace()

diff --git a/...ns/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java b/...ns/src/main/java/org/eclipse/collections/impl/bimap/immutable/AbstractImmutableBiMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -409,7 +409,7 @@ public <S> ImmutableSet<Pair<V, S>> zip(Iterable<S> that)
     @Deprecated
     public ImmutableSet<Pair<V, Integer>> zipWithIndex()
     {
-        return this.delegate.zipWithIndex(UnifiedSet.newSet(this.size())).toImmutable();
+        return this.delegate.zipWithIndex(Sets.mutable.withInitialCapacity(this.size())).toImmutable();
     }
 
     @Override

diff --git a/...ctions/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java b/...ctions/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
@@ -48,6 +48,7 @@
 import org.eclipse.collections.api.block.predicate.Predicate2;
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.factory.BiMaps;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.map.primitive.MutableObjectDoubleMap;
 import org.eclipse.collections.api.map.primitive.MutableObjectLongMap;
 import org.eclipse.collections.api.multimap.set.MutableSetMultimap;
@@ -574,7 +575,7 @@ public <VV> MutableBag<VV> collectIf(Predicate<? super V> predicate, Function<?
     @Deprecated
     public MutableSet<Pair<V, Integer>> zipWithIndex()
     {
-        return this.delegate.zipWithIndex(UnifiedSet.newSet(this.size()));
+        return this.delegate.zipWithIndex(Sets.mutable.withInitialCapacity(this.size()));
     }
 
     @Override
@@ -852,7 +853,7 @@ public String toString()
 
         protected Object writeReplace()
         {
-            MutableSet<K> replace = UnifiedSet.newSet(AbstractMutableBiMap.this.size());
+            MutableSet<K> replace = Sets.mutable.withInitialCapacity(AbstractMutableBiMap.this.size());
             AbstractMutableBiMap.this.forEachKey(CollectionAddProcedure.on(replace));
             return replace;
         }

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/list/Interval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -38,6 +38,7 @@
 import org.eclipse.collections.api.block.procedure.primitive.IntProcedure;
 import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
 import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.impl.bag.mutable.HashBag;
@@ -934,7 +935,7 @@ public MutableList<Integer> toList()
     @Override
     public MutableSet<Integer> toSet()
     {
-        MutableSet<Integer> set = UnifiedSet.newSet(this.size());
+        MutableSet<Integer> set = Sets.mutable.withInitialCapacity(this.size());
         this.forEach(CollectionAddProcedure.on(set));
         return set;
     }

diff --git a/...ctions/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java b/...ctions/src/main/java/org/eclipse/collections/impl/map/immutable/AbstractImmutableMap.java
@@ -49,6 +49,7 @@
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.api.factory.Maps;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.factory.primitive.BooleanBags;
 import org.eclipse.collections.api.factory.primitive.ByteBags;
 import org.eclipse.collections.api.factory.primitive.CharBags;
@@ -84,7 +85,6 @@
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.multimap.bag.HashBagMultimap;
 import org.eclipse.collections.impl.partition.bag.PartitionHashBag;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.tuple.ImmutableEntry;
 import org.eclipse.collections.impl.utility.MapIterate;
 
@@ -137,7 +137,7 @@ public ImmutableSetMultimap<V, K> flip()
     @Override
     public Set<Entry<K, V>> entrySet()
     {
-        MutableSet<Entry<K, V>> set = UnifiedSet.newSet(this.size());
+        MutableSet<Entry<K, V>> set = Sets.mutable.withInitialCapacity(this.size());
         this.forEachKeyValue((key, value) -> set.add(ImmutableEntry.of(key, value)));
         return set.toImmutable().castToSet();
     }
@@ -417,7 +417,7 @@ public <S> ImmutableBag<Pair<V, S>> zip(Iterable<S> that)
     @Deprecated
     public ImmutableSet<Pair<V, Integer>> zipWithIndex()
     {
-        return this.zipWithIndex(UnifiedSet.newSet(this.size())).toImmutable();
+        return this.zipWithIndex(Sets.mutable.withInitialCapacity(this.size())).toImmutable();
     }
 
     @Override

diff --git a/...ain/java/org/eclipse/collections/impl/multimap/set/SynchronizedPutUnifiedSetMultimap.java b/...ain/java/org/eclipse/collections/impl/multimap/set/SynchronizedPutUnifiedSetMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -17,6 +17,7 @@
 import org.eclipse.collections.api.block.function.Function2;
 import org.eclipse.collections.api.block.predicate.Predicate2;
 import org.eclipse.collections.api.block.procedure.Procedure2;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.api.multimap.Multimap;
 import org.eclipse.collections.api.multimap.bag.MutableBagMultimap;
@@ -29,7 +30,6 @@
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.multimap.AbstractSynchronizedPutMultimap;
 import org.eclipse.collections.impl.multimap.bag.HashBagMultimap;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.eclipse.collections.impl.utility.Iterate;
 
@@ -95,7 +95,7 @@ public static <K, V> SynchronizedPutUnifiedSetMultimap<K, V> newMultimap(Iterabl
     @Override
     protected MutableSet<V> createCollection()
     {
-        return UnifiedSet.newSet(1);
+        return Sets.mutable.withInitialCapacity(1);
     }
 
     @Override

diff --git a/...s/src/main/java/org/eclipse/collections/impl/parallel/AbstractPredicateBasedCombiner.java b/...s/src/main/java/org/eclipse/collections/impl/parallel/AbstractPredicateBasedCombiner.java
@@ -15,13 +15,13 @@
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.list.ListIterable;
 import org.eclipse.collections.api.map.MapIterable;
 import org.eclipse.collections.api.set.SetIterable;
 import org.eclipse.collections.api.set.sorted.SortedSetIterable;
 import org.eclipse.collections.impl.bag.mutable.HashBag;
 import org.eclipse.collections.impl.list.mutable.CompositeFastList;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.set.sorted.mutable.TreeSortedSet;
 import org.eclipse.collections.impl.utility.internal.DefaultSpeciesNewStrategy;
 
@@ -62,7 +62,7 @@ protected final Collection<T> initializeResult(
         if (sourceCollection instanceof SetIterable)
         {
             this.setCombineOne(true);
-            return UnifiedSet.newSet(initialCapacity);
+            return Sets.mutable.withInitialCapacity(initialCapacity);
         }
         if (sourceCollection instanceof Bag || sourceCollection instanceof MapIterable)
         {

diff --git a/...src/main/java/org/eclipse/collections/impl/parallel/AbstractTransformerBasedCombiner.java b/...src/main/java/org/eclipse/collections/impl/parallel/AbstractTransformerBasedCombiner.java
@@ -15,14 +15,14 @@
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.list.ListIterable;
 import org.eclipse.collections.api.map.MapIterable;
 import org.eclipse.collections.api.set.SetIterable;
 import org.eclipse.collections.api.set.sorted.SortedSetIterable;
 import org.eclipse.collections.impl.bag.mutable.HashBag;
 import org.eclipse.collections.impl.list.mutable.CompositeFastList;
 import org.eclipse.collections.impl.list.mutable.FastList;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.utility.internal.DefaultSpeciesNewStrategy;
 
 public abstract class AbstractTransformerBasedCombiner<V, T, BT extends Procedure<T>>
@@ -55,7 +55,7 @@ protected Collection<V> initializeResult(Iterable<T> sourceIterable, Collection<
         if (sourceIterable instanceof SetIterable)
         {
             this.setCombineOne(true);
-            return UnifiedSet.newSet(initialCapacity);
+            return Sets.mutable.withInitialCapacity(initialCapacity);
         }
         if (sourceIterable instanceof Bag || sourceIterable instanceof MapIterable)
         {

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/AbstractUnifiedSet.java
@@ -29,6 +29,7 @@
 import org.eclipse.collections.api.block.function.primitive.ShortFunction;
 import org.eclipse.collections.api.block.predicate.Predicate;
 import org.eclipse.collections.api.block.predicate.Predicate2;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.factory.primitive.BooleanSets;
 import org.eclipse.collections.api.factory.primitive.ByteSets;
 import org.eclipse.collections.api.factory.primitive.CharSets;
@@ -345,7 +346,7 @@ public <S> MutableSet<Pair<T, S>> zip(Iterable<S> that)
     @Deprecated
     public MutableSet<Pair<T, Integer>> zipWithIndex()
     {
-        return this.zipWithIndex(UnifiedSet.newSet(this.size()));
+        return this.zipWithIndex(Sets.mutable.withInitialCapacity(this.size()));
     }
 
     @Override

diff --git a/...ctions/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java b/...ctions/src/main/java/org/eclipse/collections/impl/set/immutable/AbstractImmutableSet.java
@@ -202,7 +202,7 @@ public <P> PartitionImmutableSet<T> partitionWith(Predicate2<? super T, ? super
     @Override
     public <S> ImmutableSet<S> selectInstancesOf(Class<S> clazz)
     {
-        MutableSet<S> result = UnifiedSet.newSet(this.size());
+        MutableSet<S> result = Sets.mutable.withInitialCapacity(this.size());
         this.forEach(new SelectInstancesOfProcedure<>(clazz, result));
         return result.toImmutable();
     }
@@ -374,13 +374,13 @@ public <S> ImmutableSet<Pair<T, S>> zip(Iterable<S> that)
     @Deprecated
     public ImmutableSet<Pair<T, Integer>> zipWithIndex()
     {
-        return this.zipWithIndex(UnifiedSet.newSet(this.size())).toImmutable();
+        return this.zipWithIndex(Sets.mutable.withInitialCapacity(this.size())).toImmutable();
     }
 
     @Override
     protected MutableCollection<T> newMutable(int size)
     {
-        return UnifiedSet.newSet(size);
+        return Sets.mutable.withInitialCapacity(size);
     }
 
     @Override

diff --git a/.../main/java/org/eclipse/collections/impl/set/immutable/ImmutableSetSerializationProxy.java b/.../main/java/org/eclipse/collections/impl/set/immutable/ImmutableSetSerializationProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -15,10 +15,10 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.impl.block.procedure.checked.CheckedProcedure;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 
 class ImmutableSetSerializationProxy<T> implements Externalizable
 {
@@ -65,7 +65,7 @@ public void safeValue(T value) throws IOException
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
     {
         int size = in.readInt();
-        MutableSet<T> deserializedSet = UnifiedSet.newSet(size);
+        MutableSet<T> deserializedSet = Sets.mutable.withInitialCapacity(size);
 
         for (int i = 0; i < size; i++)
         {

diff --git a/...ollections/src/main/java/org/eclipse/collections/impl/set/mutable/AbstractMutableSet.java b/...ollections/src/main/java/org/eclipse/collections/impl/set/mutable/AbstractMutableSet.java
@@ -84,7 +84,7 @@ public MutableSet<T> newEmpty()
 
     protected <K> MutableSet<K> newEmptySameSize()
     {
-        return UnifiedSet.newSet(this.size());
+        return Sets.mutable.withInitialCapacity(this.size());
     }
 
     @Override

diff --git a/...ections/src/main/java/org/eclipse/collections/impl/set/mutable/MutableSetFactoryImpl.java b/...ections/src/main/java/org/eclipse/collections/impl/set/mutable/MutableSetFactoryImpl.java
@@ -29,6 +29,7 @@ public <T> MutableSet<T> empty()
     @Override
     public <T> MutableSet<T> withInitialCapacity(int capacity)
     {
+        //noinspection SSBasedInspection
         return UnifiedSet.newSet(capacity);
     }
 

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/set/mutable/SetAdapter.java
@@ -381,7 +381,7 @@ public <S> MutableSet<Pair<T, S>> zip(Iterable<S> that)
     @Override
     public MutableSet<Pair<T, Integer>> zipWithIndex()
     {
-        return Iterate.zipWithIndex(this, UnifiedSet.newSet(this.size()));
+        return Iterate.zipWithIndex(this, Sets.mutable.withInitialCapacity(this.size()));
     }
 
     @Override

diff --git a/...ections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/ByteHashSet.java b/...ections/src/main/java/org/eclipse/collections/impl/set/mutable/primitive/ByteHashSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Goldman Sachs and others.
+ * Copyright (c) 2022 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -28,6 +28,7 @@
 import org.eclipse.collections.api.block.predicate.primitive.BytePredicate;
 import org.eclipse.collections.api.block.procedure.primitive.ByteProcedure;
 import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.factory.primitive.ByteBags;
 import org.eclipse.collections.api.factory.primitive.ByteLists;
 import org.eclipse.collections.api.iterator.ByteIterator;
@@ -44,7 +45,6 @@
 import org.eclipse.collections.impl.factory.primitive.ByteSets;
 import org.eclipse.collections.impl.lazy.primitive.LazyByteIterableAdapter;
 import org.eclipse.collections.impl.set.immutable.primitive.ImmutableByteSetSerializationProxy;
-import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 
 public final class ByteHashSet implements MutableByteSet, Externalizable
 {
@@ -692,7 +692,7 @@ public MutableByteSet reject(BytePredicate predicate)
     @Override
     public <V> MutableSet<V> collect(ByteToObjectFunction<? extends V> function)
     {
-        MutableSet<V> target = UnifiedSet.newSet(this.size());
+        MutableSet<V> target = Sets.mutable.withInitialCapacity(this.size());
 
         this.forEach(each -> target.add(function.valueOf(each)));
 
@@ -1359,7 +1359,7 @@ public ImmutableByteSet reject(BytePredicate predicate)
         @Override
         public <V> ImmutableSet<V> collect(ByteToObjectFunction<? extends V> function)
         {
-            MutableSet<V> target = UnifiedSet.newSet(this.size());
+            MutableSet<V> target = Sets.mutable.withInitialCapacity(this.size());
 
             this.forEach(each -> target.add(function.valueOf(each)));