Merge pull request #47 from AzisabaNetwork/fix/ide-warnings

sysnote8main · web-flow · commit 611dae04c8af · 2025-01-06T11:47:19.000+09:00
Fix: ide warnings
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java b/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusConfig.java
@@ -13,6 +13,7 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 
 public class KDStatusConfig {
 
@@ -87,8 +88,7 @@ public void loadConfig() {
 
                     plugin.saveConfig();
                 } catch (Exception e) {
-                    Bukkit.getLogger().warning("Error: " + e.getMessage());
-                    e.printStackTrace();
+                    Bukkit.getLogger().log(Level.SEVERE, "An error occurred in loading default config", e);
                 }
             } else {
 
@@ -173,9 +173,9 @@ public void loadConfig() {
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
     public @interface ConfigOptions {
-        public String path();
+        String path();
 
-        public OptionType type() default OptionType.NONE;
+        OptionType type() default OptionType.NONE;
     }
 
     public enum OptionType {
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java b/src/main/java/jp/azisaba/lgw/kdstatus/KDStatusReloaded.java
@@ -70,11 +70,9 @@ public void onEnable() {
         Bukkit.getPluginCommand("kdstatus").setExecutor(new KDStatusCommand(this));
         Bukkit.getPluginCommand("kdstatus").setPermissionMessage(Chat.f("&cこのコマンドを実行する権限がありません！"));
 
-        if (Bukkit.getOnlinePlayers().size() > 0) {
+        if (!Bukkit.getOnlinePlayers().isEmpty()) {
 
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                kdDataContainer.loadPlayerData(player);
-            });
+            Bukkit.getOnlinePlayers().forEach(kdDataContainer::loadPlayerData);
         }
 
         Bukkit.getLogger().info(getName() + " enabled.");
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java b/src/main/java/jp/azisaba/lgw/kdstatus/commands/KDStatusCommand.java
@@ -8,6 +8,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,7 +24,7 @@ public KDStatusCommand(KDStatusReloaded plugin) {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
         if (args.length == 0) {
             sender.sendMessage(Chat.f("&cUsage: {0}", cmd.getUsage().replace("{LABEL}", label)));
             return true;
@@ -58,7 +59,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, String[] args) {
         if (args.length == 1) {
             return modes;
         }
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java b/src/main/java/jp/azisaba/lgw/kdstatus/commands/MyStatusCommand.java
@@ -9,6 +9,7 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class MyStatusCommand implements CommandExecutor {
 
@@ -21,14 +22,13 @@ public MyStatusCommand(KillDeathDataContainer dataContainer) {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
 
-        if (!(sender instanceof Player)) {
+        if (!(sender instanceof Player p)) {
             sender.sendMessage(Chat.f("&cこのコマンドはプレイヤーのみ有効です！"));
             return true;
         }
 
-        Player p = (Player) sender;
         KDUserData data = dataContainer.getPlayerData(p, true);
 
         int kills = data.getKills(TimeUnit.LIFETIME);
@@ -37,7 +37,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         if (deaths > 0) {
             kdRaito = (double) kills / (double) deaths;
         } else {
-            kdRaito = (double) kills;
+            kdRaito = kills;
         }
 
         int dailyKills = data.getKills(TimeUnit.DAILY);
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KDUserData.java
@@ -172,9 +172,7 @@ public void saveData(boolean async) {
         long start = System.currentTimeMillis();
 
         if (async) {
-            new Thread(() -> {
-                saveData(false);
-            }).start();
+            new Thread(() -> saveData(false)).start();
             return;
         }
 
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java
@@ -17,7 +17,7 @@ public class KillDeathDataContainer {
 
     private final PlayerDataSQLController sqlController;
 
-    private HashMap<UUID, KDUserData> playerDataCache = new HashMap<>();
+    private final HashMap<UUID, KDUserData> playerDataCache = new HashMap<>();
 
     private boolean isMigrated = KDStatusReloaded.getPlugin().getConfig().getBoolean("migrated", false);
 
@@ -62,7 +62,7 @@ public KDUserData loadPlayerData(@NotNull Player p) {
         }
 
         File folder = new File(KDStatusReloaded.getPlugin().getDataFolder(), "PlayerData");
-        File file = new File(folder, p.getUniqueId().toString() + ".yml");
+        File file = new File(folder, p.getUniqueId() + ".yml");
 
         KDUserData data = null;
 
@@ -152,23 +152,19 @@ public void saveAllPlayerData(boolean async, boolean clear) {
 
         List<KDUserData> data = new ArrayList<>(playerDataCache.values());
 
-        if (data.size() <= 0) {
+        if (data.isEmpty()) {
             return;
         }
 
         if (async) {
-            new Thread() {
-                public void run() {
-                    saveAllPlayerData(false, clear);
-                }
-            }.start();
+            new Thread(() -> saveAllPlayerData(false, clear)).start();
             return;
         }
 
         boolean success;
 
         if (!isMigrated) {
-            success = sqlController.save(data.toArray(new KDUserData[data.size()]));
+            success = sqlController.save(data.toArray(new KDUserData[0]));
         } else {
             data.forEach(d -> KDStatusReloaded.getPlugin().getKDData().update(d));
             success = true;
@@ -177,7 +173,7 @@ public void run() {
         if (success && clear) {
             playerDataCache.clear();
         } else if (success) {
-            for (UUID uuid : new ArrayList<UUID>(playerDataCache.keySet())) {
+            for (UUID uuid : new ArrayList<>(playerDataCache.keySet())) {
                 if (Bukkit.getPlayer(uuid) == null) {
                     playerDataCache.remove(uuid);
                 }
@@ -293,14 +289,14 @@ private long getFirstMilliSecond(TimeUnit unit) {
     public void miguration(Player p) {
         new Thread() {
 
-            private File folder = new File(KDStatusReloaded.getPlugin().getDataFolder(), "PlayerData");
+            private final File folder = new File(KDStatusReloaded.getPlugin().getDataFolder(), "PlayerData");
             private int finished = 0;
             private int fileCount = -1;
 
             public void run() {
                 fileCount = folder.listFiles().length;
 
-                for (File file : Arrays.asList(folder.listFiles())) {
+                for (File file : folder.listFiles()) {
                     UUID uuid = UUID.fromString(file.getName().substring(0, file.getName().lastIndexOf(".")));
 
                     if (!playerDataCache.containsKey(uuid)) {
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/KillRankingData.java
@@ -2,27 +2,4 @@
 
 import java.util.UUID;
 
-public class KillRankingData {
-
-    private final UUID uuid;
-    private final String name;
-    private final int kills;
-
-    public KillRankingData(UUID uuid, String name, int kills) {
-        this.uuid = uuid;
-        this.name = name;
-        this.kills = kills;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getKills() {
-        return kills;
-    }
-}
+public record KillRankingData(UUID uuid, String name, int kills) {}
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataHikariMySQLController.java
@@ -21,9 +21,6 @@ public PlayerDataHikariMySQLController(Logger logger) {
         this.logger = logger;
     }
 
-    public void connect() {
-    }
-
     @Override
     public boolean createTable() {
         return db.executeUpdate("CREATE TABLE IF NOT EXISTS kill_death_data "
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java
@@ -100,7 +100,7 @@ public void create(KDUserData data) {
             return;
 
         try (Connection conn = sql.getConnection();
-             PreparedStatement ps = conn.prepareStatement("INSERT INTO kill_death_data (uuid,name,kills,deaths,daily_kills,monthly_kills,yearly_kills,last_updated) VALUES (?,?,?,?,?,?,?,?)");) {
+             PreparedStatement ps = conn.prepareStatement("INSERT INTO kill_death_data (uuid,name,kills,deaths,daily_kills,monthly_kills,yearly_kills,last_updated) VALUES (?,?,?,?,?,?,?,?)")) {
             ps.setString(1, data.getUuid().toString());
             ps.setString(2, data.getName());
             ps.setInt(3, data.getKills(TimeUnit.LIFETIME));
diff --git a/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java b/src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataSQLController.java
@@ -166,7 +166,7 @@ public boolean save(@NotNull KDUserData data) {
     }
 
     public boolean save(@NotNull KDUserData... data2) {
-        if (data2.length <= 0) {
+        if (data2.length == 0) {
             return true;
         }
 
diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java b/src/test/java/jp/azisaba/lgw/kdstatus/DBMain.java
@@ -29,7 +29,7 @@ public static void main(String[] args) {
         PlayerDataMySQLController controller = new PlayerDataMySQLController(db, testLogger);
         List<KillRankingData> dataList = controller.getTopKillRankingData(TimeUnit.LIFETIME, 10);
         for(KillRankingData data: dataList) {
-            testLogger.info("Name: " + data.getName());
+            testLogger.info("Name: " + data.name());
         }
         int rank = controller.getRank(UUID.fromString("e76cae7b-dc41-40f9-86bb-01afc463e66c"), TimeUnit.LIFETIME);
         testLogger.info("Ranking: " + rank);
diff --git a/src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java b/src/test/java/jp/azisaba/lgw/kdstatus/sql/ConnectionTest.java
@@ -8,6 +8,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Random;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -16,9 +17,10 @@
 public class ConnectionTest {
     @Test
     public void ConnectToDatabase() throws InterruptedException {
+        var logger = Logger.getLogger("DBConnectionTest");
         Random rnd = new Random();
         HikariMySQLDatabase db = new HikariMySQLDatabase(
-                Logger.getLogger("DBConnectionTest"),
+                logger,
                 10,
                 "localhost",
                 "3306",
@@ -34,7 +36,7 @@ public void ConnectToDatabase() throws InterruptedException {
                 PreparedStatement pstmt = conn.prepareStatement("SELECT 1")) {
                 assertTrue(pstmt.executeQuery().next());
             } catch (SQLException e) {
-                e.printStackTrace();
+                logger.log(Level.SEVERE, "Failed to check connection", e);
             }
             Thread.sleep(rnd.nextInt(2000));
         }

Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,7 @@ public void saveData(boolean async) {`
`172`	`172`	`long start = System.currentTimeMillis();`
`173`	`173`
`174`	`174`	`if (async) {`
`175`		`- new Thread(() -> {`
`176`		`- saveData(false);`
`177`		`- }).start();`
	`175`	`+ new Thread(() -> saveData(false)).start();`
`178`	`176`	`return;`
`179`	`177`	`}`
`180`	`178`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ public PlayerDataHikariMySQLController(Logger logger) {`
`21`	`21`	`this.logger = logger;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public void connect() {`
`25`		`- }`
`26`		`-`
`27`	`24`	`@Override`
`28`	`25`	`public boolean createTable() {`
`29`	`26`	`return db.executeUpdate("CREATE TABLE IF NOT EXISTS kill_death_data "`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public boolean save(@NotNull KDUserData data) {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`public boolean save(@NotNull KDUserData... data2) {`
`169`		`- if (data2.length <= 0) {`
	`169`	`+ if (data2.length == 0) {`
`170`	`170`	`return true;`
`171`	`171`	`}`
`172`	`172`