Split providers into classes

jamezrin · jamezrin · commit e96640f54c14 · 2017-10-07T13:45:01.000+02:00
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/ProviderType.java b/src/main/java/com/jaimemartz/playerbalancer/connection/ProviderType.java
@@ -1,8 +1,11 @@
 package com.jaimemartz.playerbalancer.connection;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.connection.provider.types.*;
 import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.props.features.BalancerProps;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
@@ -12,97 +15,65 @@
 
 public enum ProviderType {
     NONE {
+        NullProvider provider = new NullProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            return null;
+            return provider.requestTarget(plugin, section, servers, player);
         }
     },
 
     RANDOM {
+        RandomProvider provider = new RandomProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            return ProviderType.getRandom(servers);
+            return provider.requestTarget(plugin, section, servers, player);
         }
     },
 
     LOWEST {
+        LowestProvider provider = new LowestProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            int min = Integer.MAX_VALUE;
-            ServerInfo target = null;
-
-            for (ServerInfo server : servers) {
-                int count = plugin.getNetworkManager().getPlayers(server);
-
-                if (count < min) {
-                    min = count;
-                    target = server;
-                }
-            }
-
-            return target;
+            return provider.requestTarget(plugin, section, servers, player);
         }
     },
 
     BALANCED {
+        BalancedProvider provider = new BalancedProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            List<ServerInfo> results = new ArrayList<>();
-            int min = Integer.MAX_VALUE;
-
-            for (ServerInfo server : servers) {
-                int count = plugin.getNetworkManager().getPlayers(server);
-
-                if (count <= min) {
-                    if (count < min) {
-                        min = count;
-                        results.clear();
-                    }
-                    results.add(server);
-                }
-            }
-
-            return ProviderType.getRandom(results);
+            return provider.requestTarget(plugin, section, servers, player);
         }
     },
 
     PROGRESSIVE {
+        ProgressiveProvider provider = new ProgressiveProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            for (ServerInfo server : servers) {
-                ServerStatus status = plugin.getStatusManager().getStatus(server);
-                if (plugin.getNetworkManager().getPlayers(server) < status.getMaximum()) {
-                    return server;
-                }
-            }
-
-            return ProviderType.getRandom(servers);
+            return provider.requestTarget(plugin, section, servers, player);
         }
     },
 
     FILLER {
+        FillerProvider provider = new FillerProvider();
+
         @Override
         public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
-            int max = Integer.MIN_VALUE;
-            ServerInfo target = null;
-
-            for (ServerInfo server : servers) {
-                ServerStatus status = plugin.getStatusManager().getStatus(server);
-                int count = plugin.getNetworkManager().getPlayers(server);
-
-                if (count > max && count <= status.getMaximum()) {
-                    max = count;
-                    target = server;
-                }
-            }
+            return provider.requestTarget(plugin, section, servers, player);
+        }
+    },
 
-            return target;
+    EXTERNAL {
+        @Override
+        public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+            return section.getExternalProvider().requestTarget(plugin, section, servers, player);
         }
     };
 
     public abstract ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player);
-
-    private static ServerInfo getRandom(List<ServerInfo> list) {
-        return list.get(ThreadLocalRandom.current().nextInt(list.size()));
-    }
 }
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/ServerAssignRegistry.java b/src/main/java/com/jaimemartz/playerbalancer/connection/ServerAssignRegistry.java
@@ -8,6 +8,7 @@
 
 import java.util.Map;
 
