Optionalに変更

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/database/Database.java

@@ -67,7 +67,7 @@ protected final String format( String statement) {
 
     public abstract Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid);
 
-    public abstract CompletableFuture<Optional<Integer>> getPlayerRanking(PitPlayer player,
+    public abstract Optional<Integer> getPlayerRanking(PitPlayer player,
         RankType type);
 
     public abstract void updateUserData(PitPlayer player);

src/main/java/com/github/elic0de/thejpspit/database/MySqlDatabase.java

@@ -180,32 +180,30 @@ public Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid) {
     }
 
     @Override
-    public CompletableFuture<Optional<Integer>> getPlayerRanking(PitPlayer player, RankType type) {
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                String test = """
-                    SELECT uuid, rank
-                    FROM(SELECT `uuid`,
-                    RANK()
-                    OVER(ORDER BY %type% DESC)
-                    AS rank FROM `%user_data%`)
-                    WHERE `uuid`=?;
-                    """;
-                try (PreparedStatement statement = getConnection().prepareStatement(
-                    format(test.replaceAll("%type%", type.name().toLowerCase())))) {
-                    statement.setString(1, player.getUniqueId().toString());
-
-                    final ResultSet resultSet = statement.executeQuery();
-                    if (resultSet.next()) {
-                        return Optional.of(resultSet.getInt("rank"));
-                    }
+    public Optional<Integer> getPlayerRanking(PitPlayer player, RankType type) {
+        try {
+            String test = """
+                SELECT uuid, rank
+                FROM(SELECT `uuid`,
+                RANK()
+                OVER(ORDER BY %type% DESC)
+                AS rank FROM `%user_data%`)
+                WHERE `uuid`=?;
+                """;
+            try (PreparedStatement statement = getConnection().prepareStatement(
+                format(test.replaceAll("%type%", type.name().toLowerCase())))) {
+                statement.setString(1, player.getUniqueId().toString());
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return Optional.of(resultSet.getInt("rank"));
                 }
-            } catch (SQLException e) {
-                Bukkit.getLogger().log(Level.SEVERE,
-                    "Failed to fetch a player from uuid from the database", e);
             }
-            return Optional.empty();
-        });
+        } catch (SQLException e) {
+            Bukkit.getLogger().log(Level.SEVERE,
+                "Failed to fetch a player from uuid from the database", e);
+        }
+        return Optional.empty();
     }
 
     @Override

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

@@ -172,32 +172,30 @@ public Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid) {
     }
 
     @Override
-    public CompletableFuture<Optional<Integer>> getPlayerRanking(PitPlayer player, RankType type) {
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                String test = """
-                    SELECT uuid, rank
-                    FROM(SELECT `uuid`,
-                    RANK()
-                    OVER(ORDER BY %type% DESC)
-                    AS rank FROM `%user_data%`)
-                    WHERE `uuid`=?;
-                    """;
-                try (PreparedStatement statement = getConnection().prepareStatement(
-                    format(test.replaceAll("%type%", type.name().toLowerCase())))) {
-                    statement.setString(1, player.getUniqueId().toString());
-
-                    final ResultSet resultSet = statement.executeQuery();
-                    if (resultSet.next()) {
-                        return Optional.of(resultSet.getInt("rank"));
-                    }
+    public Optional<Integer> getPlayerRanking(PitPlayer player, RankType type) {
+        try {
+            String test = """
+                SELECT uuid, rank
+                FROM(SELECT `uuid`,
+                RANK()
+                OVER(ORDER BY %type% DESC)
+                AS rank FROM `%user_data%`)
+                WHERE `uuid`=?;
+                """;
+            try (PreparedStatement statement = getConnection().prepareStatement(
+                format(test.replaceAll("%type%", type.name().toLowerCase())))) {
+                statement.setString(1, player.getUniqueId().toString());
+
+                final ResultSet resultSet = statement.executeQuery();
+                if (resultSet.next()) {
+                    return Optional.of(resultSet.getInt("rank"));
                 }
-            } catch (SQLException e) {
-                Bukkit.getLogger().log(Level.SEVERE,
-                    "Failed to fetch a player from uuid from the database", e);
             }
-            return Optional.empty();
-        });
+        } catch (SQLException e) {
+            Bukkit.getLogger().log(Level.SEVERE,
+                "Failed to fetch a player from uuid from the database", e);
+        }
+        return Optional.empty();
     }
 
     @Override

src/main/java/com/github/elic0de/thejpspit/hook/PlaceholderHook.java

@@ -36,8 +36,7 @@ public String onRequest(@Nullable OfflinePlayer offlinePlayer, @NotNull String p
         // Return the requested placeholder
         final PitPlayer player = PitPlayerManager.getPitPlayer(offlinePlayer.getPlayer());
         return switch (params) {
-            case "kill_ranking" -> String.valueOf(TheJpsPit.getInstance().getDatabase().getPlayerRanking(player, RankType.KILLS).join()
-                    .orElse(0));
+            case "kill_ranking" -> String.valueOf(TheJpsPit.getInstance().getDatabase().getPlayerRanking(player, RankType.KILLS).orElse(0));
             case "kill" -> String.valueOf(player.getKills());
             case "level" -> String.valueOf(player.getLevel());
             default -> null;

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

@@ -156,16 +156,13 @@ public void sendStatus(PitPlayer player) {
                 .replaceAll("%best_rating%",
                     player.getBestRating() + "")
                 .replaceAll("%kills_ranking%",
-                    pit.getDatabase().getPlayerRanking(player, Database.RankType.KILLS).join()
-                        .orElse(0)
+                    pit.getDatabase().getPlayerRanking(player, Database.RankType.KILLS).orElse(0)
                         + "")
                 .replaceAll("%deaths_ranking%",
-                    pit.getDatabase().getPlayerRanking(player, Database.RankType.DEATHS).join()
-                        .orElse(0)
+                    pit.getDatabase().getPlayerRanking(player, Database.RankType.DEATHS).orElse(0)
                         + "")
                 .replaceAll("%rating_ranking%",
-                    pit.getDatabase().getPlayerRanking(player, Database.RankType.RATING).join()
-                        .orElse(0)
+                    pit.getDatabase().getPlayerRanking(player, Database.RankType.RATING).orElse(0)
                         + "")
         ).forEach(this::sendMessage);
     }