Revert bad API call changes

Author: MrApik

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>ForestRedisAPI</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/cz/foresttech/forestredis/bungee/ForestRedisBungee.java

@@ -14,22 +14,21 @@
 public class ForestRedisBungee extends Plugin implements IForestRedisPlugin {
 
     private static ForestRedisBungee instance;
-    private static RedisManager redisManager;
 
     @Override
     public void onEnable() {
         instance = this;
-        redisManager = load(null);
+        load();
         ProxyServer.getInstance().getPluginManager().registerCommand(this, new BungeeForestRedisCommand());
     }
 
     @Override
     public void onDisable() {
         // Close the RedisManager
-        if (redisManager == null) {
+        if (RedisManager.getAPI() == null) {
             return;
         }
-        redisManager.close();
+        RedisManager.getAPI().close();
     }
 
     @Override
@@ -54,16 +53,6 @@ public IConfigurationAdapter getConfigAdapter() {
         return bungeeConfigAdapter;
     }
 
-    /**
-     * Gets the singleton instance of {@link RedisManager} object. This is the only
-     * recommended approach to access the API methods.
-     *
-     * @return Singleton instance of {@link RedisManager}
-     */
-    public static RedisManager getAPI() {
-        return redisManager;
-    }
-
     public static ForestRedisBungee getInstance() {
         return instance;
     }

src/main/java/cz/foresttech/forestredis/bungee/commands/BungeeForestRedisCommand.java

@@ -26,7 +26,7 @@ public void execute(CommandSender commandSender, String[] args) {
         }
 
         if (args[0].equalsIgnoreCase("reload")) {
-            ForestRedisBungee.getInstance().load(ForestRedisBungee.getAPI());
+            ForestRedisBungee.getInstance().load();
             commandSender.sendMessage("§2[ForestRedisAPI] §7ForestRedis successfully reloaded!");
             return;
         }

src/main/java/cz/foresttech/forestredis/bungee/events/RedisMessageReceivedEvent.java

@@ -1,6 +1,5 @@
 package cz.foresttech.forestredis.bungee.events;
 
-import cz.foresttech.forestredis.bungee.ForestRedisBungee;
 import cz.foresttech.forestredis.shared.events.IRedisMessageReceivedEvent;
 import cz.foresttech.forestredis.shared.models.MessageTransferObject;
 import cz.foresttech.forestredis.shared.RedisManager;
@@ -23,7 +22,7 @@ public String getSenderIdentifier() {
 
     @Override
     public boolean isSelfSender() {
-        return this.messageTransferObject.getSenderIdentifier().equals(ForestRedisBungee.getAPI().getServerIdentifier());
+        return this.messageTransferObject.getSenderIdentifier().equals(RedisManager.getAPI().getServerIdentifier());
     }
 
     @Override

src/main/java/cz/foresttech/forestredis/shared/IForestRedisPlugin.java

@@ -46,15 +46,15 @@ public interface IForestRedisPlugin {
     /**
      * Loading RedisManager from config method
      */
-    default RedisManager load(RedisManager redisManager) {
-        if (redisManager != null) {
-            redisManager.close();
+    default void load() {
+        if (RedisManager.getAPI() != null) {
+            RedisManager.getAPI().close();
         }
 
         // Load the configuration file
         IConfigurationAdapter configAdapter = this.getConfigAdapter();
         if (!configAdapter.isSetup()) {
-            return null;
+            return;
         }
 
         this.logger().info("config.yml loaded successfully!");
@@ -76,17 +76,16 @@ default RedisManager load(RedisManager redisManager) {
         );
 
         // Initialize RedisManager object
-        redisManager = new RedisManager(this, serverIdentifier, redisConfiguration);
+        new RedisManager(this, serverIdentifier, redisConfiguration);
 
         // Setup the RedisManager
         List<String> channels = configAdapter.getStringList("channels");
         if (channels.isEmpty()) {
-            redisManager.setup();
-            return redisManager;
+            RedisManager.getAPI().setup();
+            return;
         }
 
         String[] channelsArray = channels.toArray(new String[0]);
-        redisManager.setup(channelsArray);
-        return redisManager;
+        RedisManager.getAPI().setup(channelsArray);
     }
 }

src/main/java/cz/foresttech/forestredis/shared/RedisManager.java

@@ -366,4 +366,16 @@ public void onMessage(String channel, String message) {
     }
 
     /*----------------------------------------------------------------------------------------------------------*/
+
+    /**
+     * Gets the singleton instance of {@link RedisManager} object. This is the only
+     * recommended approach to access the API methods.
+     *
+     * @return Singleton instance of {@link RedisManager}
+     */
+    public static RedisManager getAPI() {
+        return api;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------*/
 }

src/main/java/cz/foresttech/forestredis/spigot/ForestRedisSpigot.java

@@ -15,21 +15,20 @@
 public class ForestRedisSpigot extends JavaPlugin implements IForestRedisPlugin {
 
     private static ForestRedisSpigot instance;
-    private static RedisManager redisManager;
 
     @Override
     public void onEnable() {
         instance = this;
-        redisManager = load(null);
+        load();
         this.getCommand("forestredis").setExecutor(new SpigotForestRedisCommand());
     }
 
     @Override
     public void onDisable() {
-        if (redisManager == null) {
+        if (RedisManager.getAPI() == null) {
             return;
         }
-        redisManager.close();
+        RedisManager.getAPI().close();
     }
 
     @Override
@@ -55,16 +54,6 @@ public IConfigurationAdapter getConfigAdapter() {
         return spigotConfigAdapter;
     }
 
-    /**
-     * Gets the singleton instance of {@link RedisManager} object. This is the only
-     * recommended approach to access the API methods.
-     *
-     * @return Singleton instance of {@link RedisManager}
-     */
-    public static RedisManager getAPI() {
-        return redisManager;
-    }
-
     public static ForestRedisSpigot getInstance() {
         return instance;
     }

src/main/java/cz/foresttech/forestredis/spigot/commands/SpigotForestRedisCommand.java

@@ -23,7 +23,7 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
         }
 
         if (args[0].equalsIgnoreCase("reload")) {
-            ForestRedisSpigot.getInstance().load(ForestRedisSpigot.getAPI());
+            ForestRedisSpigot.getInstance().load();
             commandSender.sendMessage("§2[ForestRedisAPI] §7ForestRedis successfully reloaded!");
             return true;
         }

src/main/java/cz/foresttech/forestredis/spigot/events/AsyncRedisMessageReceivedEvent.java

@@ -3,7 +3,6 @@
 import cz.foresttech.forestredis.shared.events.IRedisMessageReceivedEvent;
 import cz.foresttech.forestredis.shared.models.MessageTransferObject;
 import cz.foresttech.forestredis.shared.RedisManager;
-import cz.foresttech.forestredis.spigot.ForestRedisSpigot;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -42,7 +41,7 @@ public <T> T getMessageObject(Class<T> objectClass) {
 
     @Override
     public boolean isSelfSender() {
-        return this.messageTransferObject.getSenderIdentifier().equals(ForestRedisSpigot.getAPI().getServerIdentifier());
+        return this.messageTransferObject.getSenderIdentifier().equals(RedisManager.getAPI().getServerIdentifier());
     }
 
     @Override

src/main/java/cz/foresttech/forestredis/spigot/events/RedisMessageReceivedEvent.java

@@ -3,7 +3,6 @@
 import cz.foresttech.forestredis.shared.events.IRedisMessageReceivedEvent;
 import cz.foresttech.forestredis.shared.models.MessageTransferObject;
 import cz.foresttech.forestredis.shared.RedisManager;
-import cz.foresttech.forestredis.spigot.ForestRedisSpigot;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -41,7 +40,7 @@ public <T> T getMessageObject(Class<T> objectClass) {
 
     @Override
     public boolean isSelfSender() {
-        return this.messageTransferObject.getSenderIdentifier().equals(ForestRedisSpigot.getAPI().getServerIdentifier());
+        return this.messageTransferObject.getSenderIdentifier().equals(RedisManager.getAPI().getServerIdentifier());
     }
 
     @Override