WhitelistProvider is now an interface

src/main/java/net/canarymod/user/OperatorsProvider.java

@@ -1,83 +1,18 @@
 package net.canarymod.user;
 
-import net.canarymod.ToolBox;
 import net.canarymod.api.PlayerReference;
-import net.canarymod.backbone.BackboneOperators;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import static net.canarymod.Canary.log;
 
 /**
  * Access to the backbone for operators
  *
  * @author Jason (darkdiplomat)
  */
-public class OperatorsProvider {
-    private BackboneOperators backboneOps;
-    private List<String> ops;
-
-    public OperatorsProvider() {
-        backboneOps = new BackboneOperators();
-        ops = backboneOps.loadOps();
-        readOpsCfg();
-    }
+public interface OperatorsProvider {
 
     /**
      * Reload the ops from database
      */
-    public void reload() {
-        ops = backboneOps.loadOps();
-        readOpsCfg();
-    }
-
-    /**
-     * Reads the config/ops.cfg file if it exists and updates the database
-     * with the names found in it.
-     */
-    private void readOpsCfg() {
-        try {
-            BufferedReader reader = new BufferedReader(new FileReader(new File("config/ops.cfg")));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (line.startsWith("#")) {
-                    continue;
-                }
-                if (!isOpped(line)) {
-                    addPlayer(line);
-                }
-            }
-        }
-        catch (FileNotFoundException e) {
-            log.info("Could not find config/ops.cfg. Creating one for you...");
-            File f = new File("config/ops.cfg");
-            try {
-                if (f.createNewFile()) {
-                    PrintWriter pwriter = new PrintWriter(new FileWriter(f));
-                    pwriter.println("# Note: This file is not guaranteed to be synchronous with the actual ops list in database.");
-                    pwriter.println("# However, you may use it to quickly add new operators as you please.");
-                    pwriter.println("# Any duplicate entries will be taken care of so don't worry.");
-                    pwriter.println("# Lines starting with # are comments ;)");
-                    pwriter.println("# Add one name to each line.");
-                    pwriter.close();
-                    log.info("You can now add ops to config/ops.cfg (one per line!). We left you a note.");
-                }
-            }
-            catch (IOException e1) {
-                log.error("Failed to write config/ops.cfg! (Probably no write-access!)", e);
-            }
-        }
-        catch (IOException e) {
-            log.error("Failed to read from config/ops.cfg!", e);
-        }
-    }
+    void reload();
 
     /**
      * Check if a given Player name or UUID is opped.
@@ -87,89 +22,37 @@ private void readOpsCfg() {
      *
      * @return true if player is opped, false otherwise
      */
-    public boolean isOpped(String nameOrUUID) {
-        // Did UUID get passed?
-        if (ToolBox.isUUID(nameOrUUID)) {
-            return ops.contains(nameOrUUID);
-        }
-        else {
-            return ops.contains(ToolBox.usernameToUUID(nameOrUUID));
-        }
-    }
+    boolean isOpped(String nameOrUUID);
 
-    public boolean isOpped(PlayerReference playerReference) {
-        if (playerReference != null) {
-            // Lets update to UUID if we can get a UUID
-            if (ops.contains(playerReference.getName())) {
-                if (playerReference.getUUIDString() != null) {
-                    removePlayer(playerReference.getName());
-                    addPlayer(playerReference.getUUIDString());
-                }
-                return true;
-            }
-            // UUID test it is
-            return ops.contains(playerReference.getUUIDString());
-        }
-        return false;
-    }
+    boolean isOpped(PlayerReference playerReference);
 
     /**
      * Adds a new operators entry
      *
      * @param entry
      *         the player uuid/name you want to add
      */
-    public void addPlayer(String entry) {
-        if (!ops.contains(entry)) {
-            if (!ToolBox.isUUID(entry)) {
-                String uuid = ToolBox.usernameToUUID(entry);
-                if (!ops.contains(uuid)) {
-                    ops.add(uuid);
-                    backboneOps.addOpEntry(uuid);
-                }
-            }
-            else {
-                ops.add(entry);
-                backboneOps.addOpEntry(entry);
-            }
-        }
-    }
+    void addPlayer(String entry);
 
     /**
      * Removes the given player from the ops list
      *
      * @param entry
      *         the player uuid/name you want to remove
      */
-    public void removePlayer(String entry) {
-        if (ops.contains(entry)) {
-            ops.remove(entry);
-            backboneOps.removeOpEntry(entry);
-        }
-        else if (!ToolBox.isUUID(entry)) {
-            String uuid = ToolBox.usernameToUUID(entry);
-            if (ops.contains(uuid)) {
-                ops.remove(uuid);
-                backboneOps.removeOpEntry(uuid);
-            }
-        }
-    }
+    void removePlayer(String entry);
 
     /**
      * gets the current size of the ops list
      *
      * @return the size
      */
-    public int getSize() {
-        return ops.size();
-    }
+    int getSize();
 
     /**
      * Gets an array of all Operators
      *
      * @return
      */
-    public String[] getOps() {
-        return ops.toArray(new String[getSize()]);
-    }
+    String[] getOps();
 }

src/main/java/net/canarymod/user/ReservelistProvider.java

@@ -1,32 +1,18 @@
 package net.canarymod.user;
 
-import net.canarymod.Canary;
-import net.canarymod.ToolBox;
 import net.canarymod.api.PlayerReference;
