refactoring

redisson/src/main/java/org/redisson/RedissonMap.java

@@ -414,10 +414,7 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
         return h;
     }
 
-    final class KeySet extends AbstractSet<K> {
-
-        @Override
-        public Iterator<K> iterator() {
+    protected Iterator<K> keyIterator() {
         return new RedissonMapIterator<K, V, K>(RedissonMap.this) {
             @Override
             K getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
@@ -426,6 +423,13 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
         };
     }
     
+    final class KeySet extends AbstractSet<K> {
+
+        @Override
+        public Iterator<K> iterator() {
+            return keyIterator();
+        }
+
         @Override
         public boolean contains(Object o) {
             return RedissonMap.this.containsKey(o);
@@ -448,10 +452,7 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
 
     }
 
-    final class Values extends AbstractCollection<V> {
-
-        @Override
-        public Iterator<V> iterator() {
+    protected Iterator<V> valueIterator() {
         return new RedissonMapIterator<K, V, V>(RedissonMap.this) {
             @Override
             V getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
@@ -460,6 +461,13 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
         };
     }
 
+    final class Values extends AbstractCollection<V> {
+
+        @Override
+        public Iterator<V> iterator() {
+            return valueIterator();
+        }
+
         @Override
         public boolean contains(Object o) {
             return RedissonMap.this.containsValue(o);
@@ -477,10 +485,15 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
 
     }
 
+    protected final Iterator<Map.Entry<K,V>> entryIterator() {
+        return new RedissonMapIterator<K, V, Map.Entry<K, V>>(RedissonMap.this);
+    }
+
+    
     final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
 
         public final Iterator<Map.Entry<K,V>> iterator() {
-            return new RedissonMapIterator<K, V, Map.Entry<K, V>>(RedissonMap.this);
+            return entryIterator();
         }
 
         public final boolean contains(Object o) {