From 418bf5acce644200b8fbc1278269928559d875fe Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 7 Sep 2016 17:32:25 +0300
Subject: [PATCH] refactoring

---
 .../main/java/org/redisson/RedissonMap.java   | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonMap.java b/redisson/src/main/java/org/redisson/RedissonMap.java
index 5765a31d3..dd329f247 100644
--- a/redisson/src/main/java/org/redisson/RedissonMap.java
+++ b/redisson/src/main/java/org/redisson/RedissonMap.java
@@ -414,16 +414,20 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
         return h;
     }
 
+    protected Iterator<K> keyIterator() {
+        return new RedissonMapIterator<K, V, K>(RedissonMap.this) {
+            @Override
+            K getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
+                return (K) entry.getKey().getObj();
+            }
+        };
+    }
+    
     final class KeySet extends AbstractSet<K> {
 
         @Override
         public Iterator<K> iterator() {
-            return new RedissonMapIterator<K, V, K>(RedissonMap.this) {
-                @Override
-                K getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
-                    return (K) entry.getKey().getObj();
-                }
-            };
+            return keyIterator();
         }
 
         @Override
@@ -448,16 +452,20 @@ public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
 
     }
 
+    protected Iterator<V> valueIterator() {
+        return new RedissonMapIterator<K, V, V>(RedissonMap.this) {
+            @Override
+            V getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
+                return (V) entry.getValue().getObj();
+            }
+        };
+    }
+
     final class Values extends AbstractCollection<V> {
 
         @Override
         public Iterator<V> iterator() {
-            return new RedissonMapIterator<K, V, V>(RedissonMap.this) {
-                @Override
-                V getValue(java.util.Map.Entry<ScanObjectEntry, ScanObjectEntry> entry) {
-                    return (V) entry.getValue().getObj();
-                }
-            };
+            return valueIterator();
         }
 
         @Override
@@ -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) {