Move #refreshCachedData up the type hierarchy into PermissionHolder

This commit is contained in:
Luck
2017-11-08 22:59:22 +00:00
Unverified
parent a115ff8ce2
commit 14005563a3
7 changed files with 19 additions and 32 deletions
@@ -35,7 +35,6 @@ import me.lucko.luckperms.api.Group;
import me.lucko.luckperms.api.caching.GroupData;
import java.util.OptionalInt;
import java.util.concurrent.CompletableFuture;
public final class ApiGroup extends ApiPermissionHolder implements Group {
public static me.lucko.luckperms.common.model.Group cast(Group g) {
@@ -66,11 +65,6 @@ public final class ApiGroup extends ApiPermissionHolder implements Group {
return handle.getCachedData();
}
@Override
public CompletableFuture<Void> refreshCachedData() {
return handle.getRefreshBuffer().request();
}
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof ApiGroup)) return false;
@@ -52,6 +52,7 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate;
@AllArgsConstructor
@@ -77,6 +78,11 @@ public class ApiPermissionHolder implements PermissionHolder {
return handle.getCachedData();
}
@Override
public CompletableFuture<Void> refreshCachedData() {
return handle.getRefreshBuffer().request();
}
@Override
public ImmutableSetMultimap<ImmutableContextSet, Node> getNodes() {
return handle.getEnduringNodes();
@@ -35,7 +35,6 @@ import me.lucko.luckperms.api.User;
import me.lucko.luckperms.api.caching.UserData;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
public final class ApiUser extends ApiPermissionHolder implements User {
public static me.lucko.luckperms.common.model.User cast(User u) {
@@ -85,11 +84,6 @@ public final class ApiUser extends ApiPermissionHolder implements User {
return handle.getCachedData();
}
@Override
public CompletableFuture<Void> refreshCachedData() {
return handle.getRefreshBuffer().request();
}
@Override
@Deprecated
public void refreshPermissions() {
@@ -46,6 +46,7 @@ import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.api.delegates.model.ApiPermissionHolder;
import me.lucko.luckperms.common.buffers.BufferedRequest;
import me.lucko.luckperms.common.buffers.Cache;
import me.lucko.luckperms.common.caching.HolderCache;
import me.lucko.luckperms.common.caching.MetaAccumulator;
@@ -258,6 +259,8 @@ public abstract class PermissionHolder {
*/
public abstract HolderCache<?> getCachedData();
public abstract BufferedRequest<Void> getRefreshBuffer();
/**
* Forms a HolderReference for this PermissionHolder.
*