Push down implementation of Multiset.iterator() from AbstractMultiset.

Effects on ArrayListMultimapProGuard: 59653 bytes => 58487 bytes 55 classes => 54 classes 414 methods => 408 methods Effects on HashMultimapProGuard: 61927 bytes => 60761 bytes 55 classes => 54 classes 420 methods => 414 methods Effects on LinkedHashMultimapProGuard: 71932 bytes => 70766 bytes 62 classes => 61 methods 495 methods => 489 methods Effects on HashMultisetProGuard: 26583 bytes => 25426 bytes 21 classes => 20 classes 169 methods => 163 methods Effects on LinkedHashMultisetProGuard: 32586 bytes => 31429 bytes 28 classes => 27 classes 203 methods => 197 methods RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=180585887
google · Jan 2, 2018 · d40791f · d40791f
1 parent 6824c4d
commit d40791f
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 10 deletions.
diff --git a/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java b/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java
@@ -481,6 +481,11 @@ public void remove() {
       };
     }
 
+    @Override
+    public Iterator<E> iterator() {
+      return Multisets.iteratorImpl(this);
+    }
+
     @Override
     public void clear() {
       countMap.clear();

diff --git a/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java
@@ -137,6 +137,11 @@ public int getCount() {
       };
     }
 
+    @Override
+    public Iterator<E> iterator() {
+      return Multisets.iteratorImpl(this);
+    }
+
     @Override
     int distinctElements() {
       return backingMap.size();

diff --git a/android/guava/src/com/google/common/collect/AbstractMultiset.java b/android/guava/src/com/google/common/collect/AbstractMultiset.java
@@ -60,11 +60,6 @@ public boolean contains(@NullableDecl Object element) {
     return count(element) > 0;
   }
 
-  @Override
-  public Iterator<E> iterator() {
-    return Multisets.iteratorImpl(this);
-  }
-
   @Override
   public int count(@NullableDecl Object element) {
     for (Entry<E> entry : entrySet()) {

diff --git a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java
@@ -539,6 +539,11 @@ public void remove() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @Override
   public void clear() {
     countMap.clear();

diff --git a/android/guava/src/com/google/common/collect/EnumMultiset.java b/android/guava/src/com/google/common/collect/EnumMultiset.java
@@ -282,6 +282,11 @@ public int getCount() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @GwtIncompatible // java.io.ObjectOutputStream
   private void writeObject(ObjectOutputStream stream) throws IOException {
     stream.defaultWriteObject();

diff --git a/android/guava/src/com/google/common/collect/Multisets.java b/android/guava/src/com/google/common/collect/Multisets.java
@@ -430,6 +430,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -486,6 +491,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -563,6 +573,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -615,6 +630,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return Iterators.size(entryIterator());

diff --git a/android/guava/src/com/google/common/collect/TreeMultiset.java b/android/guava/src/com/google/common/collect/TreeMultiset.java
@@ -480,6 +480,11 @@ public void remove() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @Override
   public SortedMultiset<E> headMultiset(@NullableDecl E upperBound, BoundType boundType) {
     return new TreeMultiset<E>(

diff --git a/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java b/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java
@@ -481,6 +481,11 @@ public void remove() {
       };
     }
 
+    @Override
+    public Iterator<E> iterator() {
+      return Multisets.iteratorImpl(this);
+    }
+
     @Override
     public void clear() {
       countMap.clear();

diff --git a/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java
@@ -137,6 +137,11 @@ public int getCount() {
       };
     }
 
+    @Override
+    public Iterator<E> iterator() {
+      return Multisets.iteratorImpl(this);
+    }
+
     @Override
     int distinctElements() {
       return backingMap.size();

diff --git a/guava/src/com/google/common/collect/AbstractMultiset.java b/guava/src/com/google/common/collect/AbstractMultiset.java
@@ -60,11 +60,6 @@ public boolean contains(@NullableDecl Object element) {
     return count(element) > 0;
   }
 
-  @Override
-  public Iterator<E> iterator() {
-    return Multisets.iteratorImpl(this);
-  }
-
   @Override
   public int count(@NullableDecl Object element) {
     for (Entry<E> entry : entrySet()) {

diff --git a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java
@@ -539,6 +539,11 @@ public void remove() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @Override
   public void clear() {
     countMap.clear();

diff --git a/guava/src/com/google/common/collect/EnumMultiset.java b/guava/src/com/google/common/collect/EnumMultiset.java
@@ -282,6 +282,11 @@ public int getCount() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @GwtIncompatible // java.io.ObjectOutputStream
   private void writeObject(ObjectOutputStream stream) throws IOException {
     stream.defaultWriteObject();

diff --git a/guava/src/com/google/common/collect/Multisets.java b/guava/src/com/google/common/collect/Multisets.java
@@ -462,6 +462,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -518,6 +523,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -595,6 +605,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return elementSet().size();
@@ -647,6 +662,11 @@ protected Entry<E> computeNext() {
         };
       }
 
+      @Override
+      public Iterator<E> iterator() {
+        return Multisets.iteratorImpl(this);
+      }
+
       @Override
       int distinctElements() {
         return Iterators.size(entryIterator());

diff --git a/guava/src/com/google/common/collect/TreeMultiset.java b/guava/src/com/google/common/collect/TreeMultiset.java
@@ -480,6 +480,11 @@ public void remove() {
     };
   }
 
+  @Override
+  public Iterator<E> iterator() {
+    return Multisets.iteratorImpl(this);
+  }
+
   @Override
   public SortedMultiset<E> headMultiset(@NullableDecl E upperBound, BoundType boundType) {
     return new TreeMultiset<E>(