code cleanups

reosfire · Jul 27, 2022 · fd48fcd · fd48fcd
1 parent 4ed0345
commit fd48fcd
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 53 deletions.
diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/AddCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/AddCommand.java
@@ -4,15 +4,16 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.AddCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Data.PlayerData;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
-import ru.reosfire.temporarywhitelist.Lib.Commands.*;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;
+import ru.reosfire.temporarywhitelist.Lib.Commands.ExecuteAsync;
 import ru.reosfire.temporarywhitelist.Lib.Text.Replacement;
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
 import ru.reosfire.temporarywhitelist.TimeConverter;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/CheckCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/CheckCommand.java
@@ -5,7 +5,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.CheckCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Data.PlayerData;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
@@ -16,7 +15,6 @@
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
 import ru.reosfire.temporarywhitelist.TimeConverter;
 
-import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 @CommandName("check")

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/DisableCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/DisableCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.DisableCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/EnableCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/EnableCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.EnableCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ImportCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ImportCommand.java
@@ -5,18 +5,11 @@
 import ru.reosfire.temporarywhitelist.Commands.Subcommands.ImportTypes.MinecraftDefaultImportCommand;
 import ru.reosfire.temporarywhitelist.Commands.Subcommands.ImportTypes.SelfSqlImportCommand;
 import ru.reosfire.temporarywhitelist.Commands.Subcommands.ImportTypes.SelfYamlImportCommand;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.AddCommandResultsConfig;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ImportCommandResultConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
-import ru.reosfire.temporarywhitelist.Data.Exporters.IDataExporter;
-import ru.reosfire.temporarywhitelist.Data.Exporters.MinecraftDefaultWhitelist;
-import ru.reosfire.temporarywhitelist.Data.PlayerData;
-import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
-import ru.reosfire.temporarywhitelist.TimeConverter;
 
 @CommandName("import")
 @CommandPermission("TemporaryWhitelist.Administrate.Import")

diff --git a/...sfire/temporarywhitelist/Commands/Subcommands/ImportTypes/EasyWhitelistImportCommand.java b/...sfire/temporarywhitelist/Commands/Subcommands/ImportTypes/EasyWhitelistImportCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ImportCommandResultConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Data.Exporters.EasyWhitelist;
 import ru.reosfire.temporarywhitelist.Data.Exporters.IDataExporter;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;

diff --git a/...re/temporarywhitelist/Commands/Subcommands/ImportTypes/MinecraftDefaultImportCommand.java b/...re/temporarywhitelist/Commands/Subcommands/ImportTypes/MinecraftDefaultImportCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ImportCommandResultConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Data.Exporters.IDataExporter;
 import ru.reosfire.temporarywhitelist.Data.Exporters.MinecraftDefaultWhitelist;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ListCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ListCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ListCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Data.PlayerData;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ReloadCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/ReloadCommand.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ReloadCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/RemoveCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/RemoveCommand.java
@@ -4,14 +4,14 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.RemoveCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
-import ru.reosfire.temporarywhitelist.Data.PlayerData;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
-import ru.reosfire.temporarywhitelist.Lib.Commands.*;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
+import ru.reosfire.temporarywhitelist.Lib.Commands.CommandPermission;
+import ru.reosfire.temporarywhitelist.Lib.Commands.ExecuteAsync;
 import ru.reosfire.temporarywhitelist.Lib.Text.Replacement;
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
 
-import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 @CommandName("remove")

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/SetCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/Subcommands/SetCommand.java
@@ -4,8 +4,6 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.SetCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
-import ru.reosfire.temporarywhitelist.Data.PlayerData;
 import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
@@ -15,7 +13,6 @@
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
 import ru.reosfire.temporarywhitelist.TimeConverter;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.stream.Collectors;
 
@@ -110,6 +107,7 @@ public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotN
         if (args.length == 1)
             return _database.AllList().stream().map(e -> e.Name).filter(e -> e.startsWith(args[0])).collect(Collectors.toList());
         else if (args.length == 2 && "permanent".startsWith(args[1])) return Collections.singletonList("permanent");
