2.2.0-SNAPSHOT

Author: hteppl

README.md

@@ -3,27 +3,17 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![jitpack](https://jitpack.io/v/hteppl/DataManager.svg)](https://jitpack.io/#hteppl/DataManager)
 
-DataManager is a simple library plugin for Nukkit Minecraft Bedrock core (and forks), that will help you to create and
+DataManager is a simple library plugin for [PowerNukkitX](https://github.com/PowerNukkitX/PowerNukkitX) Minecraft
+Bedrock core, that will help you to create and
 manage your SQL connections with ease.
 
-## Libraries
-
-[**Nukkit**](https://github.com/CloudburstMC/Nukkit) is nuclear-powered server software for Minecraft: Pocket Edition
-(you can also use PowerNukkit or PowerNukkitX).
-
-[**Sql2o**](https://github.com/aaberg/sql2o) is small useful framework that makes coding for database easy.
-
-[**HikariCP**](https://github.com/brettwooldridge/HikariCP) is a "zero-overhead" production ready JDBC connection pool.
-At roughly 130Kb, the library is very light.
-
-## Performance of SELECT
+## Build JAR File
 
-Execute 1000 SELECT statements against a DB and map the data returned to a POJO.
-
-| Method                                   | Duration          |
-|------------------------------------------|-------------------|
-| Hand coded <code>ResultSet</code>        | 15ms              |
-| [Sql2o](https://github.com/aaberg/sql2o) | 24ms (60% slower) |
+```shell
+$ git clone https://github.com/hteppl/DataManager
+$ cd DataManager
+$ mvn clean package
+```
 
 ## How to install
 
@@ -45,7 +35,7 @@ enough. Also, you can configure some default database settings in `config.yml`.
 <dependency>
     <groupId>com.github.hteppl</groupId>
     <artifactId>DataManager</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -61,7 +51,7 @@ allprojects {
 
 ```groovy
 dependencies {
-    implementation 'com.github.hteppl:DataManager:2.1.0-SNAPSHOT'
+    implementation 'com.github.hteppl:DataManager:2.2.0-SNAPSHOT'
 }
 ```
 
@@ -70,102 +60,106 @@ dependencies {
 Default plugin `config.yml` settings.
 
 ```yaml
-# sqlite path settings for method SQLiteDatabase(String database)
-sqlite:
-  # use global folder for saving sqlite tables (near plugins, worlds, etc.) or plugin folder
-  global: true
-  # name for folder if "global" is set to true
-  folder-name: "database"
-
-# mysql settings
-mysql:
-  # default mysql connection properties
-  properties: "useSSL=false&autoReconnect=true&useUnicode=true&serverTimezone=UTC"
-  # Hikari connection pool settings (https://github.com/brettwooldridge/HikariCP)
-  hikari:
-    auto-commit: true
-    connection-timeout: 30000
-    idle-timeout: 600000
-    keepalive-time: 0
-    max-lifetime: 1800000
-    maximum-pool-size: 10
+# sqlite directory name for anonymous databases
+# set empty, for creating database file in plugin's folder by default
+sqlite-directory: "database"
+
+# default mysql connection properties
+mysql-properties: "useSSL=false&autoReconnect=true&useUnicode=true&serverTimezone=UTC"
+
+# Hikari connection pool settings (https://github.com/brettwooldridge/HikariCP)
+hikari:
+  auto-commit: true
+  connection-timeout: 30000
+  idle-timeout: 600000
+  keepalive-time: 0
+  max-lifetime: 1800000
+  maximum-pool-size: 10
 ```
 
 ## How to use
 
 Firstly we recommend to read:
 
-- [*Sql2o Documentation*](https://github.com/aaberg/sql2o/wiki)
+- [*Jdbi Developer Guide*](http://jdbi.org/)
 - [*HikariCP Configuration*](https://github.com/brettwooldridge/HikariCP#gear-configuration-knobs-baby)
 
-Here is very basic example of your MySQL database class:
+Very basic example of MySQL database class:
 
 ```java
 import me.hteppl.data.database.MySQLDatabase;
-import org.sql2o.Connection;
+import org.jdbi.v3.core.Handle;
 
 public class MyDatabase extends MySQLDatabase {
 
     public MyDatabase() {
         super("host", "database", "user", "password");
-        // also you can execute your db scheme with
-        this.executeScheme("CREATE TABLE IF NOT EXISTS ...");
-
-        // or use openConnection() method
-        try (Connection connection = this.openConnection()) {
-            connection.createQuery("SELECT ...").executeUpdate();
-        }
 
-        // if you need disable auto commit, use beginTransaction() method
-        try (Connection connection = this.beginTransaction()) {
-            connection.createQuery("SELECT ...").executeUpdate();
+        try (Handle handle = this.getHandle()) {
+            handle.createUpdate("...")
+                    .bind("var1", "data1")
+                    .bind("var2", "data2")
+                    .execute();
         }
     }
 }
 ```
 
-or SQLite database class:
+Example of SQLite database class:
 
 ```java
 import me.hteppl.data.database.SQLiteDatabase;
-import org.sql2o.Connection;
+import org.jdbi.v3.core.Handle;
 
 public class MyDatabase extends SQLiteDatabase {
 
     public MyDatabase() {
         super("database");
-        // also you can execute your db scheme with
-        this.executeScheme("CREATE TABLE IF NOT EXISTS ...");
-
-        // or use openConnection() method
-        try (Connection connection = this.openConnection()) {
-            connection.createQuery("SELECT ...").executeUpdate();
-        }
 
-        // if you need disable auto commit, use beginTransaction() method
-        try (Connection connection = this.beginTransaction()) {
-            connection.createQuery("SELECT ...").executeUpdate();
+        try (Handle handle = this.getHandle()) {
+            handle.createUpdate("...")
+                    .bind("var1", "data1")
+                    .bind("var2", "data2")
+                    .execute();
         }
     }
 }
 ```
 
-After that, you can easily do what you want with your [*Sql2o*](https://www.sql2o.org) connections:
+After that, you can easily do what you want with your [*Jdbi*](http://jdbi.org/) handles:
 
 ```java
 /* import your database class */
 
 public class Main {
 
     public static void main(String[] args) {
-        MyDatabase db = new MyDatabase();
+        MyDatabase database = new MyDatabase();
 
-        try (Connection connection = db.openConnection()) {
-            connection.createQuery("SELECT ...");
+        try (Handle handle = database.getHandle()) {
+            handle.createUpdate("...")
+                    .bind("var1", "data1")
+                    .bind("var2", "data2")
+                    .execute();
         }
-
-        // also you can execute your db scheme with
-        db.executeScheme("CREATE TABLE IF NOT EXISTS ...");
     }
 }
-```
+```
+
+## Libraries
+
+[**PowerNukkitX**](https://github.com/PowerNukkitX/PowerNukkitX) is a branch version based on PowerNukkit,
+developed and maintained by PowerNukkitX.
+
+[**MariaDB Connector**](https://github.com/mariadb-corporation/mariadb-connector-j) MariaDB Connector/J is a Type 4 JDBC
+driver. It was developed specifically as a lightweight JDBC connector for use with MariaDB and MySQL database servers.
+
+[**Jdbi**](https://github.com/jdbi/jdbi) The Jdbi library provides convenient, idiomatic access to relational databases
+in Java.
+
+[**HikariCP**](https://github.com/brettwooldridge/HikariCP) is a "zero-overhead" production ready JDBC connection pool.
+At roughly 130Kb, the library is very light.
+
+## License
+
+This project is licensed under the [MIT License](https://opensource.org/licenses/MIT)

pom.xml

@@ -6,15 +6,28 @@
 
     <groupId>me.hteppl</groupId>
     <artifactId>DataManager</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
+    <developers>
+        <developer>
+            <id>hteppl</id>
+            <name>Oleg Kraev</name>
+            <url>https://github.com/hteppl</url>
+        </developer>
+        <developer>
+            <id>IWareQ</id>
+            <name>Dmitry Luk</name>
+            <url>https://github.com/IWareQ</url>
+        </developer>
+    </developers>
+
     <build>
         <resources>
             <resource>
@@ -35,10 +48,14 @@
         </resources>
         <defaultGoal>clean package</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -47,7 +64,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>
@@ -57,54 +74,54 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>opencollab-repo-snapshot</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
-        </repository>
-        <repository>
-            <id>nukkitx</id>
-            <url>https://repo.nukkitx.com/main/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
-            <groupId>cn.nukkit</groupId>
-            <artifactId>nukkit</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>cn.powernukkitx</groupId>
+            <artifactId>powernukkitx</artifactId>
+            <version>1.20.10-r1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.sql2o</groupId>
-            <artifactId>sql2o</artifactId>
-            <version>1.6.0</version>
+            <groupId>org.jdbi</groupId>
+            <artifactId>jdbi3-core</artifactId>
+            <version>3.41.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>4.0.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.32</version>
-        </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.40.1.0</version>
+            <version>3.43.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

src/main/java/me/hteppl/data/DataManager.java

@@ -6,15 +6,12 @@
 
 public class DataManager extends PluginBase {
 
-    @Getter
-    private static DataManager instance;
     @Getter
     private static Settings settings;
 
     @Override
     public void onEnable() {
         this.saveDefaultConfig();
-        instance = this;
-        settings = new Settings(this.getConfig());
+        settings = new Settings(this.getConfig(), this.getDataFolder().getPath());
     }
 }