From 9c4c6b2bb9256a0e7c2a4118bbda6d8090cdf80c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 13 Apr 2023 00:49:56 +0200
Subject: [PATCH] Improve {Abstract,Mutable}KeySet.iterator() memory overhead

Do not use an anonymous class, but rather a dedicated nested class,
which reduces the need to capture 'this', which we do not really need.
This translates to 8 bytes saved on typical use.

Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 9962d4e05bea377eb90eb2a71c27d717aedb7dce)
---
 .../tech/pantheon/triemap/AbstractKeySet.java | 32 ++++++++------
 .../tech/pantheon/triemap/MutableKeySet.java  | 42 +++++++++++--------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/triemap/src/main/java/tech/pantheon/triemap/AbstractKeySet.java b/triemap/src/main/java/tech/pantheon/triemap/AbstractKeySet.java
index dc6e19e..d27b75f 100644
--- a/triemap/src/main/java/tech/pantheon/triemap/AbstractKeySet.java
+++ b/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<K>() {
-            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();
+        }
     }
 }
diff --git a/triemap/src/main/java/tech/pantheon/triemap/MutableKeySet.java b/triemap/src/main/java/tech/pantheon/triemap/MutableKeySet.java
index f4dce60..bf8ca42 100644
--- a/triemap/src/main/java/tech/pantheon/triemap/MutableKeySet.java
+++ b/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<K>() {
-            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();
+        }
+    }
 }