[collect] Update primitive map API

- Add "WithExpectedSize" suffix to method name where a size is expected

commons/com.b2international.collections.api/src/com/b2international/collections/PrimitiveMapFactory.java

@@ -31,40 +31,40 @@
  */
 public interface PrimitiveMapFactory {
 
- <V> ByteKeyMap<V> newByteKeyOpenHashMap(int expectedSize);
+ <V> ByteKeyMap<V> newByteKeyOpenHashMapWithExpectedSize(int expectedSize);
 
  ByteKeyLongMap newByteKeyLongOpenHashMap();
 
- ByteKeyLongMap newByteKeyLongOpenHashMap(int expectedSize);
+ ByteKeyLongMap newByteKeyLongOpenHashMapWithExpectedSize(int expectedSize);
 
  <V> IntKeyMap<V> newIntKeyOpenHashMap();
 
- <V> IntKeyMap<V> newIntKeyOpenHashMap(int expectedSize);
+ <V> IntKeyMap<V> newIntKeyOpenHashMapWithExpectedSize(int expectedSize);
 
  LongKeyFloatMap newLongKeyFloatOpenHashMap();
 
- LongKeyFloatMap newLongKeyFloatOpenHashMap(int expectedSize);
+ LongKeyFloatMap newLongKeyFloatOpenHashMapWithExpectedSize(int expectedSize);
 
  LongKeyIntMap newLongKeyIntOpenHashMap();
 
- LongKeyIntMap newLongKeyIntOpenHashMap(int expectedSize);
+ LongKeyIntMap newLongKeyIntOpenHashMapWithExpectedSize(int expectedSize);
 
  LongKeyLongMap newLongKeyLongOpenHashMap();
 
- LongKeyLongMap newLongKeyLongOpenHashMap(int expectedSize);
+ LongKeyLongMap newLongKeyLongOpenHashMapWithExpectedSize(int expectedSize);
 
  <V> LongKeyMap<V> newLongKeyOpenHashMap();
 
  <V> LongKeyMap<V> newLongKeyOpenHashMap(HashFunction hashFunction);
 
- <V> LongKeyMap<V> newLongKeyOpenHashMap(int expectedSize);
+ <V> LongKeyMap<V> newLongKeyOpenHashMapWithExpectedSize(int expectedSize);
 
  <K> ByteValueMap<K> newObjectKeyByteOpenHashMap();
 
- <K> ByteValueMap<K> newObjectKeyByteOpenHashMap(int expectedSize);
+ <K> ByteValueMap<K> newObjectKeyByteOpenHashMapWithExpectedSize(int expectedSize);
 
  <K> LongValueMap<K> newObjectKeyLongOpenHashMap();
 
- <K> LongValueMap<K> newObjectKeyLongOpenHashMap(int expectedSize);
+ <K> LongValueMap<K> newObjectKeyLongOpenHashMapWithExpectedSize(int expectedSize);
 
 }

commons/com.b2international.collections.fastutil/src/com/b2international/collections/FastUtilPrimitiveMapFactory.java

