Skip unnecessary presizing.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81367572

Author: cpovirk

guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSetMultimap.java

@@ -490,6 +490,13 @@ private static <V> ImmutableSet<V> emptySet(
         : ImmutableSortedSet.<V>emptySet(valueComparator);
   }
 
+  private static <V> ImmutableSet.Builder<V> valuesBuilder(
+      @Nullable Comparator<? super V> valueComparator) {
+    return (valueComparator == null)
+        ? new ImmutableSet.Builder<V>()
+        : new ImmutableSortedSet.Builder<V>(valueComparator);
+  }
+
   @Nullable Comparator<? super V> valueComparator() {
     return emptySet instanceof ImmutableSortedSet
         ? ((ImmutableSortedSet<V>) emptySet).comparator()

guava-gwt/src/com/google/common/collect/LinkedHashMultimap_CustomFieldSerializer.java

@@ -39,10 +39,8 @@ public static LinkedHashMultimap<Object, Object> instantiate(
       SerializationStreamReader stream) throws SerializationException {
     LinkedHashMultimap<Object, Object> multimap = LinkedHashMultimap.create();
 
-    multimap.valueSetCapacity = stream.readInt();
     int distinctKeys = stream.readInt();
-    Map<Object, Collection<Object>> map =
-        new LinkedHashMap<Object, Collection<Object>>(Maps.capacity(distinctKeys));
+    Map<Object, Collection<Object>> map = new LinkedHashMap<Object, Collection<Object>>();
     for (int i = 0; i < distinctKeys; i++) {
       Object key = stream.readObject();
       map.put(key, multimap.createCollection(key));
@@ -60,7 +58,6 @@ public static LinkedHashMultimap<Object, Object> instantiate(
 
   public static void serialize(SerializationStreamWriter stream,
       LinkedHashMultimap<?, ?> multimap) throws SerializationException {
-    stream.writeInt(multimap.valueSetCapacity);
     stream.writeInt(multimap.keySet().size());
     for (Object key : multimap.keySet()) {
       stream.writeObject(key);

guava/src/com/google/common/collect/ArrayListMultimap.java

@@ -148,17 +148,16 @@ public void trimToSize() {
   @GwtIncompatible("java.io.ObjectOutputStream")
   private void writeObject(ObjectOutputStream stream) throws IOException {
     stream.defaultWriteObject();
-    stream.writeInt(expectedValuesPerKey);
     Serialization.writeMultimap(this, stream);
   }
 
   @GwtIncompatible("java.io.ObjectOutputStream")
   private void readObject(ObjectInputStream stream)
       throws IOException, ClassNotFoundException {
     stream.defaultReadObject();
-    expectedValuesPerKey = stream.readInt();
+    expectedValuesPerKey = DEFAULT_VALUES_PER_KEY;
     int distinctKeys = Serialization.readCount(stream);
-    Map<K, Collection<V>> map = Maps.newHashMapWithExpectedSize(distinctKeys);
+    Map<K, Collection<V>> map = Maps.newHashMap();
     setMap(map);
     Serialization.populateMultimap(this, stream, distinctKeys);
   }

guava/src/com/google/common/collect/HashBiMap.java

@@ -647,8 +647,8 @@ private void writeObject(ObjectOutputStream stream) throws IOException {
   @GwtIncompatible("java.io.ObjectInputStream")
   private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
     stream.defaultReadObject();
+    init(16);
     int size = Serialization.readCount(stream);
-    init(size);
     Serialization.populateMap(this, stream, size);
   }
 

guava/src/com/google/common/collect/HashMultimap.java

@@ -122,17 +122,16 @@ private HashMultimap(Multimap<? extends K, ? extends V> multimap) {
   @GwtIncompatible("java.io.ObjectOutputStream")
   private void writeObject(ObjectOutputStream stream) throws IOException {
     stream.defaultWriteObject();
-    stream.writeInt(expectedValuesPerKey);
     Serialization.writeMultimap(this, stream);
   }
 
   @GwtIncompatible("java.io.ObjectInputStream")
   private void readObject(ObjectInputStream stream)
       throws IOException, ClassNotFoundException {
     stream.defaultReadObject();
-    expectedValuesPerKey = stream.readInt();
+    expectedValuesPerKey = DEFAULT_VALUES_PER_KEY;
     int distinctKeys = Serialization.readCount(stream);
-    Map<K, Collection<V>> map = Maps.newHashMapWithExpectedSize(distinctKeys);
+    Map<K, Collection<V>> map = Maps.newHashMap();
     setMap(map);
     Serialization.populateMultimap(this, stream, distinctKeys);
   }

guava/src/com/google/common/collect/HashMultiset.java

@@ -91,8 +91,7 @@ private void readObject(ObjectInputStream stream)
       throws IOException, ClassNotFoundException {
     stream.defaultReadObject();
     int distinctElements = Serialization.readCount(stream);
-    setBackingMap(
-        Maps.<E, Count>newHashMapWithExpectedSize(distinctElements));
+    setBackingMap(Maps.<E, Count>newHashMap());
     Serialization.populateMultiset(this, stream, distinctElements);
   }
 

guava/src/com/google/common/collect/ImmutableListMultimap.java

@@ -393,11 +393,11 @@ private void readObject(ObjectInputStream stream)
         throw new InvalidObjectException("Invalid value count " + valueCount);
       }
 
-      Object[] array = new Object[valueCount];
+      ImmutableList.Builder<Object> valuesBuilder = ImmutableList.builder();
       for (int j = 0; j < valueCount; j++) {
-        array[j] = stream.readObject();
+        valuesBuilder.add(stream.readObject());
       }
-      builder.put(key, ImmutableList.copyOf(array));
+      builder.put(key, valuesBuilder.build());
       tmpSize += valueCount;
     }
 

guava/src/com/google/common/collect/ImmutableSetMultimap.java

@@ -17,7 +17,6 @@
 package com.google.common.collect;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Arrays.asList;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.GwtCompatible;
@@ -496,6 +495,13 @@ private static <V> ImmutableSet<V> emptySet(
         : ImmutableSortedSet.<V>emptySet(valueComparator);
   }
 
+  private static <V> ImmutableSet.Builder<V> valuesBuilder(
+      @Nullable Comparator<? super V> valueComparator) {
+    return (valueComparator == null)
+        ? new ImmutableSet.Builder<V>()
+        : new ImmutableSortedSet.Builder<V>(valueComparator);
+  }
+
   /**
    * @serialData number of distinct keys, and then for each distinct key: the
    *     key, the number of values for that key, and the key's values
@@ -536,12 +542,12 @@ private void readObject(ObjectInputStream stream)
         throw new InvalidObjectException("Invalid value count " + valueCount);
       }
 
-      Object[] array = new Object[valueCount];
+      ImmutableSet.Builder<Object> valuesBuilder = valuesBuilder(valueComparator);
       for (int j = 0; j < valueCount; j++) {
-        array[j] = stream.readObject();
+        valuesBuilder.add(stream.readObject());
       }
-      ImmutableSet<Object> valueSet = valueSet(valueComparator, asList(array));
-      if (valueSet.size() != array.length) {
+      ImmutableSet<Object> valueSet = valuesBuilder.build();
+      if (valueSet.size() != valueCount) {
         throw new InvalidObjectException(
             "Duplicate key-value pairs exist for key " + key);
       }

guava/src/com/google/common/collect/LinkedHashMultimap.java

@@ -538,7 +538,6 @@ public void clear() {
   @GwtIncompatible("java.io.ObjectOutputStream")
   private void writeObject(ObjectOutputStream stream) throws IOException {
     stream.defaultWriteObject();
-    stream.writeInt(valueSetCapacity);
     stream.writeInt(keySet().size());
     for (K key : keySet()) {
       stream.writeObject(key);
@@ -556,10 +555,9 @@ private void readObject(ObjectInputStream stream)
     stream.defaultReadObject();
     multimapHeaderEntry = new ValueEntry<K, V>(null, null, 0, null);
     succeedsInMultimap(multimapHeaderEntry, multimapHeaderEntry);
-    valueSetCapacity = stream.readInt();
+    valueSetCapacity = DEFAULT_VALUE_SET_CAPACITY;
     int distinctKeys = stream.readInt();
-    Map<K, Collection<V>> map =
-        new LinkedHashMap<K, Collection<V>>(Maps.capacity(distinctKeys));
+    Map<K, Collection<V>> map = new LinkedHashMap<K, Collection<V>>();
     for (int i = 0; i < distinctKeys; i++) {
       @SuppressWarnings("unchecked")
       K key = (K) stream.readObject();

guava/src/com/google/common/collect/LinkedHashMultiset.java

@@ -103,8 +103,7 @@ private void readObject(ObjectInputStream stream)
       throws IOException, ClassNotFoundException {
     stream.defaultReadObject();
     int distinctElements = Serialization.readCount(stream);
-    setBackingMap(new LinkedHashMap<E, Count>(
-        Maps.capacity(distinctElements)));
+    setBackingMap(new LinkedHashMap<E, Count>());
     Serialization.populateMultiset(this, stream, distinctElements);
   }