Add and implement handlers for each individual permissions plugin, instead of doing everything in the PermissionsManager - see #314

src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java

@@ -0,0 +1,69 @@
+package fr.xephi.authme.permission.handlers;
+
+import de.bananaco.bpermissions.api.ApiLayer;
+import de.bananaco.bpermissions.api.CalculableType;
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class BPermissionsHandler implements PermissionHandler {
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        ApiLayer.addGroup(player.getWorld().getName(), CalculableType.USER, player.getName(), group);
+        return true;
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        return ApiLayer.hasPermission(player.getWorld().getName(), CalculableType.USER, player.getName(), node.getNode());
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        return ApiLayer.hasGroup(player.getWorld().getName(), CalculableType.USER, player.getName(), group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        ApiLayer.removeGroup(player.getWorld().getName(), CalculableType.USER, player.getName(), group);
+        return true;
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        ApiLayer.setGroup(player.getWorld().getName(), CalculableType.USER, player.getName(), group);
+        return true;
+    }
+
+    @Override
+    public List<String> getGroups(Player player) {
+        return Arrays.asList(ApiLayer.getGroups(player.getWorld().getName(), CalculableType.USER, player.getName()));
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        // Get the groups of the player
+        List<String> groups = getGroups(player);
+
+        // Make sure there is any group available, or return null
+        if (groups.size() == 0)
+            return null;
+
+        // Return the first group
+        return groups.get(0);
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.B_PERMISSIONS;
+    }
+}

src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java

@@ -0,0 +1,79 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.anjocaido.groupmanager.GroupManager;
+import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class GroupManagerHandler implements PermissionHandler {
+
+    private GroupManager groupManager;
+
+    public GroupManagerHandler(GroupManager groupManager) {
+        this.groupManager = groupManager;
+    }
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manuaddsub " + player.getName() + " " + group);
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
+        return handler != null && handler.has(player, node.getNode());
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
+        return handler != null && handler.inGroup(player.getName(), group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manudelsub " + player.getName() + " " + group);
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
+        for (String groupName : handler.getGroups(player.getName())) {
+            removeFromGroup(player, groupName);
+        }
+
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manuadd " + player.getName() + " " + group);
+    }
+
+    @Override
+    public List<String> getGroups(Player player) {
+        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
+        if (handler == null)
+            return new ArrayList<>();
+        return Arrays.asList(handler.getGroups(player.getName()));
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
+        if (handler == null)
+            return null;
+        return handler.getGroup(player.getName());
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.ESSENTIALS_GROUP_MANAGER;
+    }
+}

src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java

@@ -0,0 +1,98 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+public interface PermissionHandler {
+
+    /**
+     * Add the permission group of a player, if supported.
+     *
+     * @param player    The player
+     * @param group The name of the group.
+     *
+     * @return True if succeed, false otherwise.
+     * False is also returned if this feature isn't supported for the current permissions system.
+     */
+    boolean addToGroup(Player player, String group);
+
+    /**
+     * Check whether the current permissions system has group support.
+     * If no permissions system is hooked, false will be returned.
+     *
+     * @return True if the current permissions system supports groups, false otherwise.
+     */
+    boolean hasGroupSupport();
+
+    /**
+     * Check if a player has permission.
+     *
+     * @param player    The player.
+     * @param node The permission node.
+     * @param def       Default returned if no permissions system is used.
+     *
+     * @return True if the player has permission.
+     */
+    boolean hasPermission(Player player, PermissionNode node, boolean def);
+
+    /**
+     * Check whether the player is in the specified group.
+     *
+     * @param player    The player.
+     * @param group The group name.
+     *
+     * @return True if the player is in the specified group, false otherwise.
+     * False is also returned if groups aren't supported by the used permissions system.
+     */
+    boolean isInGroup(Player player, String group);
+
+    /**
+     * Remove the permission group of a player, if supported.
+     *
+     * @param player    The player
+     * @param group The name of the group.
+     *
+     * @return True if succeed, false otherwise.
+     * False is also returned if this feature isn't supported for the current permissions system.
+     */
+    boolean removeFromGroup(Player player, String group);
+
+    /**
+     * Set the permission group of a player, if supported.
+     * This clears the current groups of the player.
+     *
+     * @param player    The player
+     * @param group The name of the group.
+     *
+     * @return True if succeed, false otherwise.
+     * False is also returned if this feature isn't supported for the current permissions system.
+     */
+    boolean setGroup(Player player, String group);
+
+    /**
+     * Get the permission groups of a player, if available.
+     *
+     * @param player The player.
+     *
+     * @return Permission groups, or an empty list if this feature is not supported.
+     */
+    List<String> getGroups(Player player);
+
+    /**
+     * Get the primary group of a player, if available.
+     *
+     * @param player The player.
+     *
+     * @return The name of the primary permission group. Or null.
+     */
+    String getPrimaryGroup(Player player);
+
+    /**
+     * Get the permission system that is being used.
+     *
+     * @return The permission system.
+     */
+    PermissionsSystemType getPermissionSystem();
+}

src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java

