refactor and encapsulate classes

2 files changed, 80 insertions, 85 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
index 8f8286f..ce06244 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
@@ -23,6 +23,7 @@ import com.google.common.io.ByteStreams;
 import net.tylermurphy.hideAndSeek.Main;
 import org.sqlite.SQLiteConfig;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,46 +35,71 @@ import java.util.UUID;
 
 public class Database {
 
-    private static final File databaseFile = new File(Main.data, "database.db");
+    private final File databaseFile = new File(Main.getInstance().getDataFolder(), "database.db");
+    private final PlayerInfoTable playerInfo;
+    private final SQLiteConfig config;
 
-    public static PlayerInfoTable playerInfo;
-    private static SQLiteConfig config;
+    public Database(){
+        try {
+            Class.forName("org.sqlite.JDBC");
+        } catch (ClassNotFoundException e) {
+            Main.getInstance().getLogger().severe(e.getMessage());
+            throw new RuntimeException(e.getMessage());
+        }
 
-    protected static Connection connect() {
+        config = new SQLiteConfig();
+        config.setSynchronous(SQLiteConfig.SynchronousMode.NORMAL);
+        config.setTempStore(SQLiteConfig.TempStore.MEMORY);
+
+        playerInfo = new PlayerInfoTable(this);
+    }
+
+    public PlayerInfoTable getGameData(){
+        return playerInfo;
+    }
+
+    protected Connection connect() {
         Connection conn = null;
         try {
             String url = "jdbc:sqlite:"+databaseFile;
             conn = DriverManager.getConnection(url, config.toProperties());
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe(e.getMessage());
+            Main.getInstance().getLogger().severe(e.getMessage());
             e.printStackTrace();
         }
         return conn;
     }
 
-    protected static UUID convertBinaryStream(InputStream stream) {
-        ByteBuffer buffer = ByteBuffer.allocate(16);
+    protected byte[] encodeUUID(UUID uuid) {
         try {
-            buffer.put(ByteStreams.toByteArray(stream));
-            buffer.flip();
-            return new UUID(buffer.getLong(), buffer.getLong());
-        } catch (IOException ignored) {}
-        return null;
+            byte[] bytes = new byte[16];
+            ByteBuffer.wrap(bytes)
+                    .putLong(uuid.getMostSignificantBits())
+                    .putLong(uuid.getLeastSignificantBits());
+            InputStream is = new ByteArrayInputStream(bytes);
+            byte[] result = new byte[is.available()];
+            if (is.read(result) == -1) {
+                Main.getInstance().getLogger().severe("IO Error: Failed to read bytes from input stream");
+                return new byte[0];
+            }
+            return result;
+        } catch (IOException e) {
+            Main.getInstance().getLogger().severe("IO Error: " + e.getMessage());
+            return new byte[0];
+        }
     }
 
-    public static void init() {
+    protected UUID decodeUUID(byte[] bytes) {
+        InputStream is = new ByteArrayInputStream(bytes);
+        ByteBuffer buffer = ByteBuffer.allocate(16);
         try {
-            Class.forName("org.sqlite.JDBC");
-        } catch (ClassNotFoundException e) {
-            Main.plugin.getLogger().severe(e.getMessage());
-            throw new RuntimeException(e.getMessage());
+            buffer.put(ByteStreams.toByteArray(is));
+            buffer.flip();
+            return new UUID(buffer.getLong(), buffer.getLong());
+        } catch (IOException e) {
+            Main.getInstance().getLogger().severe("IO Error: " + e.getMessage());
         }
-
-        config = new SQLiteConfig();
-        config.setSynchronous(SQLiteConfig.SynchronousMode.NORMAL);
-        config.setTempStore(SQLiteConfig.TempStore.MEMORY);
-
-        playerInfo = new PlayerInfoTable();
+        return null;
     }
 
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java
index 9ad8adf..f20180b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java
@@ -19,25 +19,20 @@
 
 package net.tylermurphy.hideAndSeek.database;
 
-import com.google.common.io.ByteStreams;
 import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.game.Board;
-import net.tylermurphy.hideAndSeek.util.WinType;
-import org.jetbrains.annotations.NotNull;
+import net.tylermurphy.hideAndSeek.game.util.WinType;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
 import java.sql.*;
 import java.util.*;
 
 public class PlayerInfoTable {
 
-    private static final Map<UUID, PlayerInfo> CACHE = new HashMap<>();
+    private final Map<UUID, PlayerInfo> CACHE = new HashMap<>();
+    private final Database database;
 
-    protected PlayerInfoTable() {
+    protected PlayerInfoTable(Database database) {
 
         String sql = "CREATE TABLE IF NOT EXISTS hs_data (\n"
                 + "	uuid BINARY(16) PRIMARY KEY,\n"
@@ -51,51 +46,22 @@ public class PlayerInfoTable {
                 + "	seeker_deaths int NOT NULL\n"
                 + ");";
 
-        try(Connection connection = Database.connect(); Statement statement = connection.createStatement()) {
+        try(Connection connection = database.connect(); Statement statement = connection.createStatement()) {
             statement.executeUpdate(sql);
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+            Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
             e.printStackTrace();
         }
-    }
-
-    private byte[] encodeUUID(UUID uuid) {
-        try {
-            byte[] bytes = new byte[16];
-            ByteBuffer.wrap(bytes)
-                    .putLong(uuid.getMostSignificantBits())
-                    .putLong(uuid.getLeastSignificantBits());
-            InputStream is = new ByteArrayInputStream(bytes);
-            byte[] result = new byte[is.available()];
-            if (is.read(result) == -1) {
-                Main.plugin.getLogger().severe("IO Error: Failed to read bytes from input stream");
-                return new byte[0];
-            }
-            return result;
-        } catch (IOException e) {
-            Main.plugin.getLogger().severe("IO Error: " + e.getMessage());
-            return new byte[0];
-        }
-    }
 
-    private UUID decodeUUID(byte[] bytes) {
-        InputStream is = new ByteArrayInputStream(bytes);
-        ByteBuffer buffer = ByteBuffer.allocate(16);
-        try {
-            buffer.put(ByteStreams.toByteArray(is));
-            buffer.flip();
-            return new UUID(buffer.getLong(), buffer.getLong());
-        } catch (IOException e) {
-            Main.plugin.getLogger().severe("IO Error: " + e.getMessage());
-        }
-        return null;
+        this.database = database;
     }
 
-    @NotNull
+    @Nullable
     public PlayerInfo getInfo(UUID uuid) {
+        if(CACHE.containsKey(uuid)) return CACHE.get(uuid);
         String sql = "SELECT * FROM hs_data WHERE uuid = ?;";
-        try(Connection connection = Database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, encodeUUID(uuid));
+        try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, database.encodeUUID(uuid));
             ResultSet rs  = statement.executeQuery();
             if (rs.next()) {
                 PlayerInfo info = new PlayerInfo(
@@ -116,20 +82,20 @@ public class PlayerInfoTable {
             }
             rs.close();
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+            Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
             e.printStackTrace();
         }
-        return new PlayerInfo(uuid, 0, 0, 0, 0, 0, 0, 0, 0);
+        return null;
     }
 
     @Nullable
     public PlayerInfo getInfoRanking(String order, int place) {
         String sql = "SELECT * FROM hs_data ORDER BY "+order+" DESC LIMIT 1 OFFSET ?;";
-        try(Connection connection = Database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
+        try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
             statement.setInt(1, place-1);
             ResultSet rs  = statement.executeQuery();
             if (rs.next()) {
-                UUID uuid = decodeUUID(rs.getBytes("uuid"));
+                UUID uuid = database.decodeUUID(rs.getBytes("uuid"));
                 PlayerInfo info = new PlayerInfo(
                         uuid,
                         rs.getInt("hider_wins"),
@@ -148,7 +114,7 @@ public class PlayerInfoTable {
             }
             rs.close();
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+            Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
             e.printStackTrace();
         }
         return null;
@@ -157,13 +123,13 @@ public class PlayerInfoTable {
     @Nullable
     public List<PlayerInfo> getInfoPage(int page) {
         String sql = "SELECT * FROM hs_data ORDER BY (hider_wins + seeker_wins) DESC LIMIT 10 OFFSET ?;";
-        try(Connection connection = Database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
+        try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
             statement.setInt(1, (page-1)*10);
             ResultSet rs  = statement.executeQuery();
             List<PlayerInfo> infoList = new ArrayList<>();
             while(rs.next()) {
                 PlayerInfo info = new PlayerInfo(
-                        decodeUUID(rs.getBytes("uuid")),
+                        database.decodeUUID(rs.getBytes("uuid")),
                         rs.getInt("hider_wins"),
                         rs.getInt("seeker_wins"),
                         rs.getInt("hider_games"),
@@ -179,7 +145,7 @@ public class PlayerInfoTable {
             connection.close();
             return infoList;
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+            Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
             e.printStackTrace();
         }
         return null;
@@ -188,37 +154,40 @@ public class PlayerInfoTable {
     @Nullable
     public Integer getRanking(String order, UUID uuid) {
         String sql = "SELECT count(*) AS total FROM hs_data WHERE "+order+" >= (SELECT "+order+" FROM hs_data WHERE uuid = ?) AND "+order+" > 0;";
-        try(Connection connection = Database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, encodeUUID(uuid));
+        try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, database.encodeUUID(uuid));
             ResultSet rs  = statement.executeQuery();
             if (rs.next()) {
                 return rs.getInt("total");
             }
             rs.close();
         } catch (SQLException e) {
-            Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+            Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
             e.printStackTrace();
         }
         return null;
     }
 
-    public void addWins(List<UUID> uuids, List<UUID> winners, Map<String,Integer> hider_kills, Map<String,Integer> hider_deaths, Map<String,Integer> seeker_kills, Map<String,Integer> seeker_deaths, WinType type) {
+    public void addWins(Board board, List<UUID> uuids, List<UUID> winners, Map<String,Integer> hider_kills, Map<String,Integer> hider_deaths, Map<String,Integer> seeker_kills, Map<String,Integer> seeker_deaths, WinType type) {
         for(UUID uuid : uuids) {
             String sql = "INSERT OR REPLACE INTO hs_data (uuid, hider_wins, seeker_wins, hider_games, seeker_games, hider_kills, seeker_kills, hider_deaths, seeker_deaths) VALUES (?,?,?,?,?,?,?,?,?)";
             PlayerInfo info = getInfo(uuid);
-            try(Connection connection = Database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, encodeUUID(uuid));
+            if(info == null){
+                info = new PlayerInfo(uuid, 0, 0, 0, 0, 0, 0, 0, 0);
+            }
+            try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, database.encodeUUID(uuid));
                 statement.setInt(2, info.hider_wins + (winners.contains(uuid) && type == WinType.HIDER_WIN ? 1 : 0));
                 statement.setInt(3, info.seeker_wins + (winners.contains(uuid) && type == WinType.SEEKER_WIN ? 1 : 0));
-                statement.setInt(4, info.hider_games + (Board.isHider(uuid) || (Board.isSeeker(uuid) && !Board.getFirstSeeker().getUniqueId().equals(uuid)) ? 1 : 0));
-                statement.setInt(5, info.seeker_games + (Board.getFirstSeeker().getUniqueId().equals(uuid) ? 1 : 0));
+                statement.setInt(4, info.hider_games + (board.isHider(uuid) || (board.isSeeker(uuid) && !board.getFirstSeeker().getUniqueId().equals(uuid)) ? 1 : 0));
+                statement.setInt(5, info.seeker_games + (board.getFirstSeeker().getUniqueId().equals(uuid) ? 1 : 0));
                 statement.setInt(6, info.hider_kills + hider_kills.getOrDefault(uuid.toString(), 0));
                 statement.setInt(7, info.seeker_kills + seeker_kills.getOrDefault(uuid.toString(), 0));
                 statement.setInt(8, info.hider_deaths + hider_deaths.getOrDefault(uuid.toString(), 0));
                 statement.setInt(9, info.seeker_deaths + seeker_deaths.getOrDefault(uuid.toString(), 0));
                 statement.execute();
             } catch (SQLException e) {
-                Main.plugin.getLogger().severe("SQL Error: " + e.getMessage());
+                Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage());
                 e.printStackTrace();
                 return;
             } finally {