Добавил MySQL 8 и MariaDB отдельно

Хз как будет работать MariaDB, советую проверить

LaunchServer/LaunchServer.iml

@@ -36,8 +36,24 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" exported="" scope="PROVIDED" name="jline-2.12.1" level="project" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="hikaricp-2.4.0" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../build/libraries/mysql-8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../build/libraries/mariadb.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -78,5 +94,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" exported="" scope="PROVIDED" name="jline-2.12.1" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="hikaricp-2.4.0" level="project" />
   </component>
 </module>

LaunchServer/source/auth/MariaDBSourceConfig.java

@@ -0,0 +1,129 @@
+package launchserver.auth;
+
+import org.mariadb.jdbc.MariaDbDataSource;
+import com.zaxxer.hikari.HikariDataSource;
+import launcher.LauncherAPI;
+import launcher.helper.LogHelper;
+import launcher.helper.VerifyHelper;
+import launcher.serialize.config.ConfigObject;
+import launcher.serialize.config.entry.BlockConfigEntry;
+import launcher.serialize.config.entry.IntegerConfigEntry;
+import launcher.serialize.config.entry.StringConfigEntry;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public final class MariaDBSourceConfig extends ConfigObject implements AutoCloseable, SQLSourceConfig
+{
+    @LauncherAPI
+    public static final int TIMEOUT = VerifyHelper.verifyInt(
+            Integer.parseInt(System.getProperty("launcher.mysql.idleTimeout", Integer.toString(5000))),
+            VerifyHelper.POSITIVE, "launcher.mysql.idleTimeout can't be <= 5000");
+    private static final int MAX_POOL_SIZE = VerifyHelper.verifyInt(
+            Integer.parseInt(System.getProperty("launcher.mysql.maxPoolSize", Integer.toString(3))),
+            VerifyHelper.POSITIVE, "launcher.mysql.maxPoolSize can't be <= 0");
+
+    // Instance
+    private final String poolName;
+
+    // Config
+    private final String address;
+    private final int port;
+    private final String username;
+    private final String password;
+    private final String database;
+
+    // Cache
+    private DataSource source;
+    private boolean hikari;
+
+    @LauncherAPI
+    public MariaDBSourceConfig(String poolName, BlockConfigEntry block)
+    {
+        super(block);
+        this.poolName = poolName;
+        address = VerifyHelper.verify(block.getEntryValue("address", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL address can't be empty");
+        port = VerifyHelper.verifyInt(block.getEntryValue("port", IntegerConfigEntry.class),
+                VerifyHelper.range(0, 65535), "Illegal MySQL port");
+        username = VerifyHelper.verify(block.getEntryValue("username", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL username can't be empty");
+        password = block.getEntryValue("password", StringConfigEntry.class);
+        database = VerifyHelper.verify(block.getEntryValue("database", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL database can't be empty");
+
+        // Password shouldn't be verified
+    }
+
+    @Override
+    public synchronized void close()
+    {
+        if (hikari)
+        { // Shutdown hikari pool
+            ((HikariDataSource) source).close();
+        }
+    }
+
+    @LauncherAPI
+    public synchronized Connection getConnection() throws SQLException
+    {
+        if (source == null)
+        { // New data source
+            MariaDbDataSource mariaDbSource = new MariaDbDataSource();
+
+            // Нету такого функционала у конектора MariaDB, попробуем так
+            //mariaDbSource.setCharacterEncoding("UTF-8");
+            //mariaDbSource.setUseSSL(false);
+
+            // Prep statements cache
+            //mariaDbSource.setPrepStmtCacheSize(250);
+            //mariaDbSource.setPrepStmtCacheSqlLimit(2048);
+            //mariaDbSource.setCachePrepStmts(true);
+            //mariaDbSource.setUseServerPrepStmts(true);
+
+            // General optimizations
+            //mariaDbSource.setCacheServerConfiguration(true);
+            //mariaDbSource.setUseLocalSessionState(true);
+            //mariaDbSource.setRewriteBatchedStatements(true);
+            //mariaDbSource.setMaintainTimeStats(false);
+            //mariaDbSource.setUseUnbufferedInput(false);
+            //mariaDbSource.setUseReadAheadInput(false);
+            //mariaDbSource.setTcpNoDelay(true);
+
+            // Set credentials
+            mariaDbSource.setServerName(address);
+            mariaDbSource.setPortNumber(port);
+            mariaDbSource.setUser(username);
+            mariaDbSource.setPassword(password);
+            mariaDbSource.setDatabaseName(database);
+
+            // Try using HikariCP
+            source = mariaDbSource;
+            try
+            {
+                Class.forName("com.zaxxer.hikari.HikariDataSource");
+                hikari = true; // Used for shutdown. Not instanceof because of possible classpath error
+
+                // Set HikariCP pool
+                HikariDataSource hikariSource = new HikariDataSource();
+                hikariSource.setDataSource(source);
+
+                // Set pool settings
+                hikariSource.setPoolName(poolName);
+                hikariSource.setMinimumIdle(0);
+                hikariSource.setMaximumPoolSize(MAX_POOL_SIZE);
+                hikariSource.setIdleTimeout(TIMEOUT * 1000L);
+
+                // Replace source with hds
+                source = hikariSource;
+                LogHelper.info("HikariCP pooling enabled for '%s'", poolName);
+            }
+            catch (ClassNotFoundException ignored)
+            {
+                LogHelper.warning("HikariCP isn't in classpath for '%s'", poolName);
+            }
+        }
+        return source.getConnection();
+    }
+}

LaunchServer/source/auth/MySQL8SourceConfig.java

@@ -0,0 +1,127 @@
+package launchserver.auth;
+
+import com.mysql.cj.jdbc.MysqlDataSource;
+import com.zaxxer.hikari.HikariDataSource;
+import launcher.LauncherAPI;
+import launcher.helper.LogHelper;
+import launcher.helper.VerifyHelper;
+import launcher.serialize.config.ConfigObject;
+import launcher.serialize.config.entry.BlockConfigEntry;
+import launcher.serialize.config.entry.IntegerConfigEntry;
+import launcher.serialize.config.entry.StringConfigEntry;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public final class MySQL8SourceConfig extends ConfigObject implements AutoCloseable, SQLSourceConfig
+{
+    @LauncherAPI
+    public static final int TIMEOUT = VerifyHelper.verifyInt(
+            Integer.parseInt(System.getProperty("launcher.mysql.idleTimeout", Integer.toString(5000))),
+            VerifyHelper.POSITIVE, "launcher.mysql.idleTimeout can't be <= 5000");
+    private static final int MAX_POOL_SIZE = VerifyHelper.verifyInt(
+            Integer.parseInt(System.getProperty("launcher.mysql.maxPoolSize", Integer.toString(3))),
+            VerifyHelper.POSITIVE, "launcher.mysql.maxPoolSize can't be <= 0");
+
+    // Instance
+    private final String poolName;
+
+    // Config
+    private final String address;
+    private final int port;
+    private final String username;
+    private final String password;
+    private final String database;
+
+    // Cache
+    private DataSource source;
+    private boolean hikari;
+
+    @LauncherAPI
+    public MySQL8SourceConfig(String poolName, BlockConfigEntry block)
+    {
+        super(block);
+        this.poolName = poolName;
+        address = VerifyHelper.verify(block.getEntryValue("address", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL address can't be empty");
+        port = VerifyHelper.verifyInt(block.getEntryValue("port", IntegerConfigEntry.class),
+                VerifyHelper.range(0, 65535), "Illegal MySQL port");
+        username = VerifyHelper.verify(block.getEntryValue("username", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL username can't be empty");
+        password = block.getEntryValue("password", StringConfigEntry.class);
+        database = VerifyHelper.verify(block.getEntryValue("database", StringConfigEntry.class),
+                VerifyHelper.NOT_EMPTY, "MySQL database can't be empty");
+
+        // Password shouldn't be verified
+    }
+
+    @Override
+    public synchronized void close()
+    {
+        if (hikari)
+        { // Shutdown hikari pool
+            ((HikariDataSource) source).close();
+        }
+    }
+
+    @LauncherAPI
+    public synchronized Connection getConnection() throws SQLException
+    {
+        if (source == null)
+        { // New data source
+            MysqlDataSource mysqlSource = new MysqlDataSource();
+            mysqlSource.setCharacterEncoding("UTF-8");
+            mysqlSource.setUseSSL(false);
+
+            // Prep statements cache
+            mysqlSource.setPrepStmtCacheSize(250);
+            mysqlSource.setPrepStmtCacheSqlLimit(2048);
+            mysqlSource.setCachePrepStmts(true);
+            mysqlSource.setUseServerPrepStmts(true);
+
+            // General optimizations
+            mysqlSource.setCacheServerConfiguration(true);
+            mysqlSource.setUseLocalSessionState(true);
+            mysqlSource.setRewriteBatchedStatements(true);
+            mysqlSource.setMaintainTimeStats(false);
+            mysqlSource.setUseUnbufferedInput(false);
+            mysqlSource.setUseReadAheadInput(false);
+            mysqlSource.setTcpNoDelay(true);
+
+            // Set credentials
+            mysqlSource.setServerName(address);
+            mysqlSource.setPortNumber(port);
+            mysqlSource.setUser(username);
+            mysqlSource.setPassword(password);
+            mysqlSource.setDatabaseName(database);
+
+            // Try using HikariCP
+            source = mysqlSource;
+            try
+            {
+                Class.forName("com.zaxxer.hikari.HikariDataSource");
+                hikari = true; // Used for shutdown. Not instanceof because of possible classpath error
+
+                // Set HikariCP pool
+                HikariDataSource hikariSource = new HikariDataSource();
+                hikariSource.setDataSource(source);
+
+                // Set pool settings
+                hikariSource.setPoolName(poolName);
+                hikariSource.setMinimumIdle(0);
+                hikariSource.setMaximumPoolSize(MAX_POOL_SIZE);
+                hikariSource.setIdleTimeout(TIMEOUT * 1000L);
+
+                // Replace source with hds
+                source = hikariSource;
+                LogHelper.info("HikariCP pooling enabled for '%s'", poolName);
+            }
+            catch (ClassNotFoundException ignored)
+            {
+                LogHelper.warning("HikariCP isn't in classpath for '%s'", poolName);
+            }
+        }
+        return source.getConnection();
+    }
+}

LaunchServer/source/auth/handler/AuthHandler.java

@@ -26,6 +26,8 @@ public abstract class AuthHandler extends ConfigObject implements AutoCloseable
         registerHandler("binaryFile", BinaryFileAuthHandler::new);
         registerHandler("textFile", TextFileAuthHandler::new);
         registerHandler("mysql", MySQLAuthHandler::new);
+        registerHandler("mysql-8", MySQL8AuthHandler::new);
+        registerHandler("mariadb", MariaDBAuthHandler::new);
         registerHandler("postgresql", PostgreSQLAuthHandler::new);
         registerHandler("json", JsonAuthHandler::new);
     }