@@ -0,0 +1,68 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PermissionsBukkitHandler implements PermissionHandler {
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player addgroup " + player.getName() + " " + group);
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        return player.hasPermission(node.getNode());
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        List<String> groupNames = getGroups(player);
+
+        return groupNames.contains(group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player removegroup " + player.getName() + " " + group);
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player setgroup " + player.getName() + " " + group);
+    }
+
+    @Override
+    public List<String> getGroups(Player player) {
+        // FIXME Gnat008 20160601: Add support for this
+        return new ArrayList<>();
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        // Get the groups of the player
+        List<String> groups = getGroups(player);
+
+        // Make sure there is any group available, or return null
+        if (groups.size() == 0)
+            return null;
+
+        // Return the first group
+        return groups.get(0);
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.PERMISSIONS_BUKKIT;
+    }
+}

src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java

@@ -0,0 +1,89 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.bukkit.entity.Player;
+import ru.tehkode.permissions.PermissionManager;
+import ru.tehkode.permissions.PermissionUser;
+import ru.tehkode.permissions.bukkit.PermissionsEx;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PermissionsExHandler implements PermissionHandler {
+
+    private PermissionManager permissionManager;
+
+    public PermissionsExHandler(PermissionManager permissionManager) {
+        this.permissionManager = permissionManager;
+    }
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        if(!PermissionsEx.getPermissionManager().getGroupNames().contains(group)) {
+            ConsoleLogger.showError("The plugin tried to set " + player + "'s group to '" + group + "', but it doesn't exist!");
+            return false;
+        }
+
+        PermissionUser user = PermissionsEx.getUser(player);
+        user.addGroup(group);
+        return true;
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        PermissionUser user = permissionManager.getUser(player);
+        return user.has(node.getNode());
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        PermissionUser user = permissionManager.getUser(player);
+        return user.inGroup(group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        PermissionUser user = permissionManager.getUser(player);
+        user.removeGroup(group);
+        return true;
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        List<String> groups = new ArrayList<>();
+        groups.add(group);
+
+        PermissionUser user = permissionManager.getUser(player);
+        user.setParentsIdentifier(groups);
+        return true;
+    }
+
+    @Override
+    public List<String> getGroups(Player player) {
+        PermissionUser user = permissionManager.getUser(player);
+        return user.getParentIdentifiers(null);
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        PermissionUser user = permissionManager.getUser(player);
+
+        List<String> groups = user.getParentIdentifiers(null);
+        if (groups.size() == 0)
+            return null;
+
+        return groups.get(0);
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.PERMISSIONS_EX;
+    }
+}

src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java

@@ -0,0 +1,67 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import net.milkbowl.vault.permission.Permission;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class VaultHandler implements PermissionHandler {
+
+    private Permission vaultProvider;
+
+    public VaultHandler(Permission vaultProvider) {
+        this.vaultProvider = vaultProvider;
+    }
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        return vaultProvider.playerAddGroup(player, group);
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return vaultProvider.hasGroupSupport();
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        return vaultProvider.has(player, node.getNode());
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        return vaultProvider.playerInGroup(player, group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        return vaultProvider.playerRemoveGroup(player, group);
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        for (String groupName : getGroups(player)) {
+            removeFromGroup(player, groupName);
+        }
+
+        return vaultProvider.playerAddGroup(player, group);
+    }
+
+    @Override
+    public List<String> getGroups(Player player) {
+        return Arrays.asList(vaultProvider.getPlayerGroups(player));
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        return vaultProvider.getPrimaryGroup(player);
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.VAULT;
+    }
+}

src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java

@@ -0,0 +1,72 @@
+package fr.xephi.authme.permission.handlers;
+
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.permission.PermissionsSystemType;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ZPermissionsHandler implements PermissionHandler {
+
+    private ZPermissionsService zPermissionsService;
+
+    public ZPermissionsHandler(ZPermissionsService zPermissionsService) {
+        this.zPermissionsService = zPermissionsService;
+    }
+
+    @Override
+    public boolean addToGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player " + player.getName() + " addgroup " + group);
+    }
+
+    @Override
+    public boolean hasGroupSupport() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Player player, PermissionNode node, boolean def) {
+        Map<String, Boolean> perms = zPermissionsService.getPlayerPermissions(player.getWorld().getName(), null, player.getName());
+        if (perms.containsKey(node.getNode()))
+            return perms.get(node.getNode());
+        else
+            return def;
+    }
+
+    @Override
+    public boolean isInGroup(Player player, String group) {
+        return getGroups(player).contains(group);
+    }
+
+    @Override
+    public boolean removeFromGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player " + player.getName() + " removegroup " + group);
+    }
+
+    @Override
+    public boolean setGroup(Player player, String group) {
+        return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "permissions player " + player.getName() + " setgroup " + group);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<String> getGroups(Player player) {
+        // TODO Gnat008 20160631: Use UUID not name?
+        return new ArrayList(zPermissionsService.getPlayerGroups(player.getName()));
+    }
+
+    @Override
+    public String getPrimaryGroup(Player player) {
+        // TODO Gnat008 20160631: Use UUID not name?
+        return zPermissionsService.getPlayerPrimaryGroup(player.getName());
+    }
+
+    @Override
+    public PermissionsSystemType getPermissionSystem() {
+        return PermissionsSystemType.Z_PERMISSIONS;
+    }
+}