From 527f76ac6b04a654b2bc439e2a1e43801a8f3331 Mon Sep 17 00:00:00 2001 From: Tux Date: Fri, 30 May 2014 23:57:42 -0400 Subject: [PATCH] Ran inspections on code. Fixed compile errors. --- .../imaginarycode/minecraft/redisbungee/RedisBungee.java | 2 +- .../minecraft/redisbungee/RedisBungeeCommandSender.java | 2 +- .../minecraft/redisbungee/RedisBungeeCommands.java | 8 ++++---- .../minecraft/redisbungee/RedisBungeeConsumer.java | 2 +- .../minecraft/redisbungee/RedisBungeeListener.java | 6 +++--- .../imaginarycode/minecraft/redisbungee/RedisUtil.java | 2 +- .../minecraft/redisbungee/util/NameFetcher.java | 2 +- .../minecraft/redisbungee/util/UUIDFetcher.java | 2 +- .../minecraft/redisbungee/util/UUIDTranslator.java | 5 ++--- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java index 4136e24..05a3549 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java @@ -512,7 +512,7 @@ public final class RedisBungee extends Plugin { } class JedisPubSubHandler extends JedisPubSub { - private ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("RedisBungee PubSub Handler - #%d").build()); + private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("RedisBungee PubSub Handler - #%d").build()); @Override public void onMessage(final String s, final String s2) { diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommandSender.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommandSender.java index a545ed4..ec9b6fb 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommandSender.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommandSender.java @@ -23,7 +23,7 @@ import java.util.Collections; * @since 0.2.3 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class RedisBungeeCommandSender implements CommandSender { +class RedisBungeeCommandSender implements CommandSender { static final RedisBungeeCommandSender instance = new RedisBungeeCommandSender(); @Override diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommands.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommands.java index 27792a0..5c28521 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommands.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeCommands.java @@ -60,7 +60,7 @@ class RedisBungeeCommands { Multimap serverToPlayers = RedisBungee.getApi().getServerToPlayers(); Multimap human = HashMultimap.create(); for (Map.Entry entry : serverToPlayers.entries()) { - human.put(entry.getKey(), plugin.getUuidTranslator().getNameFromUuid(entry.getValue())); + human.put(entry.getKey(), plugin.getUuidTranslator().getNameFromUuid(entry.getValue(), false)); } for (String server : new TreeSet<>(serverToPlayers.keySet())) { TextComponent serverName = new TextComponent(); @@ -102,7 +102,7 @@ class RedisBungeeCommands { @Override public void run() { if (args.length > 0) { - UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); + UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true); if (uuid == null) { sender.sendMessage(PLAYER_NOT_FOUND); return; @@ -138,7 +138,7 @@ class RedisBungeeCommands { @Override public void run() { if (args.length > 0) { - UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); + UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true); if (uuid == null) { sender.sendMessage(PLAYER_NOT_FOUND); return; @@ -178,7 +178,7 @@ class RedisBungeeCommands { @Override public void run() { if (args.length > 0) { - UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0]); + UUID uuid = plugin.getUuidTranslator().getTranslatedUuid(args[0], true); if (uuid == null) { sender.sendMessage(PLAYER_NOT_FOUND); return; diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java index 3474cfb..a5be626 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java @@ -19,7 +19,7 @@ import java.util.concurrent.LinkedBlockingQueue; @RequiredArgsConstructor public class RedisBungeeConsumer implements Runnable { private final RedisBungee plugin; - private BlockingQueue consumerQueue = new LinkedBlockingQueue<>(); + private final BlockingQueue consumerQueue = new LinkedBlockingQueue<>(); private boolean stopped = false; @Override diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java index e202351..da947fd 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java @@ -68,7 +68,7 @@ public class RedisBungeeListener implements Listener { ServerPing.PlayerInfo[] info = new ServerPing.PlayerInfo[players.size()]; int idx = 0; for (UUID player : players) { - info[idx] = new ServerPing.PlayerInfo(plugin.getUuidTranslator().getNameFromUuid(player), ""); + info[idx] = new ServerPing.PlayerInfo(plugin.getUuidTranslator().getNameFromUuid(player, false), ""); idx++; } reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), players.size(), info)); @@ -110,7 +110,7 @@ public class RedisBungeeListener implements Listener { } Set players = new HashSet<>(); for (UUID uuid : original) - players.add(plugin.getUuidTranslator().getNameFromUuid(uuid)); + players.add(plugin.getUuidTranslator().getNameFromUuid(uuid, false)); out.writeUTF(Joiner.on(',').join(players)); break; case "PlayerCount": @@ -133,7 +133,7 @@ public class RedisBungeeListener implements Listener { String user = in.readUTF(); out.writeUTF("LastOnline"); out.writeUTF(user); - out.writeLong(plugin.getLastOnline(plugin.getUuidTranslator().getTranslatedUuid(user))); + out.writeLong(plugin.getLastOnline(plugin.getUuidTranslator().getTranslatedUuid(user, true))); break; default: break; diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java index e5fbf1a..ae47648 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java @@ -8,7 +8,7 @@ package com.imaginarycode.minecraft.redisbungee; import redis.clients.jedis.Jedis; -public class RedisUtil { +class RedisUtil { public static void cleanUpPlayer(String player, Jedis rsc) { rsc.srem("server:" + RedisBungee.getApi().getServerId() + ":usersOnline", player); rsc.hdel("player:" + player, "server"); diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/NameFetcher.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/NameFetcher.java index 754c982..7fb9870 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/NameFetcher.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/NameFetcher.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.concurrent.Callable; /* Credits to evilmidget38 for this class. I modified it to use Gson. */ -public class NameFetcher implements Callable> { +class NameFetcher implements Callable> { private static final String PROFILE_URL = "https://sessionserver.mojang.com/session/minecraft/profile/"; private final List uuids; diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDFetcher.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDFetcher.java index d65f7ec..f5dd253 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDFetcher.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDFetcher.java @@ -18,7 +18,7 @@ import java.util.*; import java.util.concurrent.Callable; /* Credits to evilmidget38 for this class. I modified it to use Gson. */ -public class UUIDFetcher implements Callable> { +class UUIDFetcher implements Callable> { private static final double PROFILES_PER_REQUEST = 100; private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft"; private final List names; diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java index e01d527..3d948b1 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java @@ -9,7 +9,6 @@ package com.imaginarycode.minecraft.redisbungee.util; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import com.google.common.collect.Maps; import com.imaginarycode.minecraft.redisbungee.RedisBungee; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -30,8 +29,8 @@ public class UUIDTranslator { private final RedisBungee plugin; private final BiMap uuidMap = HashBiMap.create(); private final ReadWriteLock lock = new ReentrantReadWriteLock(); - public static final Pattern UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"); - public static final Pattern MOJANGIAN_UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{32}"); + private static final Pattern UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"); + private static final Pattern MOJANGIAN_UUID_PATTERN = Pattern.compile("[a-fA-F0-9]{32}"); public UUID getTranslatedUuid(@NonNull String player, boolean expensiveLookups) { if (ProxyServer.getInstance().getPlayer(player) != null)