From ee2de3cff1ca07ebc744fd901bfb4b23177fb8ef Mon Sep 17 00:00:00 2001 From: MrMicky Date: Tue, 9 Oct 2018 19:00:53 +0200 Subject: [PATCH] Some minor code cleanup (#1262) --- .../bukkit/migration/MigrationBPermissions.java | 6 +++--- .../luckperms/common/actionlog/ExtendedLogEntry.java | 3 +-- .../me/lucko/luckperms/common/backup/Importer.java | 10 ++++------ .../common/command/tabcomplete/TabCompletions.java | 2 +- .../lucko/luckperms/common/commands/log/LogSearch.java | 3 +-- .../luckperms/common/commands/misc/VerboseCommand.java | 2 +- .../java/me/lucko/luckperms/common/model/User.java | 2 +- .../luckperms/sponge/managers/SpongeUserManager.java | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java index 861a53b8..5a7be19d 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java @@ -116,10 +116,10 @@ public class MigrationBPermissions extends SubCommand { return CommandResult.FAILURE; } AtomicInteger userLoadCount = new AtomicInteger(0); - users.forEach(s -> { - world.loadOne(s, CalculableType.USER); + for (String user : users) { + world.loadOne(user, CalculableType.USER); log.logProgress("Forcefully loaded {} users so far.", userLoadCount.incrementAndGet()); - }); + } } log.log("Forcefully loaded all users."); diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java index db0cfcf9..32f8909d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/ExtendedLogEntry.java @@ -46,7 +46,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; /** * An implementation of {@link LogEntry} and {@link LogEntry.Builder}, @@ -331,7 +330,7 @@ public class ExtendedLogEntry implements LogEntry { } } - action(parts.stream().collect(Collectors.joining(" "))); + action(String.join(" ", parts)); return this; } diff --git a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java index 00dc4686..44819410 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java @@ -165,7 +165,7 @@ public class Importer implements Runnable { executor.shutdown(); long endTime = System.currentTimeMillis(); - double seconds = (endTime - startTime) / 1000; + double seconds = (endTime - startTime) / 1000.0; int errors = (int) this.commands.stream().filter(v -> v.getResult().wasFailure()).count(); @@ -184,13 +184,11 @@ public class Importer implements Runnable { AtomicInteger errIndex = new AtomicInteger(1); for (ImportCommand e : this.commands) { if (e.getResult() != null && e.getResult().wasFailure()) { - this.notify.forEach(s -> { + for (Sender s : notify) { Message.IMPORT_END_ERROR_HEADER.send(s, errIndex.get(), e.getId(), e.getCommand(), e.getResult().toString()); - for (String out : e.getOutput()) { - Message.IMPORT_END_ERROR_CONTENT.send(s, out); - } + e.getOutput().forEach(out -> Message.IMPORT_END_ERROR_CONTENT.send(s, out)); Message.IMPORT_END_ERROR_FOOTER.send(s); - }); + } errIndex.incrementAndGet(); } diff --git a/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java b/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java index f3b1eb57..472fa95b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/tabcomplete/TabCompletions.java @@ -94,7 +94,7 @@ public final class TabCompletions { return root.getChildren().get().keySet().stream() .filter(TabCompleter.startsWithIgnoreCase(incomplete)) - .map(s -> parts.stream().collect(Collectors.joining(".")) + "." + s) + .map(s -> String.join(".", parts) + "." + s) .collect(Collectors.toList()); }; } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java index cb9760ef..62030a77 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java @@ -42,7 +42,6 @@ import me.lucko.luckperms.common.utils.Predicates; import java.util.List; import java.util.Map; import java.util.SortedMap; -import java.util.stream.Collectors; public class LogSearch extends SubCommand { private static final int ENTRIES_PER_PAGE = 10; @@ -63,7 +62,7 @@ public class LogSearch extends SubCommand { } } - final String query = args.stream().collect(Collectors.joining(" ")); + final String query = String.join(" ", args); Paginated content = new Paginated<>(log.getSearch(query)); if (page != Integer.MIN_VALUE) { diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java index 929f897e..8d2b1569 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java @@ -73,7 +73,7 @@ public class VerboseCommand extends SingleCommand { filters.addAll(args.subList(1, args.size())); } - String filter = filters.isEmpty() ? "" : filters.stream().collect(Collectors.joining(" ")); + String filter = filters.isEmpty() ? "" : String.join(" ", filters); VerboseFilter parsedFilter; try { diff --git a/common/src/main/java/me/lucko/luckperms/common/model/User.java b/common/src/main/java/me/lucko/luckperms/common/model/User.java index 233d2b2b..774ce88d 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/User.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/User.java @@ -142,7 +142,7 @@ public class User extends PermissionHolder implements Identifiable implement private final LPSpongePlugin plugin; private SubjectCollection spongeProxy = null; - private final LoadingCache subjectLoadingCache = Caffeine.newBuilder() + private final LoadingCache subjectLoadingCache = Caffeine.newBuilder() .expireAfterWrite(1, TimeUnit.MINUTES) .build(u -> { // clock in with the housekeeper