From bb52f29bd4725dfc805baaa4327d8f713de304d0 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Fri, 15 Feb 2019 21:03:09 +0200
Subject: [PATCH] Refactored UsersTable#getPlayerNames to a query

---
 .../com/djrapitops/plan/api/CommonAPI.java    |  3 ++-
 .../queries/objects/BaseUserQueries.java      | 18 +++++++++++++++
 .../plan/db/sql/tables/UsersTable.java        | 23 +++----------------
 .../databases/sql/operation/SQLFetchOps.java  |  2 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java b/Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java
index 968375ee1..8c967fb96 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java
@@ -21,6 +21,7 @@ import com.djrapitops.plan.api.data.ServerContainer;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.db.access.Query;
 import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.objects.BaseUserQueries;
 import com.djrapitops.plan.db.access.queries.objects.ServerQueries;
 import com.djrapitops.plan.utilities.uuid.UUIDUtility;
 import com.djrapitops.plugin.logging.L;
@@ -65,7 +66,7 @@ public abstract class CommonAPI implements PlanAPI {
     @Override
     public Map<UUID, String> getKnownPlayerNames() {
         try {
-            return fetchFromPlanDB().getPlayerNames();
+            return queryDB(BaseUserQueries.fetchPlayerNames());
         } catch (DBOpException e) {
             errorHandler.log(L.ERROR, this.getClass(), e);
             return new HashMap<>();
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/BaseUserQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/BaseUserQueries.java
index 72b8a3602..0fa15fb17 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/BaseUserQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/BaseUserQueries.java
@@ -163,4 +163,22 @@ public class BaseUserQueries {
             }
         };
     }
+
+    public static Query<Map<UUID, String>> fetchPlayerNames() {
+        String sql = Select.from(UsersTable.TABLE_NAME, UsersTable.USER_UUID, UsersTable.USER_NAME).toString();
+
+        return new QueryAllStatement<Map<UUID, String>>(sql, 20000) {
+            @Override
+            public Map<UUID, String> processResults(ResultSet set) throws SQLException {
+                Map<UUID, String> names = new HashMap<>();
+                while (set.next()) {
+                    UUID uuid = UUID.fromString(set.getString((UsersTable.USER_UUID)));
+                    String name = set.getString((UsersTable.USER_NAME));
+
+                    names.put(uuid, name);
+                }
+                return names;
+            }
+        };
+    }
 }
\ No newline at end of file
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
index c311619e1..6fcfa0d63 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
@@ -19,7 +19,6 @@ package com.djrapitops.plan.db.sql.tables;
 import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.ExecStatement;
-import com.djrapitops.plan.db.access.QueryAllStatement;
 import com.djrapitops.plan.db.access.QueryStatement;
 import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Insert;
@@ -29,7 +28,9 @@ import com.djrapitops.plan.db.sql.parsing.Sql;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * Table that is in charge of storing common player data for all servers.
@@ -179,22 +180,4 @@ public class UsersTable extends Table {
             }
         });
     }
-
-    public Map<UUID, String> getPlayerNames() {
-        String sql = Select.from(tableName, USER_UUID, USER_NAME).toString();
-
-        return query(new QueryAllStatement<Map<UUID, String>>(sql, 20000) {
-            @Override
-            public Map<UUID, String> processResults(ResultSet set) throws SQLException {
-                Map<UUID, String> names = new HashMap<>();
-                while (set.next()) {
-                    UUID uuid = UUID.fromString(set.getString(USER_UUID));
-                    String name = set.getString(USER_NAME);
-
-                    names.put(uuid, name);
-                }
-                return names;
-            }
-        });
-    }
 }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
index 6edf702ad..650679d1f 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@@ -120,7 +120,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
 
     @Override
     public Map<UUID, String> getPlayerNames() {
-        return usersTable.getPlayerNames();
+        return db.query(BaseUserQueries.fetchPlayerNames());
     }
 
     @Override