Minor - Use explicit dependencies in ProcessService
- Replace AuthMe in favor of PermissionsManager - Create missing tests for ProcessService
This commit is contained in:
@@ -1,15 +1,17 @@
|
||||
package fr.xephi.authme.process;
|
||||
|
||||
import fr.xephi.authme.AuthMe;
|
||||
import fr.xephi.authme.output.MessageKey;
|
||||
import fr.xephi.authme.output.Messages;
|
||||
import fr.xephi.authme.permission.PermissionNode;
|
||||
import fr.xephi.authme.permission.PermissionsManager;
|
||||
import fr.xephi.authme.settings.NewSetting;
|
||||
import fr.xephi.authme.settings.domain.Property;
|
||||
import fr.xephi.authme.util.ValidationService;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/**
|
||||
@@ -24,11 +26,14 @@ public class ProcessService {
|
||||
private Messages messages;
|
||||
|
||||
@Inject
|
||||
private AuthMe plugin;
|
||||
private PluginManager pluginManager;
|
||||
|
||||
@Inject
|
||||
private ValidationService validationService;
|
||||
|
||||
@Inject
|
||||
private PermissionsManager permissionsManager;
|
||||
|
||||
/**
|
||||
* Retrieve a property's value.
|
||||
*
|
||||
@@ -96,16 +101,7 @@ public class ProcessService {
|
||||
* @param event the event to emit
|
||||
*/
|
||||
public void callEvent(Event event) {
|
||||
plugin.getServer().getPluginManager().callEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the plugin instance.
|
||||
*
|
||||
* @return AuthMe instance
|
||||
*/
|
||||
public AuthMe getAuthMe() {
|
||||
return plugin;
|
||||
pluginManager.callEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -128,7 +124,7 @@ public class ProcessService {
|
||||
}
|
||||
|
||||
public boolean hasPermission(Player player, PermissionNode node) {
|
||||
return plugin.getPermissionsManager().hasPermission(player, node);
|
||||
return permissionsManager.hasPermission(player, node);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package fr.xephi.authme.process.register;
|
||||
|
||||
import fr.xephi.authme.AuthMe;
|
||||
import fr.xephi.authme.ConsoleLogger;
|
||||
import fr.xephi.authme.cache.limbo.LimboCache;
|
||||
import fr.xephi.authme.cache.limbo.LimboPlayer;
|
||||
@@ -33,6 +34,9 @@ public class ProcessSyncEmailRegister implements SynchronousProcess {
|
||||
@Inject
|
||||
private BukkitService bukkitService;
|
||||
|
||||
@Inject
|
||||
private AuthMe authMe;
|
||||
|
||||
public ProcessSyncEmailRegister() { }
|
||||
|
||||
public void processEmailRegister(Player player) {
|
||||
@@ -47,7 +51,7 @@ public class ProcessSyncEmailRegister implements SynchronousProcess {
|
||||
|
||||
if (limbo != null) {
|
||||
if (time != 0) {
|
||||
BukkitTask id = bukkitService.runTaskLater(new TimeoutTask(service.getAuthMe(), name, player), time);
|
||||
BukkitTask id = bukkitService.runTaskLater(new TimeoutTask(authMe, name, player), time);
|
||||
limbo.setTimeoutTask(id);
|
||||
}
|
||||
BukkitTask messageTask = bukkitService.runTask(new MessageTask(
|
||||
|
||||
@@ -79,7 +79,7 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
|
||||
int interval = service.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
|
||||
BukkitTask task;
|
||||
if (delay != 0) {
|
||||
task = bukkitService.runTaskLater(new TimeoutTask(service.getAuthMe(), name, player), delay);
|
||||
task = bukkitService.runTaskLater(new TimeoutTask(plugin, name, player), delay);
|
||||
cache.getLimboPlayer(name).setTimeoutTask(task);
|
||||
}
|
||||
task = bukkitService.runTask(new MessageTask(bukkitService, plugin.getMessages(),
|
||||
|
||||
Reference in New Issue
Block a user