Merge pull request #121 from rovarga/itr

Improve {Abstract,Mutable}KeySet.iterator() memory overhead

Author: rovarga

triemap/src/main/java/tech/pantheon/triemap/AbstractKeySet.java

@@ -78,18 +78,24 @@ public final Spliterator<K> spliterator() {
     abstract int spliteratorCharacteristics();
 
     final Iterator<K> immutableIterator() {
-        return new Iterator<>() {
-            private final ImmutableIterator<K, ?> itr = map().immutableIterator();
-
-            @Override
-            public boolean hasNext() {
-                return itr.hasNext();
-            }
-
-            @Override
-            public K next() {
-                return itr.next().getKey();
-            }
-        };
+        return new Itr<>(map().immutableIterator());
+    }
+
+    private static final class Itr<K> implements Iterator<K> {
+        private final ImmutableIterator<K, ?> delegate;
+
+        Itr(final ImmutableIterator<K, ?> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public K next() {
+            return delegate.next().getKey();
+        }
     }
 }

triemap/src/main/java/tech/pantheon/triemap/MutableKeySet.java

@@ -32,24 +32,7 @@ final class MutableKeySet<K> extends AbstractKeySet<K> {
 
     @Override
     public Iterator<K> iterator() {
-        return new Iterator<>() {
-            private final AbstractIterator<K, ?> itr = map().iterator();
-
-            @Override
-            public boolean hasNext() {
-                return itr.hasNext();
-            }
-
-            @Override
-            public K next() {
-                return itr.next().getKey();
-            }
-
-            @Override
-            public void remove() {
-                itr.remove();
-            }
-        };
+        return new Itr<>(map().iterator());
     }
 
     @Override
@@ -67,4 +50,27 @@ public boolean remove(final Object o) {
     int spliteratorCharacteristics() {
         return Spliterator.DISTINCT | Spliterator.CONCURRENT | Spliterator.NONNULL;
     }
+
+    private static final class Itr<K> implements Iterator<K> {
+        private final AbstractIterator<K, ?> delegate;
+
+        Itr(final AbstractIterator<K, ?> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return delegate.hasNext();
+        }
+
+        @Override
+        public K next() {
+            return delegate.next().getKey();
+        }
+
+        @Override
+        public void remove() {
+            delegate.remove();
+        }
+    }
 }