refactoring

app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt

@@ -73,6 +73,22 @@ enum class QueryType(var subType:SubType? = null) {
         LESS;
     }
 
+    var valueMap : Map<String, Any?>? = null
+        get() {
+            this.filterValuesExpectedKeys?.let { valueMapExceptedKeys ->
+                field?.let { map ->
+                    val missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) }
+                    if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) {
+                        throw PokerAnalyticsException.QueryValueMapMissingKeys(missingKeys)
+                    }
+                } ?: run {
+                    throw PokerAnalyticsException.QueryValueMapUnexpectedValue
+                }
+            }
+            return field
+        }
+        private set
+
     private val filterValuesExpectedKeys : Array<String>?
         get() {
             this.subType?.let {
@@ -263,21 +279,5 @@ enum class QueryType(var subType:SubType? = null) {
         }
     }
 
-    var valueMap : Map<String, Any?>? = null
-        get() {
-            this.filterValuesExpectedKeys?.let { valueMapExceptedKeys ->
-                field?.let { map ->
-                    val missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) }
-                    if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) {
-                        throw PokerAnalyticsException.QueryValueMapMissingKeys(missingKeys)
-                    }
-                } ?: run {
-                    throw PokerAnalyticsException.QueryValueMapUnexpectedValue
-                }
-            }
-            return field
-        }
-        private set
-
 
 }