Move stuff into commons, rename PermissionObject, add more javadocs to api

bukkit/pom.xml

@@ -82,5 +82,19 @@
             <version>1.5</version>
             <scope>compile</scope>
         </dependency>
+        <!-- HikariCP -->
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>2.4.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- slf4j library -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.9</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

bukkit/src/main/java/me/lucko/luckperms/BukkitCommand.java

@@ -1,49 +1,43 @@
 package me.lucko.luckperms;
 
 import me.lucko.luckperms.commands.CommandManager;
-import me.lucko.luckperms.commands.Sender;
+import me.lucko.luckperms.commands.SenderFactory;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 
-import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.List;
 
 class BukkitCommand extends CommandManager implements CommandExecutor, TabExecutor {
+    private static final Factory FACTORY = new Factory();
+
     BukkitCommand(LuckPermsPlugin plugin) {
         super(plugin);
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        return onCommand(makeSender(sender), label, Arrays.asList(args));
+        return onCommand(FACTORY.wrap(sender), label, Arrays.asList(args));
     }
 
 
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
-        return onTabComplete(makeSender(sender), Arrays.asList(args));
+        return onTabComplete(FACTORY.wrap(sender), Arrays.asList(args));
     }
 
-    private static Sender makeSender(CommandSender sender) {
-        return new Sender() {
-            final WeakReference<CommandSender> cs = new WeakReference<>(sender);
+    private static class Factory extends SenderFactory<CommandSender> {
 
-            @Override
-            public void sendMessage(String s) {
-                final CommandSender c = cs.get();
-                if (c != null) {
-                    c.sendMessage(s);
-                }
-            }
+        @Override
+        protected void sendMessage(CommandSender sender, String s) {
+            sender.sendMessage(s);
+        }
 
-            @Override
-            public boolean hasPermission(String node) {
-                final CommandSender c = cs.get();
-                return c != null && c.hasPermission(node);
-            }
-        };
+        @Override
+        protected boolean hasPermission(CommandSender sender, String node) {
+            return sender.hasPermission(node);
+        }
     }
 }

bukkit/src/main/java/me/lucko/luckperms/BukkitListener.java

@@ -0,0 +1,64 @@
+package me.lucko.luckperms;
+
+import me.lucko.luckperms.constants.Message;
+import me.lucko.luckperms.users.BukkitUser;
+import me.lucko.luckperms.users.User;
+import me.lucko.luckperms.utils.AbstractListener;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.*;
+
+class BukkitListener extends AbstractListener implements Listener {
+    private final LPBukkitPlugin plugin;
+
+    BukkitListener(LPBukkitPlugin plugin) {
+        super(plugin);
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
+        if (!plugin.getDatastore().isAcceptingLogins()) {
+            // Datastore is disabled, prevent players from joining the server
+            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
+            return;
+        }
+
+        onAsyncLogin(e.getUniqueId(), e.getName());
+    }
+
+    @EventHandler
+    public void onPlayerLogin(PlayerLoginEvent e) {
+        final Player player = e.getPlayer();
+        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(player.getUniqueId()));
+
+        if (user == null) {
+            e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
+            return;
+        }
+
+        if (user instanceof BukkitUser) {
+            BukkitUser u = (BukkitUser) user;
+            u.setAttachment(player.addAttachment(plugin));
+        }
+
+        user.refreshPermissions();
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent e) {
+        // Refresh permissions again
+        refreshPlayer(e.getPlayer().getUniqueId());
+    }
+
+    @EventHandler
+    public void onPlayerChangedWorld(PlayerChangedWorldEvent e) {
+        refreshPlayer(e.getPlayer().getUniqueId());
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent e) {
+        onLeave(e.getPlayer().getUniqueId());
+    }
+}

bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java

@@ -5,12 +5,12 @@ import me.lucko.luckperms.api.Logger;
 import me.lucko.luckperms.api.LuckPermsApi;
 import me.lucko.luckperms.api.implementation.ApiProvider;
 import me.lucko.luckperms.api.vault.VaultHook;
+import me.lucko.luckperms.constants.Message;
 import me.lucko.luckperms.data.Datastore;
 import me.lucko.luckperms.data.methods.FlatfileDatastore;
 import me.lucko.luckperms.data.methods.MySQLDatastore;
 import me.lucko.luckperms.data.methods.SQLiteDatastore;
 import me.lucko.luckperms.groups.GroupManager;
-import me.lucko.luckperms.listeners.PlayerListener;
 import me.lucko.luckperms.runnables.UpdateTask;
 import me.lucko.luckperms.tracks.TrackManager;
 import me.lucko.luckperms.users.BukkitUserManager;
@@ -47,7 +47,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
         // register events
         PluginManager pm = Bukkit.getPluginManager();
-        pm.registerEvents(new PlayerListener(this), this);
+        pm.registerEvents(new BukkitListener(this), this);
 
         // register commands
         getLog().info("Registering commands...");