+
         return super.onTabComplete(sender, command, alias, args);
     }
 

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Commands/TwlCommand.java b/src/main/java/ru/reosfire/temporarywhitelist/Commands/TwlCommand.java
@@ -2,14 +2,10 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Commands.Subcommands.*;
-import ru.reosfire.temporarywhitelist.Configuration.Config;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.TwlCommandResultsConfig;
-import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
-import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandName;
 import ru.reosfire.temporarywhitelist.Lib.Commands.CommandNode;
 import ru.reosfire.temporarywhitelist.TemporaryWhiteList;
-import ru.reosfire.temporarywhitelist.TimeConverter;
 
 @CommandName("twl")
 public class TwlCommand extends CommandNode

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Data/Exporters/EasyWhitelist.java b/src/main/java/ru/reosfire/temporarywhitelist/Data/Exporters/EasyWhitelist.java
@@ -47,9 +47,10 @@ public List<PlayerData> GetAll()
 
         try
         {
-            for (String player : (ArrayList<String>)_getWhiteListsMethod.invoke(_WLStorage))
+            for (Object player : (ArrayList<?>)_getWhiteListsMethod.invoke(_WLStorage))
             {
-                result.add(new PlayerData(player, currentTime, _defaultTimeAmount, _defaultPermanent));
+                if (!(player instanceof String)) continue;
+                result.add(new PlayerData((String) player, currentTime, _defaultTimeAmount, _defaultPermanent));
             }
         }
         catch (Exception e)

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Data/Exporters/IDataExporter.java b/src/main/java/ru/reosfire/temporarywhitelist/Data/Exporters/IDataExporter.java
@@ -2,11 +2,12 @@
 
 import org.bukkit.command.CommandSender;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.CommandResults.ImportCommandResultConfig;
