flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error logging in case permission is missing during reading

Browse Source
This commit is contained in:
Flemmli97 2021-05-12 20:06:26 +02:00
parent 763439d907
commit 0c3f006611
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/flemmli97/flan/api/PermissionRegistry.java
View File

@ -100,7 +100,7 @@ public class PermissionRegistry {
public static ClaimPermission get(String id) { public static ClaimPermission get(String id) {
if (!permissions.containsKey(id)) if (!permissions.containsKey(id))
throw new NullPointerException("No such permission registered"); throw new NullPointerException("No such permission "+ id + " registered");
return permissions.get(id); return permissions.get(id);
} }

25
src/main/java/com/flemmli97/flan/claim/Claim.java
View File

@ -1,5 +1,6 @@
package com.flemmli97.flan.claim; package com.flemmli97.flan.claim;
import com.flemmli97.flan.Flan;
import com.flemmli97.flan.api.ClaimPermission; import com.flemmli97.flan.api.ClaimPermission;
import com.flemmli97.flan.api.ClaimPermissionEvent; import com.flemmli97.flan.api.ClaimPermissionEvent;
import com.flemmli97.flan.api.PermissionRegistry; import com.flemmli97.flan.api.PermissionRegistry;
@ -475,9 +476,21 @@ public class Claim implements IPermissionContainer {
this.parent = UUID.fromString(obj.get("Parent").getAsString()); this.parent = UUID.fromString(obj.get("Parent").getAsString());
if (obj.has("GlobalPerms")) { if (obj.has("GlobalPerms")) {
if (this.parent == null) { if (this.parent == null) {
obj.getAsJsonArray("GlobalPerms").forEach(perm -> this.globalPerm.put(PermissionRegistry.get(perm.getAsString()), true)); obj.getAsJsonArray("GlobalPerms").forEach(perm -> {
try {
this.globalPerm.put(PermissionRegistry.get(perm.getAsString()), true);
} catch (NullPointerException e) {
Flan.logger.error("Error reading permission {} from json for claim {} belonging to {}. No such permission exist", perm.getAsString(), this.claimID, this.owner);
}
});
} else { } else {
obj.getAsJsonObject("GlobalPerms").entrySet().forEach(entry -> this.globalPerm.put(PermissionRegistry.get(entry.getKey()), entry.getValue().getAsBoolean())); obj.getAsJsonObject("GlobalPerms").entrySet().forEach(entry -> {
try {
this.globalPerm.put(PermissionRegistry.get(entry.getKey()), entry.getValue().getAsBoolean());
} catch (NullPointerException e) {
Flan.logger.error("Error reading permission {} from json for claim {} belonging to {}. No such permission exist", entry.getKey(), this.claimID, this.owner);
}
});
} }
} }
if (obj.has("PermGroup")) { if (obj.has("PermGroup")) {
@ -485,7 +498,13 @@ public class Claim implements IPermissionContainer {
perms.entrySet().forEach(key -> { perms.entrySet().forEach(key -> {
Map<ClaimPermission, Boolean> map = new HashMap<>(); Map<ClaimPermission, Boolean> map = new HashMap<>();
JsonObject group = key.getValue().getAsJsonObject(); JsonObject group = key.getValue().getAsJsonObject();
group.entrySet().forEach(gkey -> map.put(PermissionRegistry.get(gkey.getKey()), gkey.getValue().getAsBoolean())); group.entrySet().forEach(gkey -> {
try {
map.put(PermissionRegistry.get(gkey.getKey()), gkey.getValue().getAsBoolean());
} catch (NullPointerException e) {
Flan.logger.error("Error reading permission {} from json for claim {} belonging to {}. No such permission exist", gkey.getKey(), this.claimID, this.owner);
}
});
this.permissions.put(key.getKey(), map); this.permissions.put(key.getKey(), map);
}); });
} }