@@ -149,8 +149,8 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public String getPlayerStatus(UUID uuid) {
-        return getServer().getPlayer(getUuidCache().getExternalUUID(uuid)) != null ? "&aOnline" : "&cOffline";
+    public Message getPlayerStatus(UUID uuid) {
+        return getServer().getPlayer(getUuidCache().getExternalUUID(uuid)) != null ? Message.PLAYER_ONLINE : Message.PLAYER_OFFLINE;
     }
 
     @Override

bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java

@@ -7,7 +7,7 @@ import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 import me.lucko.luckperms.groups.Group;
 import me.lucko.luckperms.users.User;
-import me.lucko.luckperms.utils.PermissionObject;
+import me.lucko.luckperms.utils.PermissionHolder;
 import net.milkbowl.vault.permission.Permission;
 
 /**
@@ -33,7 +33,7 @@ class VaultPermissionHook extends Permission {
         return true;
     }
 
-    private boolean objectHas(String world, PermissionObject object, String permission) {
+    private boolean objectHas(String world, PermissionHolder object, String permission) {
         if (object == null) return false;
 
         if (world != null && !world.equals("")) {
@@ -43,7 +43,7 @@ class VaultPermissionHook extends Permission {
         }
     }
 
-    private boolean objectAdd(String world, PermissionObject object, String permission) {
+    private boolean objectAdd(String world, PermissionHolder object, String permission) {
         if (object == null) return false;
 
         try {
@@ -58,7 +58,7 @@ class VaultPermissionHook extends Permission {
         return true;
     }
 
-    private boolean objectRemove(String world, PermissionObject object, String permission) {
+    private boolean objectRemove(String world, PermissionHolder object, String permission) {
         if (object == null) return false;
 
         try {
@@ -73,7 +73,7 @@ class VaultPermissionHook extends Permission {
         return true;
     }
 
-    private void objectSave(PermissionObject t) {
+    private void objectSave(PermissionHolder t) {
         if (t instanceof User) {
             ((User) t).refreshPermissions();
             plugin.getDatastore().saveUser(((User) t), aBoolean -> {});

bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java

@@ -1,101 +0,0 @@
-package me.lucko.luckperms.listeners;
-
-import lombok.AllArgsConstructor;
-import me.lucko.luckperms.LPBukkitPlugin;
-import me.lucko.luckperms.commands.Util;
-import me.lucko.luckperms.constants.Message;
-import me.lucko.luckperms.users.BukkitUser;
-import me.lucko.luckperms.users.User;
-import me.lucko.luckperms.utils.UuidCache;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.*;
-
-import java.util.UUID;
-
-@AllArgsConstructor
-public class PlayerListener implements Listener {
-    private static final String KICK_MESSAGE = Util.color(Message.PREFIX + "User data could not be loaded. Please contact an administrator.");
-    private final LPBukkitPlugin plugin;
-
-    @EventHandler
-    public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
-        final long startTime = System.currentTimeMillis();
-        if (!plugin.getDatastore().isAcceptingLogins()) {
-            // Datastore is disabled, prevent players from joining the server
-            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, KICK_MESSAGE);
-            return;
-        }
-        
-        final UuidCache cache = plugin.getUuidCache();
-        if (!cache.isOnlineMode()) {
-            UUID uuid = plugin.getDatastore().getUUID(e.getName());
-            if (uuid != null) {
-                cache.addToCache(e.getUniqueId(), uuid);
-            } else {
-                // No previous data for this player
-                cache.addToCache(e.getUniqueId(), e.getUniqueId());
-                plugin.getDatastore().saveUUIDData(e.getName(), e.getUniqueId(), b -> {});
-            }
-        } else {
-            // Online mode, no cache needed. This is just for name -> uuid lookup.
-            plugin.getDatastore().saveUUIDData(e.getName(), e.getUniqueId(), b -> {});
-        }
-
-        plugin.getDatastore().loadOrCreateUser(cache.getUUID(e.getUniqueId()), e.getName());
-        final long time = System.currentTimeMillis() - startTime;
-        if (time >= 1000) {
-            plugin.getLog().warn("Processing login for " + e.getName() + " took " + time + "ms.");
-        }
-    }
-
-    @EventHandler
-    public void onPlayerLogin(PlayerLoginEvent e) {
-        final Player player = e.getPlayer();
-        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(player.getUniqueId()));
-
-        if (user == null) {
-            e.disallow(PlayerLoginEvent.Result.KICK_OTHER, KICK_MESSAGE);
-            return;
-        }
-
-        if (user instanceof BukkitUser) {
-            BukkitUser u = (BukkitUser) user;
-            u.setAttachment(player.addAttachment(plugin));
-        }
-
-        user.refreshPermissions();
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent e) {
-        // Refresh permissions again
-        refreshPlayer(e.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent e) {
-        refreshPlayer(e.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent e) {
-        final Player player = e.getPlayer();
-        final UuidCache cache = plugin.getUuidCache();
-
-        // Unload the user from memory when they disconnect;
-        cache.clearCache(player.getUniqueId());
-
-        final User user = plugin.getUserManager().getUser(cache.getUUID(player.getUniqueId()));
-        plugin.getUserManager().unloadUser(user);
-    }
-
-    private void refreshPlayer(Player p) {
-        final User user = plugin.getUserManager().getUser(plugin.getUuidCache().getUUID(p.getUniqueId()));
-        if (user != null) {
-            user.refreshPermissions();
-        }
-    }
-
-}