-import ru.reosfire.temporarywhitelist.Data.*;
+import ru.reosfire.temporarywhitelist.Data.ExportResult;
+import ru.reosfire.temporarywhitelist.Data.IUpdatable;
+import ru.reosfire.temporarywhitelist.Data.PlayerData;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public interface IDataExporter
 {

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Data/SqlDataProvider.java b/src/main/java/ru/reosfire/temporarywhitelist/Data/SqlDataProvider.java
@@ -17,7 +17,7 @@
 
 public class SqlDataProvider implements IDataProvider
 {
-    private static final String[] AllColumns = new String[] {"*"};
+    private static final String[] AllColumns = new String[]{"*"};
 
     private final Config _configuration;
     private final SqlConnection _sqlConnection;
@@ -38,12 +38,11 @@ public CompletableFuture<Void> Update(PlayerData playerData)
     {
         return CompletableFuture.runAsync(() ->
         {
-            try
+            String setRequest = "INSERT INTO " + _configuration.SqlTable + " (Player, Permanent, LastStartTime, " +
+                    "TimeAmount)" + "VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE Permanent=?, LastStartTime=?, " +
+                    "TimeAmount=?;";
+            try (PreparedStatement statement = _sqlConnection.getConnection().prepareStatement(setRequest))
             {
-                String setRequest = "INSERT INTO " + _configuration.SqlTable + " (Player, Permanent, LastStartTime, " +
-                        "TimeAmount)" + "VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE Permanent=?, LastStartTime=?, " +
-                        "TimeAmount=?;";
-                PreparedStatement statement = _sqlConnection.getConnection().prepareStatement(setRequest);
                 statement.setString(1, playerData.Name);
                 statement.setBoolean(2, playerData.Permanent);
                 statement.setLong(3, playerData.StartTime);
@@ -66,10 +65,9 @@ public CompletableFuture<Void> Remove(String playerName)
     {
         return CompletableFuture.runAsync(() ->
         {
-            try
+            String removeRequest = "DELETE FROM " + _configuration.SqlTable + " WHERE Player=?;";
+            try(PreparedStatement statement = _sqlConnection.getConnection().prepareStatement(removeRequest);)
             {
-                String removeRequest = "DELETE FROM "+ _configuration.SqlTable +" WHERE Player=?;";
-                PreparedStatement statement = _sqlConnection.getConnection().prepareStatement(removeRequest);
                 statement.setString(1, playerName);
                 statement.executeUpdate();
             }

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Lib/Sql/SqlConnection.java b/src/main/java/ru/reosfire/temporarywhitelist/Lib/Sql/SqlConnection.java
@@ -3,10 +3,7 @@
 import ru.reosfire.temporarywhitelist.Lib.Sql.Selection.ISelectionAttribute;
 import ru.reosfire.temporarywhitelist.Lib.Sql.Tables.TableColumn;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 
 public class SqlConnection
 {
@@ -77,7 +74,10 @@ public void CreateTable(String name, TableColumn... columns) throws SQLException
             if (i + 1 < columns.length) request.append(", ");
         }
         request.append(");");
-        getConnection().createStatement().executeUpdate(request.toString());
+        try(Statement statement = getConnection().createStatement())
+        {
+            statement.execute(request.toString());
+        }
     }
 
     public ResultSet Select(String table, String[] columns, ISelectionAttribute... attributes) throws SQLException
@@ -94,6 +94,9 @@ public ResultSet Select(String table, String[] columns, ISelectionAttribute... a
             request.append(" ");
             request.append(attribute.ToString());
         }
-        return getConnection().createStatement().executeQuery(request.append(";").toString());
+        try(Statement statement = getConnection().createStatement())
+        {
+            return statement.executeQuery(request.append(";").toString());
+        }
     }
 }
diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Lib/Sql/Tables/TableColumn.java b/src/main/java/ru/reosfire/temporarywhitelist/Lib/Sql/Tables/TableColumn.java
@@ -16,11 +16,11 @@ public TableColumn(String name, ColumnType type, ColumnFlag... flags)
     @Override
     public String toString()
     {
-        String result = "`" + name + "` " + type.ToString();
+        StringBuilder result = new StringBuilder("`" + name + "` " + type.ToString());
         for (ColumnFlag flag : flags)
         {
-            result += " " + flag.toString();
+            result.append(" ").append(flag.toString());
         }
-        return result;
+        return result.toString();
     }
 }
diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Lib/Yaml/Default/Text/HoverConfig.java b/src/main/java/ru/reosfire/temporarywhitelist/Lib/Yaml/Default/Text/HoverConfig.java
@@ -20,6 +20,7 @@ public HoverConfig(ConfigurationSection configurationSection)
 
     public HoverEvent Unwrap(IColorizer colorizer)
     {
+        //noinspection deprecation because 1.12.2
         return new HoverEvent(Action, new BaseComponent[] {new TextComponent(colorizer.Colorize(Value))});
     }
 }
diff --git a/src/main/java/ru/reosfire/temporarywhitelist/Lib/Yaml/Default/Text/TextComponentConfig.java b/src/main/java/ru/reosfire/temporarywhitelist/Lib/Yaml/Default/Text/TextComponentConfig.java
@@ -46,7 +46,7 @@ public TextComponentConfig(ConfigurationSection configurationSection)
         HoverConfig = hoverSection == null ? null : new HoverConfig(hoverSection);
 
         String color = getString("Color");
-        Color = color == null ? null : ChatColor.valueOf(color.toUpperCase(Locale.ROOT));
+        Color = color == null ? null : ChatColor.of(color.toUpperCase(Locale.ROOT));
 
         Bold = getBoolean("Bold", false);
         Italic = getBoolean("Italic", false);

diff --git a/src/main/java/ru/reosfire/temporarywhitelist/TemporaryWhiteList.java b/src/main/java/ru/reosfire/temporarywhitelist/TemporaryWhiteList.java
@@ -13,7 +13,10 @@
 import ru.reosfire.temporarywhitelist.Commands.TwlCommand;
 import ru.reosfire.temporarywhitelist.Configuration.Config;
 import ru.reosfire.temporarywhitelist.Configuration.Localization.MessagesConfig;
-import ru.reosfire.temporarywhitelist.Data.*;
+import ru.reosfire.temporarywhitelist.Data.IDataProvider;
+import ru.reosfire.temporarywhitelist.Data.PlayerDatabase;
+import ru.reosfire.temporarywhitelist.Data.SqlDataProvider;
+import ru.reosfire.temporarywhitelist.Data.YamlDataProvider;
 import ru.reosfire.temporarywhitelist.Lib.Text.Text;
 import ru.reosfire.temporarywhitelist.Lib.Yaml.YamlConfig;
 import ru.reosfire.temporarywhitelist.Loaders.LocalizationsLoader;
@@ -55,6 +58,7 @@ public boolean isWhiteListEnabled()
         return _enabled;
     }
 
+    @SuppressWarnings("unused")
     @Override
     public void onEnable()
     {