From f96518b8e4c8eba2e99dd2daf6b4e045937c0bba Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 7 Oct 2018 19:48:20 +0100 Subject: [PATCH] misc tidying --- .../bungee/contexts/BungeeContextManager.java | 5 ----- .../contexts/ContextSetConfigurateSerializer.java | 10 +++++----- .../common/contexts/ContextSetJsonSerializer.java | 10 +++++----- .../luckperms/common/contexts/ContextsSupplier.java | 4 +++- .../common/managers/user/UserHousekeeper.java | 2 +- .../common/messaging/redis/RedisMessenger.java | 8 ++++---- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java b/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java index f0972c7c..2aa5ebfa 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/BungeeContextManager.java @@ -90,10 +90,5 @@ public class BungeeContextManager extends ContextManager { public Contexts getContexts() { return this.contextsCache.get(this.key); } - - @Override - public ImmutableContextSet getContextSet() { - return getContexts().getContexts().makeImmutable(); - } } } diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java index 11996361..757bb648 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetConfigurateSerializer.java @@ -44,16 +44,16 @@ public final class ContextSetConfigurateSerializer { ConfigurationNode data = SimpleConfigurationNode.root(); Map> map = contextSet.toMultimap().asMap(); - map.forEach((k, v) -> { - List values = new ArrayList<>(v); + for (Map.Entry> entry : map.entrySet()) { + List values = new ArrayList<>(entry.getValue()); int size = values.size(); if (size == 1) { - data.getNode(k).setValue(values.get(0)); + data.getNode(entry.getKey()).setValue(values.get(0)); } else if (size > 1) { - data.getNode(k).setValue(values); + data.getNode(entry.getKey()).setValue(values); } - }); + } return data; } diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java index 42a7b05d..38ad4469 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextSetJsonSerializer.java @@ -47,20 +47,20 @@ public final class ContextSetJsonSerializer { JsonObject data = new JsonObject(); Map> map = contextSet.toMultimap().asMap(); - map.forEach((k, v) -> { - List values = new ArrayList<>(v); + for (Map.Entry> entry : map.entrySet()) { + List values = new ArrayList<>(entry.getValue()); int size = values.size(); if (size == 1) { - data.addProperty(k, values.get(0)); + data.addProperty(entry.getKey(), values.get(0)); } else if (size > 1) { JsonArray arr = new JsonArray(); for (String s : values) { arr.add(new JsonPrimitive(s)); } - data.add(k, arr); + data.add(entry.getKey(), arr); } - }); + } return data; } diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java index 53caec97..b87c4d6f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java +++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextsSupplier.java @@ -35,6 +35,8 @@ public interface ContextsSupplier { Contexts getContexts(); - ImmutableContextSet getContextSet(); + default ImmutableContextSet getContextSet() { + return getContexts().getContexts().makeImmutable(); + } } diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java b/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java index 222a89f5..1ce8316b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java +++ b/common/src/main/java/me/lucko/luckperms/common/managers/user/UserHousekeeper.java @@ -92,7 +92,7 @@ public class UserHousekeeper implements Runnable { private final long duration; private final TimeUnit unit; - private TimeoutSettings(long duration, TimeUnit unit) { + TimeoutSettings(long duration, TimeUnit unit) { this.duration = duration; this.unit = unit; } diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java index 2f1e0818..3cce3759 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java @@ -47,7 +47,7 @@ public class RedisMessenger implements Messenger { private final IncomingMessageConsumer consumer; private JedisPool jedisPool; - private LPSub sub; + private Subscription sub; public RedisMessenger(LuckPermsPlugin plugin, IncomingMessageConsumer consumer) { this.plugin = plugin; @@ -66,7 +66,7 @@ public class RedisMessenger implements Messenger { } this.plugin.getBootstrap().getScheduler().executeAsync(() -> { - this.sub = new LPSub(this); + this.sub = new Subscription(this); try (Jedis jedis = this.jedisPool.getResource()) { jedis.subscribe(this.sub, CHANNEL); } catch (Exception e) { @@ -90,10 +90,10 @@ public class RedisMessenger implements Messenger { this.jedisPool.destroy(); } - private static class LPSub extends JedisPubSub { + private static class Subscription extends JedisPubSub { private final RedisMessenger parent; - public LPSub(RedisMessenger parent) { + private Subscription(RedisMessenger parent) { this.parent = parent; }