1.5.5

Author: Cobeine

build.gradle

@@ -5,8 +5,8 @@ plugins {
 
 }
 
-group 'me.Cobeine'
-version '1.5.4-SNAPSHOT'
+group 'github.Cobeine'
+version '1.5.5-SNAPSHOT'
 
 repositories {
     mavenCentral()

sql_lava_logo.png

@@ -16,6 +16,7 @@ public enum BasicMySQLCredentials implements CredentialsKey {
     PASSWORD("password", String.class,true),
     MAX_LIFETIME("maximumLifetime", Integer.class,true),
     DATASOURCE_CLASS_NAME("dataSourceClassName", String.class,false),
+    DRIVER("JdbcDriver", String.class,false),
     POOL_SIZE("poolSize", Integer.class,false),
     JDBC_URL("jdbcUrl",String.class,false);
 

src/main/java/me/cobeine/sqlava/connection/auth/BasicMySQLCredentials.java

@@ -23,8 +23,7 @@
  * @Author <a href="https://github.com/Cobeine">Cobeine</a>
  */
 @Getter
-public class MySQLConnection implements AuthenticatedConnection<HikariDataSource>,
-        PooledConnection<HikariDataSource, Connection> {
+public class MySQLConnection implements AuthenticatedConnection<HikariDataSource>, PooledConnection<HikariDataSource, Connection>{
 
     private ConnectionPool<HikariDataSource,Connection> pool;
     private final CredentialsRecord credentialsRecord;
@@ -49,15 +48,21 @@ public void connect(Callback<Integer, Exception> callback) {
     @Override
     public ConnectionResult connect() {
         HikariConfig config = new HikariConfig();
-        config.setDataSourceClassName(credentialsRecord.getProperty(BasicMySQLCredentials.DATASOURCE_CLASS_NAME, String.class));
-        config.setMaximumPoolSize(credentialsRecord.getProperty(BasicMySQLCredentials.POOL_SIZE, Integer.class));
+        if (credentialsRecord.getProperty(BasicMySQLCredentials.DATASOURCE_CLASS_NAME,String.class) != null) {
+            config.setDataSourceClassName(credentialsRecord.getProperty(BasicMySQLCredentials.DATASOURCE_CLASS_NAME, String.class));
+        }
+        if (credentialsRecord.getProperty(BasicMySQLCredentials.DRIVER, String.class) != null) {
+            config.setDriverClassName(credentialsRecord.getProperty(BasicMySQLCredentials.DRIVER, String.class));
+        }
         if (credentialsRecord.getProperty(BasicMySQLCredentials.JDBC_URL,String.class) != null) {
             config.setJdbcUrl(credentialsRecord.getProperty(BasicMySQLCredentials.JDBC_URL,String.class));
         }
         if (credentialsRecord.getProperty(BasicMySQLCredentials.MAX_LIFETIME,Integer.class) != null) {
             config.setMaxLifetime(credentialsRecord.getProperty(BasicMySQLCredentials.MAX_LIFETIME,Integer.class));
         }
-
+        if (credentialsRecord.getProperty(BasicMySQLCredentials.POOL_SIZE,Integer.class) != null) {
+            config.setMaximumPoolSize(credentialsRecord.getProperty(BasicMySQLCredentials.POOL_SIZE, Integer.class));
+        }
         for (CredentialsKey credentialsKey : credentialsRecord.keySet()) {
             if (credentialsKey.isProperty()) {
                 config.addDataSourceProperty(credentialsKey.getKey(), credentialsRecord.getProperty(credentialsKey,credentialsKey.getDataType()));

src/main/java/me/cobeine/sqlava/connection/database/MySQLConnection.java

@@ -9,10 +9,6 @@
 
 public interface HikariDataSourcePresets {
 
-    String DATA_SOURCE = ("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
-    String OLD_JDBC = ("com.mysql.jdbc.Driver");
-    String NEW_JDBC = ("com.mysql.cj.jdbc.Driver");
-
-
+    String DEFAULT = ("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
 
 }

src/main/java/me/cobeine/sqlava/connection/presets/HikariDataSourcePresets.java

@@ -0,0 +1,14 @@
+package me.cobeine.sqlava.connection.presets;
+
+/**
+ * @Author <a href="https://github.com/Cobeine">Cobeine</a>
+ */
+
+public interface MysqlJDBCDriverPresets {
+
+
+    String OLD_JDBC = ("com.mysql.jdbc.Driver");
+    String NEW_JDBC = ("com.mysql.cj.jdbc.Driver");
+
+
+}