-import net.canarymod.backbone.BackboneReservelist;
-
-import java.util.List;
 
 /**
  * Reserve List Provider
  *
  * @author Jason (darkdiplomat)
  */
-public class ReservelistProvider {
-    private BackboneReservelist backbonereservelist;
-    private List<String> reservelist;
-
-    public ReservelistProvider() {
-        backbonereservelist = new BackboneReservelist();
-        reservelist = backbonereservelist.loadReservelist();
-    }
+public interface ReservelistProvider {
 
     /**
      * Reload the reservelist from database
      */
-    public void reload() {
-        reservelist = backbonereservelist.loadReservelist();
-    }
+    void reload();
 
     /**
      * Check if a given player is reservelist.
@@ -36,75 +22,35 @@ public void reload() {
      *
      * @return {@code true}
      */
-    public boolean isSlotReserved(String nameOrUUID) {
-        // Did UUID get passed?
-        if (ToolBox.isUUID(nameOrUUID)) {
-            return reservelist.contains(nameOrUUID);
-        }
-        else if (Canary.getServer() != null) { // Like at start up...
-            // Try to get a UUID reference from a known player
-            return isSlotReserved(Canary.getServer().matchKnownPlayer(nameOrUUID));
-        }
-        else {
-            return false;
-        }
-    }
+    boolean isSlotReserved(String nameOrUUID);
 
-    public boolean isSlotReserved(PlayerReference playerReference) {
-        if (playerReference != null) {
-            // Lets update to UUID if we can get a UUID
-            if (reservelist.contains(playerReference.getName())) {
-                if (playerReference.getUUIDString() != null) {
-                    removePlayer(playerReference.getName());
-                    addPlayer(playerReference.getUUIDString());
-                }
-                return true;
-            }
-            // UUID test it is
-            return reservelist.contains(playerReference.getUUIDString());
-        }
-        return false;
-    }
+    boolean isSlotReserved(PlayerReference playerReference);
 
     /**
      * Adds a new whitelist entry
      *
      * @param name
      */
-    public void addPlayer(String name) {
-        if (!reservelist.contains(name)) {
-            reservelist.add(name);
-            backbonereservelist.addSlotReservation(name);
-        }
-    }
+    void addPlayer(String name);
 
     /**
      * Removes the given player from the reservelist
      *
      * @param name
      */
-    public void removePlayer(String name) {
-        if (reservelist.contains(name)) {
-            reservelist.remove(name);
-            backbonereservelist.removeReservelistEntry(name);
-        }
-    }
+    void removePlayer(String name);
 
     /**
      * gets the current size of the reservelist
      *
      * @return
      */
-    public int getSize() {
-        return reservelist.size();
-    }
+    int getSize();
 
     /**
      * Gets all reservations
      *
      * @return
      */
-    public String[] getReservations() {
-        return reservelist.toArray(new String[reservelist.size()]);
-    }
+    String[] getReservations();
 }

src/main/java/net/canarymod/user/WhitelistProvider.java

@@ -1,30 +1,16 @@
 package net.canarymod.user;
 
-import net.canarymod.ToolBox;
-import net.canarymod.backbone.BackboneWhitelist;
-
-import java.util.List;
-
 /**
  * Access to the backbone for whitelist
  *
  * @author Chris (damagefilter)
  */
-public class WhitelistProvider {
-    private BackboneWhitelist backboneWhitelist;
-    private List<String> whitelist;
-
-    public WhitelistProvider() {
-        backboneWhitelist = new BackboneWhitelist();
-        whitelist = backboneWhitelist.loadWhitelist();
-    }
+public interface WhitelistProvider {
 
     /**
      * Reload the whitelist from database
      */
-    public void reload() {
-        whitelist = backboneWhitelist.loadWhitelist();
-    }
+    void reload();
 
     /**
      * Check if a given player is whitelisted.
@@ -34,58 +20,30 @@ public void reload() {
      *
      * @return
      */
-    public boolean isWhitelisted(String subject) {
-        String uuid = subject;
-        if (!ToolBox.isUUID(uuid)) {
-            uuid = ToolBox.usernameToUUID(uuid);
-        }
-        return whitelist.contains(uuid);
-    }
+    boolean isWhitelisted(String subject);
 
     /**
      * Adds a new whitelist entry
      *
      * @param subject
      *         player name or uuid
      */
-    public void addPlayer(String subject) {
-        String uuid = subject;
-        if (!ToolBox.isUUID(uuid)) {
-            uuid = ToolBox.usernameToUUID(uuid);
-        }
-        if (!whitelist.contains(uuid)) {
-            whitelist.add(uuid);
-            backboneWhitelist.addWhitelistEntry(uuid);
-        }
-    }
+    void addPlayer(String subject);
 
     /**
      * Removes the given player from the whitelist
      *
      * @param subject
      *         player name or uuid
      */
-    public void removePlayer(String subject) {
-        String uuid = subject;
-        if (!ToolBox.isUUID(uuid)) {
-            uuid = ToolBox.usernameToUUID(uuid);
-        }
-        if (whitelist.contains(uuid)) {
-            whitelist.remove(uuid);
-            backboneWhitelist.removeWhitelistEntry(uuid);
-        }
-    }
+    void removePlayer(String subject);
 
     /**
      * gets the current size of the whitelist
      *
      * @return
      */
-    public int getSize() {
-        return whitelist.size();
-    }
+    int getSize();
 
-    public String[] getWhitelisted() {
-        return whitelist.toArray(new String[getSize()]);
-    }
+    String[] getWhitelisted();
 }