worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enforce that ContextSets use the HashMultimap variant - closes #208

Browse Source
This commit is contained in:
Luck
2017-03-18 20:18:18 +00:00
Unverified
parent f1a9c3722c
commit bdff84885a
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/common/storage/backing/utils/NodeDataHolder.java
+5 -6
View File
@@ -27,8 +27,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.ImmutableSetMultimap;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -54,18 +53,18 @@ public class NodeDataHolder {
node.getServer().orElse("global"),
node.getWorld().orElse("global"),
node.isTemporary() ? node.getExpiryUnixTime() : 0L,
node.getContexts().toMultimap()
ImmutableSetMultimap.copyOf(node.getContexts().toMultimap())
);
}
public static NodeDataHolder of(String permission, boolean value, String server, String world, long expiry, String contexts) {
Map<String, Collection<String>> deserializedContexts = GSON.fromJson(contexts, CONTEXT_TYPE);
Multimap<String, String> map = HashMultimap.create();
ImmutableSetMultimap.Builder<String, String> map = ImmutableSetMultimap.builder();
for (Map.Entry<String, Collection<String>> e : deserializedContexts.entrySet()) {
map.putAll(e.getKey(), e.getValue());
}
return new NodeDataHolder(permission, value, server, world, expiry, map);
return new NodeDataHolder(permission, value, server, world, expiry, map.build());
}
private final String permission;
@@ -73,7 +72,7 @@ public class NodeDataHolder {
private final String server;
private final String world;
private final long expiry;
private final Multimap<String, String> contexts;
private final ImmutableSetMultimap<String, String> contexts;
public String serialiseContext() {
return GSON.toJson(getContexts().asMap());