From f8ad562b958b1c48ed257957ef9f00fadac63a6f Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 19 Mar 2017 21:04:10 +0000 Subject: [PATCH] Rename "debug" classes to "verbose" --- .../lucko/luckperms/bukkit/LPBukkitPlugin.java | 10 +++++----- .../lucko/luckperms/bungee/LPBungeePlugin.java | 6 +++--- .../common/calculators/PermissionCalculator.java | 2 +- .../commands/impl/misc/VerboseCommand.java | 8 ++++---- .../luckperms/common/plugin/LuckPermsPlugin.java | 4 ++-- .../common/{debug => verbose}/CheckData.java | 2 +- .../VerboseHandler.java} | 16 ++++++++-------- .../VerboseListener.java} | 4 ++-- .../lucko/luckperms/sponge/LPSpongePlugin.java | 6 +++--- .../service/persisted/PersistedSubject.java | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) rename common/src/main/java/me/lucko/luckperms/common/{debug => verbose}/CheckData.java (97%) rename common/src/main/java/me/lucko/luckperms/common/{debug/DebugHandler.java => verbose/VerboseHandler.java} (84%) rename common/src/main/java/me/lucko/luckperms/common/{debug/DebugListener.java => verbose/VerboseListener.java} (99%) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java index 05e974e4..4fecf952 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -49,7 +49,6 @@ import me.lucko.luckperms.common.contexts.ContextManager; import me.lucko.luckperms.common.contexts.ServerCalculator; import me.lucko.luckperms.common.core.UuidCache; import me.lucko.luckperms.common.core.model.User; -import me.lucko.luckperms.common.debug.DebugHandler; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.NoopLocaleManager; @@ -73,6 +72,7 @@ import me.lucko.luckperms.common.treeview.PermissionVault; import me.lucko.luckperms.common.utils.BufferedRequest; import me.lucko.luckperms.common.utils.FileWatcher; import me.lucko.luckperms.common.utils.LoggerImpl; +import me.lucko.luckperms.common.verbose.VerboseHandler; import org.bukkit.World; import org.bukkit.command.PluginCommand; @@ -122,7 +122,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { private CalculatorFactory calculatorFactory; private BufferedRequest updateTaskBuffer; private boolean started = false; - private DebugHandler debugHandler; + private VerboseHandler verboseHandler; private BukkitSenderFactory senderFactory; private PermissionVault permissionVault; @@ -136,7 +136,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this); ignoringLogs = ConcurrentHashMap.newKeySet(); - debugHandler = new DebugHandler(scheduler.getAsyncBukkitExecutor(), getVersion()); + verboseHandler = new VerboseHandler(scheduler.getAsyncBukkitExecutor(), getVersion()); permissionVault = new PermissionVault(scheduler.getAsyncBukkitExecutor()); getLog().info("Loading configuration..."); @@ -325,7 +325,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { defaultsProvider.close(); permissionVault.setShutdown(true); - debugHandler.setShutdown(true); + verboseHandler.setShutdown(true); for (Player player : getServer().getOnlinePlayers()) { Injector.unInject(player, false, false); @@ -388,7 +388,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { worldCalculator = null; calculatorFactory = null; updateTaskBuffer = null; - debugHandler = null; + verboseHandler = null; senderFactory = null; permissionVault = null; } diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index 30fe3925..ab7c76fc 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -41,7 +41,6 @@ import me.lucko.luckperms.common.contexts.ContextManager; import me.lucko.luckperms.common.contexts.ServerCalculator; import me.lucko.luckperms.common.core.UuidCache; import me.lucko.luckperms.common.core.model.User; -import me.lucko.luckperms.common.debug.DebugHandler; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.NoopLocaleManager; @@ -66,6 +65,7 @@ import me.lucko.luckperms.common.treeview.PermissionVault; import me.lucko.luckperms.common.utils.BufferedRequest; import me.lucko.luckperms.common.utils.FileWatcher; import me.lucko.luckperms.common.utils.LoggerImpl; +import me.lucko.luckperms.common.verbose.VerboseHandler; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; @@ -99,7 +99,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { private ContextManager contextManager; private CalculatorFactory calculatorFactory; private BufferedRequest updateTaskBuffer; - private DebugHandler debugHandler; + private VerboseHandler verboseHandler; private BungeeSenderFactory senderFactory; private PermissionVault permissionVault; @@ -110,7 +110,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { senderFactory = new BungeeSenderFactory(this); log = new LoggerImpl(getConsoleSender()); LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this); - debugHandler = new DebugHandler(scheduler.getAsyncExecutor(), getVersion()); + verboseHandler = new VerboseHandler(scheduler.getAsyncExecutor(), getVersion()); permissionVault = new PermissionVault(scheduler.getAsyncExecutor()); getLog().info("Loading configuration..."); diff --git a/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java index 2d883e56..0e4fa948 100644 --- a/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java +++ b/common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java @@ -58,7 +58,7 @@ public class PermissionCalculator { public Tristate getPermissionValue(String permission) { permission = permission.toLowerCase(); Tristate t = cache.getUnchecked(permission); - plugin.getDebugHandler().offer(objectName, permission, t); + plugin.getVerboseHandler().offer(objectName, permission, t); plugin.getPermissionVault().offer(permission); return t; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/VerboseCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/VerboseCommand.java index fa52721f..d2114502 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/VerboseCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/misc/VerboseCommand.java @@ -28,9 +28,9 @@ import me.lucko.luckperms.common.commands.abstraction.SingleCommand; import me.lucko.luckperms.common.commands.sender.Sender; import me.lucko.luckperms.common.constants.Message; import me.lucko.luckperms.common.constants.Permission; -import me.lucko.luckperms.common.debug.DebugListener; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.utils.Predicates; +import me.lucko.luckperms.common.verbose.VerboseListener; import io.github.mkremins.fanciful.ChatColor; import io.github.mkremins.fanciful.FancyMessage; @@ -66,14 +66,14 @@ public class VerboseCommand extends SingleCommand { String filter = filters.isEmpty() ? "" : filters.stream().collect(Collectors.joining(" ")); - if (!DebugListener.isValidFilter(filter)) { + if (!VerboseListener.isValidFilter(filter)) { Message.VERBOSE_INVALID_FILTER.send(sender, filter); return CommandResult.FAILURE; } boolean notify = !mode.equals("record"); - plugin.getDebugHandler().register(sender, filter, notify); + plugin.getVerboseHandler().register(sender, filter, notify); if (notify) { if (!filter.equals("")) { @@ -93,7 +93,7 @@ public class VerboseCommand extends SingleCommand { } if (mode.equals("off") || mode.equals("false") || mode.equals("paste")) { - DebugListener listener = plugin.getDebugHandler().unregister(sender.getUuid()); + VerboseListener listener = plugin.getVerboseHandler().unregister(sender.getUuid()); if (mode.equals("paste")) { if (listener == null) { diff --git a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java index b90d6f70..42616d46 100644 --- a/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java +++ b/common/src/main/java/me/lucko/luckperms/common/plugin/LuckPermsPlugin.java @@ -37,7 +37,6 @@ import me.lucko.luckperms.common.constants.Message; import me.lucko.luckperms.common.contexts.ContextManager; import me.lucko.luckperms.common.core.UuidCache; import me.lucko.luckperms.common.core.model.User; -import me.lucko.luckperms.common.debug.DebugHandler; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.managers.GroupManager; import me.lucko.luckperms.common.managers.TrackManager; @@ -47,6 +46,7 @@ import me.lucko.luckperms.common.storage.Storage; import me.lucko.luckperms.common.treeview.PermissionVault; import me.lucko.luckperms.common.utils.BufferedRequest; import me.lucko.luckperms.common.utils.FileWatcher; +import me.lucko.luckperms.common.verbose.VerboseHandler; import java.io.File; import java.io.InputStream; @@ -168,7 +168,7 @@ public interface LuckPermsPlugin { * * @return the debug handler instance */ - DebugHandler getDebugHandler(); + VerboseHandler getVerboseHandler(); /** * Gets the permission caching instance for the platform. diff --git a/common/src/main/java/me/lucko/luckperms/common/debug/CheckData.java b/common/src/main/java/me/lucko/luckperms/common/verbose/CheckData.java similarity index 97% rename from common/src/main/java/me/lucko/luckperms/common/debug/CheckData.java rename to common/src/main/java/me/lucko/luckperms/common/verbose/CheckData.java index 96e764c8..6d1bd2d3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/debug/CheckData.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/CheckData.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.debug; +package me.lucko.luckperms.common.verbose; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/src/main/java/me/lucko/luckperms/common/debug/DebugHandler.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java similarity index 84% rename from common/src/main/java/me/lucko/luckperms/common/debug/DebugHandler.java rename to common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java index 74468234..cf3fcc96 100644 --- a/common/src/main/java/me/lucko/luckperms/common/debug/DebugHandler.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.debug; +package me.lucko.luckperms.common.verbose; import lombok.Setter; @@ -34,17 +34,17 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; -public class DebugHandler implements Runnable { +public class VerboseHandler implements Runnable { private final String pluginVersion; - private final Map listeners; + private final Map listeners; private final Queue queue; private boolean listening = false; @Setter private boolean shutdown = false; - public DebugHandler(Executor executor, String pluginVersion) { + public VerboseHandler(Executor executor, String pluginVersion) { this.pluginVersion = "v" + pluginVersion; listeners = new ConcurrentHashMap<>(); queue = new ConcurrentLinkedQueue<>(); @@ -62,12 +62,12 @@ public class DebugHandler implements Runnable { public void register(Sender sender, String filter, boolean notify) { listening = true; - listeners.put(sender.getUuid(), new DebugListener(pluginVersion, sender, filter, notify)); + listeners.put(sender.getUuid(), new VerboseListener(pluginVersion, sender, filter, notify)); } - public DebugListener unregister(UUID uuid) { + public VerboseListener unregister(UUID uuid) { flush(); - DebugListener ret = listeners.remove(uuid); + VerboseListener ret = listeners.remove(uuid); if (listeners.isEmpty()) { listening = false; } @@ -91,7 +91,7 @@ public class DebugHandler implements Runnable { public synchronized void flush() { for (CheckData e; (e = queue.poll()) != null; ) { - for (DebugListener listener : listeners.values()) { + for (VerboseListener listener : listeners.values()) { listener.acceptData(e); } } diff --git a/common/src/main/java/me/lucko/luckperms/common/debug/DebugListener.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java similarity index 99% rename from common/src/main/java/me/lucko/luckperms/common/debug/DebugListener.java rename to common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java index 12506d66..818dd401 100644 --- a/common/src/main/java/me/lucko/luckperms/common/debug/DebugListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.common.debug; +package me.lucko.luckperms.common.verbose; import lombok.RequiredArgsConstructor; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; import javax.script.ScriptEngine; @RequiredArgsConstructor -public class DebugListener { +public class VerboseListener { private static final int DATA_TRUNCATION = 700; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java index 29a10a85..2add8732 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.contexts.ContextManager; import me.lucko.luckperms.common.contexts.ServerCalculator; import me.lucko.luckperms.common.core.UuidCache; import me.lucko.luckperms.common.core.model.User; -import me.lucko.luckperms.common.debug.DebugHandler; import me.lucko.luckperms.common.dependencies.DependencyManager; import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.NoopLocaleManager; @@ -63,6 +62,7 @@ import me.lucko.luckperms.common.treeview.PermissionVault; import me.lucko.luckperms.common.utils.BufferedRequest; import me.lucko.luckperms.common.utils.FileWatcher; import me.lucko.luckperms.common.utils.LoggerImpl; +import me.lucko.luckperms.common.verbose.VerboseHandler; import me.lucko.luckperms.sponge.commands.SpongeMainCommand; import me.lucko.luckperms.sponge.contexts.WorldCalculator; import me.lucko.luckperms.sponge.managers.SpongeGroupManager; @@ -158,7 +158,7 @@ public class LPSpongePlugin implements LuckPermsPlugin { private ContextManager contextManager; private CalculatorFactory calculatorFactory; private BufferedRequest updateTaskBuffer; - private DebugHandler debugHandler; + private VerboseHandler verboseHandler; private SpongeSenderFactory senderFactory; private PermissionVault permissionVault; @@ -169,7 +169,7 @@ public class LPSpongePlugin implements LuckPermsPlugin { senderFactory = new SpongeSenderFactory(this); log = new LoggerImpl(getConsoleSender()); LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this); - debugHandler = new DebugHandler(scheduler.getAsyncExecutor(), getVersion()); + verboseHandler = new VerboseHandler(scheduler.getAsyncExecutor(), getVersion()); permissionVault = new PermissionVault(scheduler.getAsyncExecutor()); timings = new LPTimings(this); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java index 0a3d1f05..81900c95 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java @@ -252,7 +252,7 @@ public class PersistedSubject implements LPSubject { public Tristate getPermissionValue(@NonNull ContextSet contexts, @NonNull String node) { try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.INTERNAL_SUBJECT_GET_PERMISSION_VALUE)) { Tristate t = permissionLookupCache.getUnchecked(PermissionLookup.of(node, contexts.makeImmutable())); - service.getPlugin().getDebugHandler().offer("local:" + getParentCollection().getCollection() + "/" + identifier, node, t); + service.getPlugin().getVerboseHandler().offer("local:" + getParentCollection().getCollection() + "/" + identifier, node, t); return t; } }