+//todo improve this
 public class ServerAssignRegistry {
     private static final Table<ProxiedPlayer, ServerSection, ServerInfo> table = HashBasedTable.create();
 
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/AbstractProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/AbstractProvider.java
@@ -0,0 +1,17 @@
+package com.jaimemartz.playerbalancer.connection.provider;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+
+public abstract class AbstractProvider {
+    public abstract ServerInfo requestTarget(
+            PlayerBalancer plugin,
+            ServerSection section,
+            List<ServerInfo> servers,
+            ProxiedPlayer player
+    );
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/BalancedProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/BalancedProvider.java
@@ -0,0 +1,33 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class BalancedProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        List<ServerInfo> results = new ArrayList<>();
+        int min = Integer.MAX_VALUE;
+
+        for (ServerInfo server : servers) {
+            int count = plugin.getNetworkManager().getPlayers(server);
+
+            if (count <= min) {
+                if (count < min) {
+                    min = count;
+                    results.clear();
+                }
+                results.add(server);
+            }
+        }
+
+        return results.get(ThreadLocalRandom.current().nextInt(results.size()));
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/FillerProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/FillerProvider.java
@@ -0,0 +1,30 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.ping.ServerStatus;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+
+public class FillerProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        int max = Integer.MIN_VALUE;
+        ServerInfo target = null;
+
+        for (ServerInfo server : servers) {
+            ServerStatus status = plugin.getStatusManager().getStatus(server);
+            int count = plugin.getNetworkManager().getPlayers(server);
+
+            if (count > max && count <= status.getMaximum()) {
+                max = count;
+                target = server;
+            }
+        }
+
+        return target;
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/LowestProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/LowestProvider.java
@@ -0,0 +1,28 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+
+public class LowestProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        int min = Integer.MAX_VALUE;
+        ServerInfo target = null;
+
+        for (ServerInfo server : servers) {
+            int count = plugin.getNetworkManager().getPlayers(server);
+
+            if (count < min) {
+                min = count;
+                target = server;
+            }
+        }
+
+        return target;
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/NullProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/NullProvider.java
@@ -0,0 +1,16 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+
+public class NullProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        return null;
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/ProgressiveProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/ProgressiveProvider.java
@@ -0,0 +1,26 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.ProviderType;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.ping.ServerStatus;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class ProgressiveProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        for (ServerInfo server : servers) {
+            ServerStatus status = plugin.getStatusManager().getStatus(server);
+            if (plugin.getNetworkManager().getPlayers(server) < status.getMaximum()) {
+                return server;
+            }
+        }
+
+        return servers.get(ThreadLocalRandom.current().nextInt(servers.size()));
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/RandomProvider.java b/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/RandomProvider.java
@@ -0,0 +1,17 @@
+package com.jaimemartz.playerbalancer.connection.provider.types;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class RandomProvider extends AbstractProvider {
+    @Override
+    public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
+        return servers.get(ThreadLocalRandom.current().nextInt(servers.size()));
+    }
+}
diff --git a/src/main/java/com/jaimemartz/playerbalancer/manager/PasteHelper.java b/src/main/java/com/jaimemartz/playerbalancer/manager/PasteHelper.java
@@ -15,17 +15,18 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.function.BiConsumer;
+import java.util.function.Supplier;
 
 public enum PasteHelper {
-    PLUGIN((sender, url) -> {
+    PLUGIN((sender, address) -> {
         if (sender instanceof ProxiedPlayer) {
             sender.sendMessage(new ComponentBuilder("Click me for the PlayerBalancer configuration")
-                    .event(new ClickEvent(ClickEvent.Action.OPEN_URL, url.toString()))
+                    .event(new ClickEvent(ClickEvent.Action.OPEN_URL, address.toString()))
                     .color(ChatColor.GREEN)
                     .create()
             );
         } else {
-            sender.sendMessage(new ComponentBuilder("PlayerBalancer configuration link: " + url.toString()).create());
+            sender.sendMessage(new ComponentBuilder("PlayerBalancer configuration link: " + address.toString()).create());
         }
     }) {
         @Override
@@ -52,15 +53,15 @@ public URL paste(PlayerBalancer plugin) throws Exception {
         }
     },
 
-    BUNGEE((sender, url) -> {
+    BUNGEE((sender, address) -> {
         if (sender instanceof ProxiedPlayer) {
             sender.sendMessage(new ComponentBuilder("Click me for the BungeeCord configuration")
-                    .event(new ClickEvent(ClickEvent.Action.OPEN_URL, url.toString()))
+                    .event(new ClickEvent(ClickEvent.Action.OPEN_URL, address.toString()))
                     .color(ChatColor.GREEN)
                     .create()
             );
         } else {
-            sender.sendMessage(new ComponentBuilder("BungeeCord configuration link: " + url.toString()).create());
+            sender.sendMessage(new ComponentBuilder("BungeeCord configuration link: " + address.toString()).create());
         }
     }) {
         @Override
diff --git a/src/main/java/com/jaimemartz/playerbalancer/manager/PlayerLocker.java b/src/main/java/com/jaimemartz/playerbalancer/manager/PlayerLocker.java
@@ -7,7 +7,7 @@
 import java.util.Set;
 import java.util.UUID;
 
-//TODO I don't like it, improve it
+//TODO improve this
 public class PlayerLocker {
     private static final Set<UUID> storage = Collections.synchronizedSet(new HashSet<UUID>());
 
diff --git a/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java b/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
diff --git a/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java b/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java
