From b3e78c6dc1ab611b83126100485d2332f396ea0e Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 20 Nov 2017 15:14:44 +0000 Subject: [PATCH] Fix issue with loading tracks with configurate --- .../luckperms/bukkit/model/LPSubscriptionMap.java | 2 +- .../luckperms/common/assignments/AssignmentRule.java | 4 ++-- .../me/lucko/luckperms/common/config/ConfigKeys.java | 4 ++-- .../common/metastacking/SimpleMetaStack.java | 2 +- .../common/metastacking/StandardStackElements.java | 2 +- .../luckperms/common/storage/StorageFactory.java | 2 +- .../common/storage/dao/file/ConfigurateDao.java | 12 +++++++++--- .../luckperms/common/utils/ImmutableCollectors.java | 6 +++--- .../proxy/api6/PermissionDescriptionProxy.java | 2 +- .../service/proxy/api6/PermissionServiceProxy.java | 4 ++-- .../service/proxy/api6/SubjectCollectionProxy.java | 6 +++--- .../sponge/service/proxy/api6/SubjectDataProxy.java | 10 +++++----- .../sponge/service/proxy/api6/SubjectProxy.java | 4 ++-- .../proxy/api7/PermissionDescriptionProxy.java | 2 +- .../service/proxy/api7/PermissionServiceProxy.java | 4 ++-- .../service/proxy/api7/SubjectCollectionProxy.java | 8 ++++---- .../sponge/service/proxy/api7/SubjectDataProxy.java | 6 +++--- .../sponge/service/model/CompatibilityUtil.java | 2 +- .../luckperms/sponge/commands/SpongeMainCommand.java | 2 +- .../sponge/managers/SpongeGroupManager.java | 6 +++--- .../luckperms/sponge/managers/SpongeUserManager.java | 6 +++--- .../service/persisted/PersistedCollection.java | 4 ++-- 22 files changed, 53 insertions(+), 47 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/LPSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/LPSubscriptionMap.java index 57decba4..74025343 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/LPSubscriptionMap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/LPSubscriptionMap.java @@ -218,7 +218,7 @@ public class LPSubscriptionMap extends HashMap return ret != null ? Maps.immutableEntry(p, ret) : null; }) .filter(Objects::nonNull) - .collect(ImmutableCollectors.toImmutableSet()); + .collect(ImmutableCollectors.toSet()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java b/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java index 7202002b..1bcf2d20 100644 --- a/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java +++ b/common/src/main/java/me/lucko/luckperms/common/assignments/AssignmentRule.java @@ -51,8 +51,8 @@ public class AssignmentRule { this.hasTrueExpression = AssignmentExpression.compile(hasTrueExpression); this.hasFalseExpression = AssignmentExpression.compile(hasFalseExpression); this.lacksExpression = AssignmentExpression.compile(lacksExpression); - this.toGive = toGive.stream().map(s -> LegacyNodeFactory.fromSerializedNode(s, true)).collect(ImmutableCollectors.toImmutableList());; - this.toTake = toTake.stream().map(s -> LegacyNodeFactory.fromSerializedNode(s, true)).collect(ImmutableCollectors.toImmutableList()); + this.toGive = toGive.stream().map(s -> LegacyNodeFactory.fromSerializedNode(s, true)).collect(ImmutableCollectors.toList());; + this.toTake = toTake.stream().map(s -> LegacyNodeFactory.fromSerializedNode(s, true)).collect(ImmutableCollectors.toList()); this.setPrimaryGroup = setPrimaryGroup; } diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java index e4671383..2352da05 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java @@ -241,7 +241,7 @@ public class ConfigKeys { * The configured group weightings */ public static final ConfigKey> GROUP_WEIGHTS = AbstractKey.of(c -> { - return c.getMap("group-weight", ImmutableMap.of()).entrySet().stream().collect(ImmutableCollectors.toImmutableMap( + return c.getMap("group-weight", ImmutableMap.of()).entrySet().stream().collect(ImmutableCollectors.toMap( e -> e.getKey().toLowerCase(), e -> { try { @@ -352,7 +352,7 @@ public class ConfigKeys { List take = ImmutableList.copyOf(c.getList("default-assignments." + name + ".take", ImmutableList.of())); String pg = c.getString("default-assignments." + name + ".set-primary-group", null); return new AssignmentRule(hasTrue, hasFalse, lacks, give, take, pg); - }).collect(ImmutableCollectors.toImmutableList()); + }).collect(ImmutableCollectors.toList()); }); /** diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java index baae07f0..d0b2dd1d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/SimpleMetaStack.java @@ -50,7 +50,7 @@ public final class SimpleMetaStack implements MetaStack { this.targetType = targetType; this.entries = definition.getElements().stream() .map(element -> new SimpleMetaStackEntry(this, element, targetType)) - .collect(ImmutableCollectors.toImmutableList()); + .collect(ImmutableCollectors.toList()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java b/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java index 7b285371..9e7b5ba0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java +++ b/common/src/main/java/me/lucko/luckperms/common/metastacking/StandardStackElements.java @@ -110,7 +110,7 @@ public class StandardStackElements { .map(s -> parseFromString(plugin, s)) .filter(Optional::isPresent) .map(Optional::get) - .collect(ImmutableCollectors.toImmutableList()); + .collect(ImmutableCollectors.toList()); } /** diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java index f8e75962..8435ae1e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/StorageFactory.java @@ -68,7 +68,7 @@ public class StorageFactory { Set neededTypes = new HashSet<>(); neededTypes.addAll(types.values()); - return neededTypes.stream().map(StorageType::parse).collect(ImmutableCollectors.toImmutableSet()); + return neededTypes.stream().map(StorageType::parse).collect(ImmutableCollectors.toSet()); } else { String method = plugin.getConfiguration().get(ConfigKeys.STORAGE_METHOD); StorageType type = StorageType.parse(method); diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/dao/file/ConfigurateDao.java b/common/src/main/java/me/lucko/luckperms/common/storage/dao/file/ConfigurateDao.java index 535a22d5..84ddc4bf 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/dao/file/ConfigurateDao.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/dao/file/ConfigurateDao.java @@ -29,7 +29,6 @@ import lombok.Getter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.reflect.TypeToken; import me.lucko.luckperms.api.HeldPermission; import me.lucko.luckperms.api.LogEntry; @@ -53,6 +52,7 @@ import me.lucko.luckperms.common.references.UserIdentifier; import me.lucko.luckperms.common.storage.dao.AbstractDao; import me.lucko.luckperms.common.storage.dao.legacy.LegacyJsonMigration; import me.lucko.luckperms.common.storage.dao.legacy.LegacyYamlMigration; +import me.lucko.luckperms.common.utils.ImmutableCollectors; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.SimpleConfigurationNode; @@ -628,7 +628,10 @@ public abstract class ConfigurateDao extends AbstractDao { ConfigurationNode object = readFile(StorageLocation.TRACK, name); if (object != null) { - List groups = object.getNode("groups").getList(TypeToken.of(String.class)); + List groups = object.getNode("groups").getChildrenList().stream() + .map(ConfigurationNode::getString) + .collect(ImmutableCollectors.toList()); + track.setGroups(groups); } else { ConfigurationNode data = SimpleConfigurationNode.root(); @@ -664,7 +667,10 @@ public abstract class ConfigurateDao extends AbstractDao { track.getIoLock().lock(); } - List groups = object.getNode("groups").getList(TypeToken.of(String.class)); + List groups = object.getNode("groups").getChildrenList().stream() + .map(ConfigurationNode::getString) + .collect(ImmutableCollectors.toList()); + track.setGroups(groups); } catch (Exception e) { diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java b/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java index ed34125f..ca2908e6 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/ImmutableCollectors.java @@ -51,17 +51,17 @@ public class ImmutableCollectors { ImmutableSet.Builder::build ); - public static Collector, ImmutableList> toImmutableList() { + public static Collector, ImmutableList> toList() { //noinspection unchecked return (Collector) LIST; } - public static Collector, ImmutableSet> toImmutableSet() { + public static Collector, ImmutableSet> toSet() { //noinspection unchecked return (Collector) SET; } - public static Collector, ImmutableMap> toImmutableMap(Function keyMapper, Function valueMapper) { + public static Collector, ImmutableMap> toMap(Function keyMapper, Function valueMapper) { return Collector.of( ImmutableMap.Builder::new, (r, t) -> r.put(keyMapper.apply(t), valueMapper.apply(t)), diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java index d2b38764..9aff7944 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java @@ -62,7 +62,7 @@ public class PermissionDescriptionProxy implements PermissionDescription { @Override public Map getAssignedSubjects(String s) { return handle.getAssignedSubjects(s).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> new SubjectProxy(service, e.getKey().toReference()), Map.Entry::getValue )); diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java index 14b63b65..b74d2414 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java @@ -70,7 +70,7 @@ public class PermissionServiceProxy implements PermissionService { @Override public Map getKnownSubjects() { return handle.getLoadedCollections().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( Map.Entry::getKey, e -> e.getValue().sponge() )); @@ -93,7 +93,7 @@ public class PermissionServiceProxy implements PermissionService { @Override public Collection getDescriptions() { - return handle.getDescriptions().stream().map(LPPermissionDescription::sponge).collect(ImmutableCollectors.toImmutableSet()); + return handle.getDescriptions().stream().map(LPPermissionDescription::sponge).collect(ImmutableCollectors.toSet()); } @Override diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java index 3b87c792..9479603b 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java @@ -72,7 +72,7 @@ public class SubjectCollectionProxy implements SubjectCollection { return (List) handle.getAllIdentifiers() .thenApply(ids -> ids.stream() .map(s -> new SubjectProxy(service, service.newSubjectReference(getIdentifier(), s))) - .collect(ImmutableCollectors.toImmutableList()) + .collect(ImmutableCollectors.toList()) ).join(); } @@ -81,7 +81,7 @@ public class SubjectCollectionProxy implements SubjectCollection { // again, these methods will lazily load subjects. return (Map) handle.getAllWithPermission(s) .thenApply(map -> map.entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> new SubjectProxy(service, e.getKey()), Map.Entry::getValue )) @@ -92,7 +92,7 @@ public class SubjectCollectionProxy implements SubjectCollection { public Map getAllWithPermission(Set set, String s) { return (Map) handle.getAllWithPermission(CompatibilityUtil.convertContexts(set), s) .thenApply(map -> map.entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> new SubjectProxy(service, e.getKey()), Map.Entry::getValue )) diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java index 5ee694a3..857fe511 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java @@ -59,7 +59,7 @@ public class SubjectDataProxy implements SubjectData { public Map, Map> getAllPermissions() { return (Map) getHandle().thenApply(handle -> { return handle.getAllPermissions().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), Map.Entry::getValue )); @@ -96,11 +96,11 @@ public class SubjectDataProxy implements SubjectData { @Override public Map, List> getAllParents() { return (Map) getHandle().thenApply(handle -> handle.getAllParents().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), e -> e.getValue().stream() .map(s -> new SubjectProxy(service, s)) - .collect(ImmutableCollectors.toImmutableList()) + .collect(ImmutableCollectors.toList()) ) )).join(); } @@ -109,7 +109,7 @@ public class SubjectDataProxy implements SubjectData { public List getParents(Set contexts) { return (List) getHandle().thenApply(handle -> handle.getParents(CompatibilityUtil.convertContexts(contexts)).stream() .map(s -> new SubjectProxy(service, s)) - .collect(ImmutableCollectors.toImmutableList())).join(); + .collect(ImmutableCollectors.toList())).join(); } @Override @@ -151,7 +151,7 @@ public class SubjectDataProxy implements SubjectData { @Override public Map, Map> getAllOptions() { return (Map) getHandle().thenApply(handle -> handle.getAllOptions().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), Map.Entry::getValue ))).join(); diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java index fa374c0e..1446456a 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java @@ -117,14 +117,14 @@ public class SubjectProxy implements Subject { public List getParents() { return (List) getHandle().thenApply(handle -> handle.getParents(ImmutableContextSet.empty()).stream() .map(s -> new SubjectProxy(service, s)) - .collect(ImmutableCollectors.toImmutableList())).join(); + .collect(ImmutableCollectors.toList())).join(); } @Override public List getParents(Set contexts) { return (List) getHandle().thenApply(handle -> handle.getParents(CompatibilityUtil.convertContexts(contexts)).stream() .map(s -> new SubjectProxy(service, s)) - .collect(ImmutableCollectors.toImmutableList())).join(); + .collect(ImmutableCollectors.toList())).join(); } @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java index 14822ad8..5be78af2 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java @@ -64,7 +64,7 @@ public class PermissionDescriptionProxy implements PermissionDescription { @Override public Map getAssignedSubjects(String s) { return handle.getAssignedSubjects(s).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> new SubjectProxy(service, e.getKey().toReference()), Map.Entry::getValue )); diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java index e669a0e6..1e1c0efa 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java @@ -92,7 +92,7 @@ public class PermissionServiceProxy implements PermissionService { @Override public Map getLoadedCollections() { return handle.getLoadedCollections().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( Map.Entry::getKey, e -> e.getValue().sponge() )); @@ -125,7 +125,7 @@ public class PermissionServiceProxy implements PermissionService { @Override public Collection getDescriptions() { - return handle.getDescriptions().stream().map(LPPermissionDescription::sponge).collect(ImmutableCollectors.toImmutableSet()); + return handle.getDescriptions().stream().map(LPPermissionDescription::sponge).collect(ImmutableCollectors.toSet()); } @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java index c01cb7d7..2d923d95 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java @@ -76,12 +76,12 @@ public class SubjectCollectionProxy implements SubjectCollection { @Override public CompletableFuture> loadSubjects(Set set) { - return handle.loadSubjects(set).thenApply(subs -> subs.stream().collect(ImmutableCollectors.toImmutableMap(LPSubject::getIdentifier, LPSubject::sponge))); + return handle.loadSubjects(set).thenApply(subs -> subs.stream().collect(ImmutableCollectors.toMap(LPSubject::getIdentifier, LPSubject::sponge))); } @Override public Collection getLoadedSubjects() { - return handle.getLoadedSubjects().stream().map(LPSubject::sponge).collect(ImmutableCollectors.toImmutableSet()); + return handle.getLoadedSubjects().stream().map(LPSubject::sponge).collect(ImmutableCollectors.toSet()); } @Override @@ -107,7 +107,7 @@ public class SubjectCollectionProxy implements SubjectCollection { @Override public Map getLoadedWithPermission(String s) { return handle.getLoadedWithPermission(s).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( sub -> sub.getKey().sponge(), Map.Entry::getValue )); @@ -116,7 +116,7 @@ public class SubjectCollectionProxy implements SubjectCollection { @Override public Map getLoadedWithPermission(Set set, String s) { return handle.getLoadedWithPermission(CompatibilityUtil.convertContexts(set), s).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( sub -> sub.getKey().sponge(), Map.Entry::getValue )); diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java index c45259ae..287b9353 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java @@ -60,7 +60,7 @@ public class SubjectDataProxy implements SubjectData { @Override public Map, Map> getAllPermissions() { return (Map) getHandle().thenApply(handle -> handle.getAllPermissions().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), Map.Entry::getValue ))).join(); @@ -93,7 +93,7 @@ public class SubjectDataProxy implements SubjectData { @Override public Map, List> getAllParents() { return (Map) getHandle().thenApply(handle -> handle.getAllParents().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), Map.Entry::getValue ))).join(); @@ -127,7 +127,7 @@ public class SubjectDataProxy implements SubjectData { @Override public Map, Map> getAllOptions() { return (Map) getHandle().thenApply(handle -> handle.getAllOptions().entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap( + .collect(ImmutableCollectors.toMap( e -> CompatibilityUtil.convertContexts(e.getKey()), Map.Entry::getValue ))).join(); diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/CompatibilityUtil.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/CompatibilityUtil.java index b5bdafad..d0ab8e58 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/CompatibilityUtil.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/CompatibilityUtil.java @@ -53,7 +53,7 @@ public class CompatibilityUtil { private static final LoadingCache> LP_TO_SPONGE_CACHE = Caffeine.newBuilder() .expireAfterAccess(10, TimeUnit.MINUTES) - .build(set -> set.toSet().stream().map(e -> new Context(e.getKey(), e.getValue())).collect(ImmutableCollectors.toImmutableSet())); + .build(set -> set.toSet().stream().map(e -> new Context(e.getKey(), e.getValue())).collect(ImmutableCollectors.toSet())); public static ImmutableContextSet convertContexts(@NonNull Set contexts) { return SPONGE_TO_LP_CACHE.get(ImmutableSet.copyOf(contexts)); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java index 212ce222..ca17b116 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/commands/SpongeMainCommand.java @@ -222,7 +222,7 @@ public class SpongeMainCommand extends Command { } public List> getSubCommands() { - return subCommands.values().stream().flatMap(List::stream).collect(ImmutableCollectors.toImmutableList()); + return subCommands.values().stream().flatMap(List::stream).collect(ImmutableCollectors.toList()); } @Override diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java index 762e9550..3af69645 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java @@ -221,7 +221,7 @@ public class SpongeGroupManager implements GroupManager, LPSubjectCollection { @Override public ImmutableCollection getLoadedSubjects() { - return getAll().values().stream().map(SpongeGroup::sponge).collect(ImmutableCollectors.toImmutableSet()); + return getAll().values().stream().map(SpongeGroup::sponge).collect(ImmutableCollectors.toSet()); } @Override @@ -267,7 +267,7 @@ public class SpongeGroupManager implements GroupManager, LPSubjectCollection { .map(SpongeGroup::sponge) .map(sub -> Maps.immutableEntry(sub, sub.getPermissionValue(ImmutableContextSet.empty(), permission))) .filter(pair -> pair.getValue() != Tristate.UNDEFINED) - .collect(ImmutableCollectors.toImmutableMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); + .collect(ImmutableCollectors.toMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); } @Override @@ -276,7 +276,7 @@ public class SpongeGroupManager implements GroupManager, LPSubjectCollection { .map(SpongeGroup::sponge) .map(sub -> Maps.immutableEntry(sub, sub.getPermissionValue(contexts, permission))) .filter(pair -> pair.getValue() != Tristate.UNDEFINED) - .collect(ImmutableCollectors.toImmutableMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); + .collect(ImmutableCollectors.toMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); } @Override diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java index c69fb89f..4dec9322 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java @@ -311,7 +311,7 @@ public class SpongeUserManager implements UserManager, LPSubjectCollection { @Override public ImmutableCollection getLoadedSubjects() { - return getAll().values().stream().map(SpongeUser::sponge).collect(ImmutableCollectors.toImmutableSet()); + return getAll().values().stream().map(SpongeUser::sponge).collect(ImmutableCollectors.toSet()); } @Override @@ -364,7 +364,7 @@ public class SpongeUserManager implements UserManager, LPSubjectCollection { .map(SpongeUser::sponge) .map(sub -> Maps.immutableEntry(sub, sub.getPermissionValue(ImmutableContextSet.empty(), permission))) .filter(pair -> pair.getValue() != Tristate.UNDEFINED) - .collect(ImmutableCollectors.toImmutableMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); + .collect(ImmutableCollectors.toMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); } @Override @@ -373,7 +373,7 @@ public class SpongeUserManager implements UserManager, LPSubjectCollection { .map(SpongeUser::sponge) .map(sub -> Maps.immutableEntry(sub, sub.getPermissionValue(contexts, permission))) .filter(pair -> pair.getValue() != Tristate.UNDEFINED) - .collect(ImmutableCollectors.toImmutableMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); + .collect(ImmutableCollectors.toMap(Map.Entry::getKey, sub -> sub.getValue().asBoolean())); } @Override diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java index 009a16af..1dfe77b7 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedCollection.java @@ -130,13 +130,13 @@ public class PersistedCollection implements LPSubjectCollection { @Override public CompletableFuture> getAllWithPermission(String permission) { return CompletableFuture.completedFuture(getLoadedWithPermission(permission).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap(e -> e.getKey().toReference(), Map.Entry::getValue))); + .collect(ImmutableCollectors.toMap(e -> e.getKey().toReference(), Map.Entry::getValue))); } @Override public CompletableFuture> getAllWithPermission(ImmutableContextSet contexts, String permission) { return CompletableFuture.completedFuture(getLoadedWithPermission(contexts, permission).entrySet().stream() - .collect(ImmutableCollectors.toImmutableMap(e -> e.getKey().toReference(), Map.Entry::getValue))); + .collect(ImmutableCollectors.toMap(e -> e.getKey().toReference(), Map.Entry::getValue))); } @Override