Improve ConfigAdapter

Author: MrApik

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>ForestRedisAPI</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
@@ -89,11 +89,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.ForestTechMC</groupId>
-            <artifactId>ForestRedisAPI</artifactId>
-            <version>v${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

src/main/java/cz/foresttech/forestredis/bungee/config/BungeeConfigAdapter.java

@@ -15,6 +15,7 @@
 public class BungeeConfigAdapter implements IConfigurationAdapter {
 
     private String fileName;
+    private Configuration configuration;
 
     @Override
     public void setup(String fileName) {
@@ -33,45 +34,46 @@ public void setup(String fileName) {
                 ForestRedisBungee.getInstance().logger().warning("Cannot create config.yml! This proxy won't process any Redis communication!");
                 return;
             }
-            loadYamlFile();
+            loadConfiguration();
         }
-        loadYamlFile();
+        loadConfiguration();
     }
 
     @Override
     public boolean isSetup() {
-        return loadYamlFile() != null;
+        return configuration != null;
     }
 
-    public Configuration loadYamlFile() {
+    @Override
+    public void loadConfiguration() {
         try {
-            return ConfigurationProvider
+            configuration = ConfigurationProvider
                     .getProvider(YamlConfiguration.class)
                     .load(new File(ForestRedisBungee.getInstance().getDataFolder(), fileName + ".yml"));
         } catch (IOException e) {
             ForestRedisBungee.getInstance().logger().warning("Cannot load config.yml! This proxy won't process any Redis communication!");
-            return null;
+            configuration = null;
         }
     }
 
     @Override
     public String getString(String path, String def) {
-        return this.loadYamlFile().getString(path, def);
+        return this.configuration.getString(path, def);
     }
 
     @Override
     public int getInt(String path, int def) {
-        return this.loadYamlFile().getInt(path, def);
+        return this.configuration.getInt(path, def);
     }
 
     @Override
     public boolean getBoolean(String path, boolean def) {
-        return this.loadYamlFile().getBoolean(path, def);
+        return this.configuration.getBoolean(path, def);
     }
 
     @Override
     public List<String> getStringList(String path) {
-        return this.loadYamlFile().getStringList(path);
+        return this.configuration.getStringList(path);
     }
 
 }

src/main/java/cz/foresttech/forestredis/shared/config/IConfigurationAdapter.java

@@ -8,6 +8,8 @@ public interface IConfigurationAdapter {
 
     boolean isSetup();
 
+    void loadConfiguration();
+
     String getString(String path, String def);
 
     int getInt(String path, int def);

src/main/java/cz/foresttech/forestredis/spigot/config/SpigotConfigAdapter.java

@@ -1,6 +1,7 @@
 package cz.foresttech.forestredis.spigot.config;
 
 import com.google.common.base.Charsets;
+import cz.foresttech.forestredis.bungee.ForestRedisBungee;
 import cz.foresttech.forestredis.shared.config.IConfigurationAdapter;
 import cz.foresttech.forestredis.spigot.ForestRedisSpigot;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -32,19 +33,25 @@ public void setup(String fileName) {
         }
 
         configuration = YamlConfiguration.loadConfiguration(file);
-        reloadConfig();
+        loadConfiguration();
     }
 
     @Override
     public boolean isSetup() {
         return configuration != null;
     }
 
-    public void reloadConfig() {
-        configuration = YamlConfiguration.loadConfiguration(file);
-        InputStream defConfigStream = ForestRedisSpigot.getInstance().getResource(fileName + ".yml");
-        if (defConfigStream != null) {
-            configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(defConfigStream, Charsets.UTF_8)));
+    @Override
+    public void loadConfiguration() {
+        try {
+            configuration = YamlConfiguration.loadConfiguration(file);
+            InputStream defConfigStream = ForestRedisSpigot.getInstance().getResource(fileName + ".yml");
+            if (defConfigStream != null) {
+                configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(defConfigStream, Charsets.UTF_8)));
+            }
+        } catch (Exception ex) {
+            ForestRedisBungee.getInstance().logger().warning("Cannot load config.yml! This server won't process any Redis communication!");
+            configuration = null;
         }
     }