diff --git a/pom.xml b/pom.xml index a258e34..8765da4 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,12 @@ paper-api 1.20.1-R0.1-SNAPSHOT provided + + + com.google.code.gson + gson + + com.comphenix.protocol @@ -149,6 +155,7 @@ org.mariadb.jdbc:* redis.clients:* org.apache.commons:commons-pool2 + com.google.code.gson:gson @@ -184,6 +191,10 @@ org.apache.commons.pool2 net.artelnatif.libs.pool2 + + com.google.code.gson + net.artelnatif.libs.gson + false diff --git a/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java b/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java index 0bb9852..7e62a1f 100644 --- a/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java +++ b/src/main/java/xyz/atnrch/nicko/config/SQLDataSourceConfiguration.java @@ -3,6 +3,8 @@ package xyz.atnrch.nicko.config; public class SQLDataSourceConfiguration extends DataSourceConfiguration { private final boolean mariadb; + public SQLDataSourceConfiguration() { this(false, "", 0, "", "", true); } + public SQLDataSourceConfiguration(boolean enabled, String address, Integer port, String username, String password, boolean mariadb) { super(enabled, address, port, username, password); this.mariadb = mariadb; diff --git a/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java index 72b2a7f..a0562e1 100644 --- a/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/NickoPluginTest.java @@ -1,10 +1,12 @@ package xyz.atnrch.nicko.test; import be.seeseemelk.mockbukkit.MockBukkit; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import xyz.atnrch.nicko.NickoBukkit; import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; -import org.junit.jupiter.api.*; import xyz.atnrch.nicko.config.DefaultDataSources; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -15,7 +17,7 @@ public class NickoPluginTest { @BeforeAll public static void setup() { final Configuration config = new Configuration( - new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345"), + DefaultDataSources.MARIADB_EMPTY, DefaultDataSources.REDIS_EMPTY, "", false); diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java index 133067c..13d2195 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java @@ -3,13 +3,16 @@ package xyz.atnrch.nicko.test.storage; import be.seeseemelk.mockbukkit.MockBukkit; import be.seeseemelk.mockbukkit.ServerMock; import be.seeseemelk.mockbukkit.entity.PlayerMock; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import xyz.atnrch.nicko.NickoBukkit; -import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.atnrch.nicko.appearance.ActionResult; +import xyz.atnrch.nicko.config.Configuration; import xyz.atnrch.nicko.config.DefaultDataSources; +import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; import xyz.atnrch.nicko.profile.NickoProfile; -import org.junit.jupiter.api.*; import java.util.Optional; @@ -23,7 +26,7 @@ public class BrokenSQLTest { @BeforeAll public static void setup() { final Configuration config = new Configuration( - new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", ""), + new SQLDataSourceConfiguration(true, "127.0.0.1", 3306, "root", "", true), DefaultDataSources.REDIS_EMPTY, "", false); diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java index abccf52..9defabb 100644 --- a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java +++ b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.*; import xyz.atnrch.nicko.NickoBukkit; import xyz.atnrch.nicko.appearance.ActionResult; import xyz.atnrch.nicko.config.Configuration; -import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.atnrch.nicko.config.DefaultDataSources; +import xyz.atnrch.nicko.config.SQLDataSourceConfiguration; import xyz.atnrch.nicko.i18n.Locale; import xyz.atnrch.nicko.profile.NickoProfile; import xyz.atnrch.nicko.storage.PlayerDataStore; @@ -24,7 +24,7 @@ public class SQLStorageTest { @BeforeAll public static void setup() { final Configuration config = new Configuration( - new DataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345"), + new SQLDataSourceConfiguration(true, "127.0.0.1", 3306, "root", "12345", true), DefaultDataSources.REDIS_EMPTY, "", false);