diff --git a/src/main/java/org/maxgamer/quickshop/File/IFile.java b/src/main/java/org/maxgamer/quickshop/File/IFile.java index b2e429952..259ceb1f8 100644 --- a/src/main/java/org/maxgamer/quickshop/File/IFile.java +++ b/src/main/java/org/maxgamer/quickshop/File/IFile.java @@ -5,6 +5,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.maxgamer.quickshop.Mock.MckFileConfiguration; import java.io.InputStream; import java.util.List; diff --git a/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/JSONConfiguration.java b/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/JSONConfiguration.java index 00c8e33f2..775e849fa 100644 --- a/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/JSONConfiguration.java +++ b/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/JSONConfiguration.java @@ -9,7 +9,6 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.jetbrains.annotations.NotNull; -import org.maxgamer.quickshop.Util.SerializationHelper; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/org/maxgamer/quickshop/Util/SerializationHelper.java b/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/SerializationHelper.java similarity index 97% rename from src/main/java/org/maxgamer/quickshop/Util/SerializationHelper.java rename to src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/SerializationHelper.java index 27fc862ad..780533410 100644 --- a/src/main/java/org/maxgamer/quickshop/Util/SerializationHelper.java +++ b/src/main/java/org/maxgamer/quickshop/NonQuickShopStuffs/com/dumbtruckman/JsonConfiguration/SerializationHelper.java @@ -17,13 +17,12 @@ * along with this program. If not, see . */ -package org.maxgamer.quickshop.Util; +package org.maxgamer.quickshop.NonQuickShopStuffs.com.dumbtruckman.JsonConfiguration; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.jetbrains.annotations.NotNull; -import org.maxgamer.quickshop.NonQuickShopStuffs.com.dumbtruckman.JsonConfiguration.SerializableSet; import org.yaml.snakeyaml.error.YAMLException; import java.util.*; @@ -121,6 +120,8 @@ public class SerializationHelper { * Called recursively first on Maps and Lists before passing the parsed input over to * {@link ConfigurationSerialization#deserializeObject(java.util.Map)}. Basically this means it will deserialize * the most nested objects FIRST and the top level object LAST. + * @param input the input + * @return the object that deserialize */ public static Object deserialize(@NotNull final Map input) { final Map output = new LinkedHashMap(input.size()); diff --git a/src/test/java/org/maxgamer/quickshop/File/FileEnvelopeTest.java b/src/test/java/org/maxgamer/quickshop/File/FileEnvelopeTest.java index bc321e6ca..8a8b08a28 100644 --- a/src/test/java/org/maxgamer/quickshop/File/FileEnvelopeTest.java +++ b/src/test/java/org/maxgamer/quickshop/File/FileEnvelopeTest.java @@ -1,11 +1,6 @@ package org.maxgamer.quickshop.File; import be.seeseemelk.mockbukkit.MockBukkit; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.inventory.ItemStack; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,7 +11,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class FileEnvelopeTest {