Merge MySQL-Annotations branch into stable

* Requires more testing, but is considered stable.

Author: Fernthedev

.idea/checkstyle-idea.xml

@@ -175,7 +175,7 @@ allprojects {
 
         api "net.kyori:adventure-api:$adventureAPI"
         implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-        api 'com.zaxxer:HikariCP:3.4.5'
+
         compile group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1u2'
 
 //        compileOnly 'org.projectlombok:lombok:1.18.12'
@@ -199,7 +199,7 @@ allprojects {
         minimize()
         relocate 'co.aikar.commands', "${project.group}.acf"
         relocate 'co.aikar.locales', "${project.group}.locales"
-
+        relocate 'co.aikar.idb', "${project.group}.idb"
     }
 
     compileJava.options.encoding = 'UTF-8'

.idea/misc.xml

@@ -11,8 +11,16 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.13.1'
 
     implementation ('com.google.code.gson:gson:2.8.6')
-//    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
-    implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.0'
+
+    api 'com.zaxxer:HikariCP:3.4.5'
+    //    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
+    implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.1'
+
+//    api "co.aikar:idb-core:1.0.0-SNAPSHOT"
+    api 'com.github.Fernthedev:db:292c0bb'
+    api 'com.github.Fernthedev:java-api-for-mysql:4c51dbe' // For MySQL annotations
+
+
     api 'com.github.Fernthedev:fern-configmanager:1.3.0' // Check github releases tag for the version.
 
     // 2. Use Guava types in your public API:
@@ -22,6 +30,8 @@ dependencies {
     api group: 'org.slf4j', name: 'slf4j-jdk14', version: slf4j_ver
     compileOnly 'org.projectlombok:lombok:1.18.16'
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
+
+
 }
 
 compileKotlin {

.idea/sqldialects.xml

@@ -1,14 +1,14 @@
 package com.github.fernthedev.fernapi.universal;
 
 import co.aikar.commands.CommandManager;
+import co.aikar.idb.DB;
 import com.github.fernthedev.fernapi.universal.api.*;
 import com.github.fernthedev.fernapi.universal.data.network.IPMessageHandler;
 import com.github.fernthedev.fernapi.universal.data.network.PluginMessageData;
 import com.github.fernthedev.fernapi.universal.exceptions.FernRuntimeException;
 import com.github.fernthedev.fernapi.universal.exceptions.setup.IncorrectSetupException;
 import com.github.fernthedev.fernapi.universal.handlers.*;
-import com.github.fernthedev.fernapi.universal.mysql.HikariDatabaseHandler;
-import com.github.fernthedev.fernapi.universal.mysql.HikariSQLDriver;
+import com.github.fernthedev.fernapi.universal.mysql.AikarFernDatabase;
 import com.github.fernthedev.fernapi.universal.util.UUIDFetcher;
 import com.github.fernthedev.fernapi.universal.util.UniversalContextResolvers;
 import com.github.fernthedev.fernapi.universal.util.VersionUtil;
@@ -44,9 +44,6 @@ private Universal() {}
     private static IChatHandler<?> ch;
     private static IPMessageHandler mh;
 
-    @Setter
-    private static HikariDatabaseHandler databaseHandler = new HikariDatabaseHandler();
-
     private static CommandManager comhand;
     private static NetworkHandler<? extends Object> nh;
     private static IScheduler<?,?> sh;
@@ -93,8 +90,7 @@ public void setup(@NonNull MethodInterface<?, ?> methodInterface, FernAPIPlugin
         comhand.getCommandContexts().registerContext(OfflineFPlayer.class, new UniversalContextResolvers.SingularIFPlayerContextResolver());
         comhand.getCommandContexts().registerContext(IFPlayer[].class, new UniversalContextResolvers.OnlineIFPlayerArrayCommandResolver());
 
-        HikariDatabaseHandler.registerSQLDriver(HikariSQLDriver.MARIADB_DRIVER);
-        HikariDatabaseHandler.registerSQLDriver(HikariSQLDriver.MYSQL_DRIVER);
+
 //        comhand.getCommandCompletions().registerAsyncCompletion("fernPlayers", context ->
 //                mi.getPlayers().parallelStream()
 //                        .filter(player -> !context.getIssuer().isPlayer() ||
@@ -128,9 +124,9 @@ protected static void checkNull() {
 
 
 
-    public static void debug(String message) {
+    public static void debug(String message, Object... params) {
         if(debug) {
-            getMethods().getAbstractLogger().info("[DEBUG] " + message);
+            getMethods().getAbstractLogger().info("[DEBUG] " + message, params);
         }
     }
 
@@ -149,11 +145,6 @@ public static IPMessageHandler getMessageHandler() {
         return mh;
     }
 
-    public static HikariDatabaseHandler getDatabaseHandler() {
-        checkNull();
-        return databaseHandler;
-    }
-
     public static NetworkHandler<? extends Object> getNetworkHandler() {
         checkNull();
         return nh;
@@ -174,10 +165,9 @@ public static FernAPIPlugin getPlugin() {
         return plugin;
     }
 
+
     public void onDisable() {
-        new Thread(() -> {
-            getDatabaseHandler().stopSchedule();
-            getDatabaseHandler().closeConnection();
-        }).start();
+        new Thread(DB::close).start();
+        new Thread(AikarFernDatabase::shutdownDatabases).start();
     }
 }

build.gradle

@@ -1,53 +1,135 @@
 package com.github.fernthedev.fernapi.universal.data.database;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.Setter;
-import lombok.ToString;
+import com.google.errorprone.annotations.Immutable;
+import lombok.*;
+import org.panteleyev.mysqlapi.annotations.Column;
+import org.panteleyev.mysqlapi.annotations.PrimaryKey;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+
+import static org.panteleyev.mysqlapi.DataTypes.*;
 
 /**
- * The column is a piece of data.
+ * The column is a piece of data. Immutable
  */
 @ToString
-public class ColumnData {
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@Immutable
+public class ColumnData implements Serializable {
 
     @Getter
     @NonNull
-    private String columnName;
+    private final String columnName;
 
     /**
      * Will return null if it is SQL NULL
      */
     @Getter
-    private String value;
+    @Nullable
+    private final String value;
 
     @Getter
-    @Setter
-    private String type;
+    private final String type;
 
     @Getter
-    private int length = -1;
+    private final int length;
 
     @Getter
-    @Setter
-    private boolean nullable = true;
+    private final boolean nullable;
 
     @Getter
-    @Setter
-    private boolean autoIncrement;
+    private final boolean autoIncrement;
 
     @Getter
-    @Setter
-    private boolean primaryKey;
+    private final boolean primaryKey;
+
+
+    public static ColumnData fromField(Field field, String value) throws IllegalAccessException {
+        if (!field.isAnnotationPresent(Column.class))
+            throw new IllegalArgumentException("Field " + field.toString() + " does not contain " + Column.class.toString() + " annotation");
+
+        Column column = field.getAnnotation(Column.class);
+
+        String columnName = column.value();
+        Class<?> type = field.getType();
+        String mySQLType;
+
+        int length = column.length();
+
+        boolean nullable = column.nullable();
+        boolean primaryKey = field.isAnnotationPresent(PrimaryKey.class);
+        boolean autoIncrement = primaryKey && field.getAnnotation(PrimaryKey.class).isAutoIncrement();
+
+        String typeName = type.isEnum() ?
+                TYPE_ENUM : type.getTypeName();
+
+        // Code snatched from Petr Panteleyev's MySQL annotation API
+        switch (typeName) {
+
+
+            case TYPE_STRING:
+                mySQLType = stringSQL(column);
+                break;
+            case TYPE_ENUM:
+                mySQLType = "VARCHAR("
+                        + column.length()
+                        + ")";
+                break;
+            case TYPE_BOOL:
+            case TYPE_BOOLEAN:
+                mySQLType = "BOOLEAN";
+                break;
+            case TYPE_INTEGER:
+            case TYPE_INT:
+                mySQLType = "INTEGER";
+                break;
+            case TYPE_LONG:
+            case TYPE_LONG_PRIM:
+            case TYPE_DATE:
+            case TYPE_LOCAL_DATE:
+                mySQLType = "BIGINT";
+                break;
+            case TYPE_BIG_DECIMAL:
+                mySQLType = "DECIMAL(" +
+                        column.precision() +
+                        "," +
+                        column.scale() +
+                        ")";
+                break;
+            case TYPE_BYTE_ARRAY:
+                mySQLType = "VARBINARY(" +
+                        column.length() +
+                        ")";
+                break;
+            case TYPE_UUID:
+                if (column.storeUuidAsBinary()) {
+                    mySQLType = "BINARY(16)";
+                } else {
+                    mySQLType = "VARCHAR(36)";
+                }
+                break;
+            default:
+                if (!MySQLData.hasEncoder(type))
+                    throw new IllegalStateException(BAD_FIELD_TYPE + typeName + "Register to " + MySQLData.class.getName() + ".registerEncoder()");
+                else
+                    mySQLType = stringSQL(column);
+        }
+
 
-    public ColumnData(@NonNull String columnName, String value) {
-        this.columnName = columnName;
-        this.value = value;
+        return new ColumnData(columnName, value, mySQLType, length, nullable, autoIncrement, primaryKey);
     }
 
-    public ColumnData(@NonNull String columnName, String value, int length) {
-        this(columnName,value);
-        this.length = length;
+    private static String stringSQL(Column column) {
+        if (column.isJson()) {
+            return "JSON";
+        } else {
+            return "VARCHAR("
+                    + column.length()
+                    + ")";
+        }
     }
 
 }

core/build.gradle

@@ -1,7 +1,6 @@
 package com.github.fernthedev.fernapi.universal.data.database;
 
 import com.github.fernthedev.fernapi.universal.mysql.AbstractSQLDriver;
-import com.github.fernthedev.fernapi.universal.mysql.HikariDatabaseHandler;
 import com.github.fernthedev.fernapi.universal.mysql.HikariSQLDriver;
 import lombok.*;
 
@@ -26,18 +25,6 @@ public class DatabaseAuthInfo {
     @NonNull
     protected String database;
 
-    @Setter
-    protected boolean cachePrepStmts = true;
-
-    @Setter
-    protected int prepStmtCacheSize = 250;
-
-    @Setter
-    protected int prepStmtCacheSqlLimit = 2048;
-
-    @Setter
-    protected boolean useServerPrepStmts = true;
-
     /**
      * Set if necessary
      */
@@ -57,23 +44,5 @@ public DatabaseAuthInfo(@NonNull String username, @NonNull String password, @Non
     private DatabaseAuthInfo() {}
 
 
-    public String getUrlToDB() {
-        AbstractSQLDriver sqlDriver = HikariDatabaseHandler.getSqlDriver(mysqlDriver);
-        if (sqlDriver == null) throw new IllegalStateException("Sql Driver " + mysqlDriver + " could not be found");
-
-        String jdbcUrl = sqlDriver.getJdbcUrl();
-
-        if (jdbcUrl == null) throw new IllegalStateException("JDBC Url for " + sqlDriver.getSqlIdentifierName() + " cannot be found");
-
-//        Universal.debug("This DB:" + toString());
-
-        return jdbcUrl
-                .replace("%host%", urlHost)
-                .replace("%port%", port)
-                .replace("%database%", database)
-                .replace("%sql%", sqlDriver.getSqlName());
-    }
-
-
 
 }