@@ -41,8 +41,8 @@
 public class FastUtilPrimitiveMapFactory implements PrimitiveMapFactory {
 
  @Override
- public <V> ByteKeyMap<V> newByteKeyOpenHashMap(int expectedSize) {
- return ByteKeyMapWrapper.create(expectedSize);
+ public <V> ByteKeyMap<V> newByteKeyOpenHashMapWithExpectedSize(int expectedSize) {
+ return ByteKeyMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -51,8 +51,8 @@ public ByteKeyLongMap newByteKeyLongOpenHashMap() {
  }
 
  @Override
- public ByteKeyLongMap newByteKeyLongOpenHashMap(int expectedSize) {
- return ByteKeyLongMapWrapper.create(expectedSize);
+ public ByteKeyLongMap newByteKeyLongOpenHashMapWithExpectedSize(int expectedSize) {
+ return ByteKeyLongMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -61,8 +61,8 @@ public <V> IntKeyMap<V> newIntKeyOpenHashMap() {
  }
 
  @Override
- public <V> IntKeyMap<V> newIntKeyOpenHashMap(int expectedSize) {
- return IntKeyMapWrapper.create(expectedSize);
+ public <V> IntKeyMap<V> newIntKeyOpenHashMapWithExpectedSize(int expectedSize) {
+ return IntKeyMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -71,8 +71,8 @@ public LongKeyFloatMap newLongKeyFloatOpenHashMap() {
  }
 
  @Override
- public LongKeyFloatMap newLongKeyFloatOpenHashMap(int expectedSize) {
- return LongKeyFloatMapWrapper.create(expectedSize);
+ public LongKeyFloatMap newLongKeyFloatOpenHashMapWithExpectedSize(int expectedSize) {
+ return LongKeyFloatMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -81,8 +81,8 @@ public LongKeyIntMap newLongKeyIntOpenHashMap() {
  }
 
  @Override
- public LongKeyIntMap newLongKeyIntOpenHashMap(int expectedSize) {
- return LongKeyIntMapWrapper.create(expectedSize);
+ public LongKeyIntMap newLongKeyIntOpenHashMapWithExpectedSize(int expectedSize) {
+ return LongKeyIntMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -91,8 +91,8 @@ public LongKeyLongMap newLongKeyLongOpenHashMap() {
  }
 
  @Override
- public LongKeyLongMap newLongKeyLongOpenHashMap(int expectedSize) {
- return LongKeyLongMapWrapper.create(expectedSize);
+ public LongKeyLongMap newLongKeyLongOpenHashMapWithExpectedSize(int expectedSize) {
+ return LongKeyLongMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -101,8 +101,8 @@ public <V> LongKeyMap<V> newLongKeyOpenHashMap() {
  }
 
  @Override
- public <V> LongKeyMap<V> newLongKeyOpenHashMap(int expectedSize) {
- return LongKeyMapWrapper.create(expectedSize);
+ public <V> LongKeyMap<V> newLongKeyOpenHashMapWithExpectedSize(int expectedSize) {
+ return LongKeyMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -116,8 +116,8 @@ public <K> ByteValueMap<K> newObjectKeyByteOpenHashMap() {
  }
 
  @Override
- public <K> ByteValueMap<K> newObjectKeyByteOpenHashMap(int expectedSize) {
- return ObjectKeyByteMapWrapper.create(expectedSize);
+ public <K> ByteValueMap<K> newObjectKeyByteOpenHashMapWithExpectedSize(int expectedSize) {
+ return ObjectKeyByteMapWrapper.createWithExpectedSize(expectedSize);
  }
 
  @Override
@@ -126,8 +126,7 @@ public <K> LongValueMap<K> newObjectKeyLongOpenHashMap() {
  }
 
  @Override
- public <K> LongValueMap<K> newObjectKeyLongOpenHashMap(int expectedSize) {
- return ObjectKeyLongMapWrapper.create(expectedSize);
+ public <K> LongValueMap<K> newObjectKeyLongOpenHashMapWithExpectedSize(int expectedSize) {
+ return ObjectKeyLongMapWrapper.createWithExpectedSize(expectedSize);
  }
-
 }

commons/com.b2international.collections.fastutil/src/com/b2international/collections/bytes/ByteKeyLongMapWrapper.java

@@ -93,7 +93,7 @@ public static ByteKeyLongMap create() {
  return new ByteKeyLongMapWrapper(new Byte2LongOpenHashMap());
  }
 
- public static ByteKeyLongMap create(int expectedSize) {
+ public static ByteKeyLongMap createWithExpectedSize(int expectedSize) {
  return new ByteKeyLongMapWrapper(new Byte2LongOpenHashMap(expectedSize));
  }
 
@@ -102,7 +102,7 @@ public static ByteKeyLongMap create(ByteKeyLongMap map) {
  final Byte2LongMap sourceDelegate = ((ByteKeyLongMapWrapper) map).delegate;
  return new ByteKeyLongMapWrapper(clone(sourceDelegate));
  } else {
- final ByteKeyLongMap result = create(map.size());
+ final ByteKeyLongMap result = createWithExpectedSize(map.size());
  final ByteIterator iter = map.keySet().iterator();
  while (iter.hasNext()) {
  final byte key = iter.next();

commons/com.b2international.collections.fastutil/src/com/b2international/collections/bytes/ByteKeyMapWrapper.java

@@ -91,7 +91,7 @@ public Collection<V> values() {
  return delegate.values();
  }
 
- public static <V> ByteKeyMap<V> create(int expectedSize) {
+ public static <V> ByteKeyMap<V> createWithExpectedSize(int expectedSize) {
  return new ByteKeyMapWrapper<>(new Byte2ObjectOpenHashMap<V>(expectedSize));
  }
 
@@ -100,7 +100,7 @@ public static <V> ByteKeyMap<V> create(ByteKeyMap<V> map) {
  final Byte2ObjectMap<V> sourceDelegate = ((ByteKeyMapWrapper<V>) map).delegate;
  return new ByteKeyMapWrapper<>(clone(sourceDelegate));
  } else {
- final ByteKeyMap<V> result = create(map.size());
+ final ByteKeyMap<V> result = createWithExpectedSize(map.size());
  final ByteIterator iter = map.keySet().iterator();
  while (iter.hasNext()) {
  final byte key = iter.next();

commons/com.b2international.collections.fastutil/src/com/b2international/collections/ints/IntKeyMapWrapper.java

@@ -91,7 +91,7 @@ public static <V> IntKeyMap<V> create() {
  return new IntKeyMapWrapper<>(new Int2ObjectOpenHashMap<V>());
  }
 
- public static <V> IntKeyMap<V> create(int expectedSize) {
+ public static <V> IntKeyMap<V> createWithExpectedSize(int expectedSize) {
  return new IntKeyMapWrapper<>(new Int2ObjectOpenHashMap<V>(expectedSize));
  }
 
@@ -100,7 +100,7 @@ public static <V> IntKeyMap<V> create(IntKeyMap<V> map) {
  final Int2ObjectMap<V> sourceDelegate = ((IntKeyMapWrapper<V>) map).delegate;
  return new IntKeyMapWrapper<>(clone(sourceDelegate));
  } else {
- final IntKeyMap<V> result = create(map.size());
+ final IntKeyMap<V> result = createWithExpectedSize(map.size());
  final IntIterator iter = map.keySet().iterator();
  while (iter.hasNext()) {
  final int key = iter.next();

commons/com.b2international.collections.fastutil/src/com/b2international/collections/longs/LongKeyFloatMapWrapper.java

@@ -96,7 +96,7 @@ private LongKeyFloatMap create(LongKeyFloatMap map) {
  final Long2FloatMap sourceDelegate = ((LongKeyFloatMapWrapper) map).delegate;
  return new LongKeyFloatMapWrapper(clone(sourceDelegate));
  } else {
- final LongKeyFloatMap result = create(map.size());
+ final LongKeyFloatMap result = createWithExpectedSize(map.size());
  final LongIterator keys = map.keySet().iterator();
  while (keys.hasNext()) {
  final long key = keys.next();
@@ -110,7 +110,7 @@ public static LongKeyFloatMap create() {
  return new LongKeyFloatMapWrapper(new Long2FloatOpenHashMap());
  }
 
- public static LongKeyFloatMap create(int expectedSize) {
+ public static LongKeyFloatMap createWithExpectedSize(int expectedSize) {
  return new LongKeyFloatMapWrapper(new Long2FloatOpenHashMap(expectedSize));
  }
 

commons/com.b2international.collections.fastutil/src/com/b2international/collections/longs/LongKeyIntMapWrapper.java

@@ -96,7 +96,7 @@ private LongKeyIntMap create(LongKeyIntMap map) {
  final Long2IntMap sourceDelegate = ((LongKeyIntMapWrapper) map).delegate;
  return new LongKeyIntMapWrapper(clone(sourceDelegate));
  } else {
- final LongKeyIntMap result = create(map.size());
+ final LongKeyIntMap result = createWithExpectedSize(map.size());
  final LongIterator keys = map.keySet().iterator();
  while (keys.hasNext()) {
  final long key = keys.next();
@@ -110,7 +110,7 @@ public static LongKeyIntMap create() {
  return new LongKeyIntMapWrapper(new Long2IntOpenHashMap());
  }
 
- public static LongKeyIntMap create(int expectedSize) {
+ public static LongKeyIntMap createWithExpectedSize(int expectedSize) {
  return new LongKeyIntMapWrapper(new Long2IntOpenHashMap(expectedSize));
  }
 

commons/com.b2international.collections.fastutil/src/com/b2international/collections/longs/LongKeyLongMapWrapper.java

@@ -96,7 +96,7 @@ private LongKeyLongMap create(LongKeyLongMap map) {
  final Long2LongMap sourceDelegate = ((LongKeyLongMapWrapper) map).delegate;
  return new LongKeyLongMapWrapper(clone(sourceDelegate));
  } else {
- final LongKeyLongMap result = create(map.size());
+ final LongKeyLongMap result = createWithExpectedSize(map.size());
  final LongIterator keys = map.keySet().iterator();
  while (keys.hasNext()) {
  final long key = keys.next();
@@ -110,7 +110,7 @@ public static LongKeyLongMap create() {
  return new LongKeyLongMapWrapper(new Long2LongOpenHashMap());
  }
 
- public static LongKeyLongMap create(int expectedSize) {
+ public static LongKeyLongMap createWithExpectedSize(int expectedSize) {
  return new LongKeyLongMapWrapper(new Long2LongOpenHashMap(expectedSize));
  }
 

commons/com.b2international.collections.fastutil/src/com/b2international/collections/longs/LongKeyMapWrapper.java

@@ -97,7 +97,7 @@ public static <V> LongKeyMap<V> create(LongKeyMap<V> map) {
  final Long2ObjectMap<V> sourceDelegate = ((LongKeyMapWrapper<V>) map).delegate;
  return new LongKeyMapWrapper<>(clone(sourceDelegate));
  } else {
- final LongKeyMap<V> result = create(map.size());
+ final LongKeyMap<V> result = createWithExpectedSize(map.size());
  final LongIterator iter = map.keySet().iterator();
  while (iter.hasNext()) {
  final long key = iter.next();
@@ -111,7 +111,7 @@ public static <V> LongKeyMap<V> create(HashFunction hashFunction) {
  return new LongKeyMapWrapper<>(new Long2ObjectOpenCustomHashMap<V>(new LongHashStrategyWrapper(hashFunction)));
  }
 
- public static <V> LongKeyMap<V> create(int expectedSize) {
+ public static <V> LongKeyMap<V> createWithExpectedSize(int expectedSize) {
  return new LongKeyMapWrapper<>(new Long2ObjectOpenHashMap<V>(expectedSize));
  }
 

commons/com.b2international.collections.fastutil/src/com/b2international/collections/objects/ObjectKeyByteMapWrapper.java

@@ -99,7 +99,7 @@ public static <K> ByteValueMap<K> create(ByteValueMap<K> map) {
  final Object2ByteMap<K> sourceDelegate = ((ObjectKeyByteMapWrapper<K>) map).delegate;
  return new ObjectKeyByteMapWrapper<>(clone(sourceDelegate));
  } else {
- final ByteValueMap<K> result = create(map.size());
+ final ByteValueMap<K> result = createWithExpectedSize(map.size());
  final Iterator<K> keys = map.keySet().iterator();
  while (keys.hasNext()) {
  final K key = keys.next();
@@ -109,7 +109,7 @@ public static <K> ByteValueMap<K> create(ByteValueMap<K> map) {
  }
  }
 
- public static <K> ByteValueMap<K> create(int expectedSize) {
+ public static <K> ByteValueMap<K> createWithExpectedSize(int expectedSize) {
  return new ObjectKeyByteMapWrapper<>(new Object2ByteOpenHashMap<K>(expectedSize));
  }
 

commons/com.b2international.collections.fastutil/src/com/b2international/collections/objects/ObjectKeyLongMapWrapper.java

@@ -99,7 +99,7 @@ public static <K> LongValueMap<K> create(LongValueMap<K> map) {
  final Object2LongMap<K> sourceDelegate = ((ObjectKeyLongMapWrapper<K>) map).delegate;
  return new ObjectKeyLongMapWrapper<>(clone(sourceDelegate));
  } else {
- final LongValueMap<K> result = create(map.size());
+ final LongValueMap<K> result = createWithExpectedSize(map.size());
  final Iterator<K> keys = map.keySet().iterator();
  while (keys.hasNext()) {
  final K key = keys.next();
@@ -109,7 +109,7 @@ public static <K> LongValueMap<K> create(LongValueMap<K> map) {
  }
  }
 
- public static <K> LongValueMap<K> create(int expectedSize) {
+ public static <K> LongValueMap<K> createWithExpectedSize(int expectedSize) {
  return new ObjectKeyLongMapWrapper<>(new Object2LongOpenHashMap<K>(expectedSize));
  }