From 6b3aab66bf54694cf84b471d89a09502dafa932f Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 22 Oct 2016 09:35:11 +0100 Subject: [PATCH] Fix some #saveX methods being waited for, when they can just be ran async --- .../migration/subcommands/MigrationBPermissions.java | 4 ++-- .../migration/subcommands/MigrationBungeePerms.java | 4 ++-- .../migration/subcommands/MigrationGroupManager.java | 6 +++--- .../migration/subcommands/MigrationPermissionsEx.java | 4 ++-- .../migration/subcommands/MigrationPowerfulPerms.java | 6 +++--- .../migration/subcommands/MigrationZPermissions.java | 6 +++--- .../commands/usersbulkedit/subcommands/BulkEditGroup.java | 2 +- .../usersbulkedit/subcommands/BulkEditPermission.java | 2 +- .../luckperms/common/runnables/ExpireTemporaryTask.java | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java index d439ffaf5..410f77941 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBPermissions.java @@ -133,7 +133,7 @@ public class MigrationBPermissions extends SubCommand { } migrateHolder(plugin, world, group, lpGroup); - plugin.getDatastore().saveGroup(lpGroup).getOrDefault(false); + plugin.getDatastore().saveGroup(lpGroup); } log.info("bPermissions Migration: Migrated " + groupCount + " groups in world " + world.getName() + "."); @@ -162,7 +162,7 @@ public class MigrationBPermissions extends SubCommand { migrateHolder(plugin, world, user, lpUser); - plugin.getDatastore().saveUser(lpUser).getOrDefault(false); + plugin.getDatastore().saveUser(lpUser); plugin.getUserManager().cleanup(lpUser); } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java index 22b6eb9d3..4c2741d41 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationBungeePerms.java @@ -173,7 +173,7 @@ public class MigrationBungeePerms extends SubCommand { } } - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); } log.info("BungeePerms Migration: Migrated " + groupCount + " groups"); @@ -288,7 +288,7 @@ public class MigrationBungeePerms extends SubCommand { } } - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java index e5e84a321..d9e00d3e9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationGroupManager.java @@ -121,7 +121,7 @@ public class MigrationGroupManager extends SubCommand { } } - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); } Map, Boolean>> users = new HashMap<>(); @@ -241,7 +241,7 @@ public class MigrationGroupManager extends SubCommand { } } - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); } for (Map.Entry, Boolean>> e : users.entrySet()) { @@ -275,7 +275,7 @@ public class MigrationGroupManager extends SubCommand { } } - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java index 5a9cb5cd6..c9eb9ad14 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPermissionsEx.java @@ -226,7 +226,7 @@ public class MigrationPermissionsEx extends SubCommand { } } - plugin.getDatastore().saveGroup(lpGroup).getOrDefault(false); + plugin.getDatastore().saveGroup(lpGroup); } @@ -387,7 +387,7 @@ public class MigrationPermissionsEx extends SubCommand { } plugin.getUserManager().cleanup(lpUser); - plugin.getDatastore().saveUser(lpUser).getOrDefault(false); + plugin.getDatastore().saveUser(lpUser); } log.info("PermissionsEx Migration: Migrated " + userCount + " users."); diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java index aed259b06..3cbd7f250 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationPowerfulPerms.java @@ -275,7 +275,7 @@ public class MigrationPowerfulPerms extends SubCommand { } } - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); } log.info("PowerfulPerms Migration: Group migration complete."); @@ -299,7 +299,7 @@ public class MigrationPowerfulPerms extends SubCommand { synchronized (progress) { progress.get(uuid).countDown(); if (progress.get(uuid).getCount() == 0) { - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); } } @@ -422,7 +422,7 @@ public class MigrationPowerfulPerms extends SubCommand { synchronized (progress) { progress.get(uuid).countDown(); if (progress.get(uuid).getCount() == 0) { - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); } } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java index 6c942b3a8..e9838ab97 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/migration/subcommands/MigrationZPermissions.java @@ -115,7 +115,7 @@ public class MigrationZPermissions extends SubCommand { } } - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); } // Migrate all tracks @@ -144,7 +144,7 @@ public class MigrationZPermissions extends SubCommand { } } - plugin.getDatastore().saveTrack(track).getOrDefault(false); + plugin.getDatastore().saveTrack(track); } // Migrate all users. @@ -243,7 +243,7 @@ public class MigrationZPermissions extends SubCommand { } plugin.getUserManager().cleanup(user); - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); } log.info("zPermissions Migration: Success! Completed without any errors."); diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java index 26a88db37..722ac1ef8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditGroup.java @@ -137,8 +137,8 @@ public class BulkEditGroup extends SubCommand { } catch (ObjectAlreadyHasException ignored) {} }); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); - plugin.getDatastore().saveUser(user).getOrDefault(false); } Message.BULK_CHANGE_SUCCESS.send(sender, uuids.size()); diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java index 928f3c531..e389e992c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/usersbulkedit/subcommands/BulkEditPermission.java @@ -127,8 +127,8 @@ public class BulkEditPermission extends SubCommand { } catch (ObjectAlreadyHasException ignored) {} }); + plugin.getDatastore().saveUser(user); plugin.getUserManager().cleanup(user); - plugin.getDatastore().saveUser(user).getOrDefault(false); } Message.BULK_CHANGE_SUCCESS.send(sender, uuids.size()); diff --git a/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java b/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java index 5a5ee1587..c928dc1e4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/runnables/ExpireTemporaryTask.java @@ -36,14 +36,14 @@ public class ExpireTemporaryTask implements Runnable { boolean groupChanges = false; for (Group group : plugin.getGroupManager().getAll().values()) { if (group.auditTemporaryPermissions()) { - plugin.getDatastore().saveGroup(group).getOrDefault(false); + plugin.getDatastore().saveGroup(group); groupChanges = true; } } for (User user : plugin.getUserManager().getAll().values()) { if (user.auditTemporaryPermissions()) { - plugin.getDatastore().saveUser(user).getOrDefault(false); + plugin.getDatastore().saveUser(user); if (!groupChanges) { user.getRefreshBuffer().request(); }