From 4a7009a7f87b80655ff67348927b8fd6ad3821a6 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Mon, 20 May 2024 11:26:01 -0700 Subject: [PATCH] Consistently use JetBrains' annotations Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com> --- .../tc/oc/pgm/command/parsers/DurationParser.java | 14 +++++++------- .../java/tc/oc/pgm/command/parsers/EnumParser.java | 14 +++++++------- .../tc/oc/pgm/command/parsers/MapInfoParser.java | 5 ++--- .../tc/oc/pgm/command/parsers/MapPoolParser.java | 12 ++++++------ .../oc/pgm/command/parsers/MatchObjectParser.java | 5 ++--- .../tc/oc/pgm/command/parsers/PartyParser.java | 5 ++--- .../tc/oc/pgm/command/parsers/RotationParser.java | 12 ++++++------ .../oc/pgm/command/parsers/StringLikeParser.java | 6 +++--- .../tc/oc/pgm/command/parsers/TeamsParser.java | 5 ++--- .../command/parsers/VictoryConditionParser.java | 10 +++++----- 10 files changed, 42 insertions(+), 46 deletions(-) diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/DurationParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/DurationParser.java index d5f8a60e71..7338df0c62 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/DurationParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/DurationParser.java @@ -11,12 +11,12 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.jetbrains.annotations.NotNull; import tc.oc.pgm.util.text.TextException; import tc.oc.pgm.util.text.TextParser; @@ -25,9 +25,9 @@ public final class DurationParser BlockingSuggestionProvider.Strings { @Override - public @NonNull ArgumentParseResult parse( - final @NonNull CommandContext context, - final @NonNull CommandInput inputQueue) { + public @NotNull ArgumentParseResult parse( + final @NotNull CommandContext context, + final @NotNull CommandInput inputQueue) { final String input = inputQueue.peekString(); try { Duration result = TextParser.parseDuration(input); @@ -39,9 +39,9 @@ public final class DurationParser } @Override - public @NonNull List<@NonNull String> stringSuggestions( - final @NonNull CommandContext commandContext, - final @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + final @NotNull CommandContext commandContext, + final @NotNull CommandInput input) { final String next = input.readString(); char[] chars = next.toLowerCase(Locale.ROOT).toCharArray(); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/EnumParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/EnumParser.java index 850e0fef47..1e83fc1ab5 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/EnumParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/EnumParser.java @@ -9,14 +9,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.key.CloudKey; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import tc.oc.pgm.util.Aliased; import tc.oc.pgm.util.LiquidMetal; import tc.oc.pgm.util.StreamUtils; @@ -46,9 +46,9 @@ public EnumParser(Class enumClass, @Nullable CloudKey key) { } @Override - public @NonNull ArgumentParseResult parse( - final @NonNull CommandContext context, - final @NonNull CommandInput inputQueue) { + public @NotNull ArgumentParseResult parse( + final @NotNull CommandContext context, + final @NotNull CommandInput inputQueue) { final String input = inputQueue.peekString(); E bestMatch = bestMatch(context, input); @@ -68,8 +68,8 @@ protected E bestMatch(CommandContext context, String input) { } @Override - public @NonNull List<@NonNull String> stringSuggestions( - final @NonNull CommandContext context, final @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + final @NotNull CommandContext context, final @NotNull CommandInput input) { return filteredOptions(context, input.readString()).collect(Collectors.toList()); } diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/MapInfoParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/MapInfoParser.java index 07c7adb058..13b0f272d4 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/MapInfoParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/MapInfoParser.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.stream.Collectors; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.paper.PaperCommandManager; @@ -49,8 +48,8 @@ public MapInfoParser(PaperCommandManager manager, ParserParameter } @Override - public @NonNull List<@NonNull String> stringSuggestions( - @NonNull CommandContext context, @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + @NotNull CommandContext context, @NotNull CommandInput input) { // Words to keep, as they cannot be replaced (they're not the last arg) String keep = StringUtils.getMustKeepText(input); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/MapPoolParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/MapPoolParser.java index d9962e1082..af773047f3 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/MapPoolParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/MapPoolParser.java @@ -10,12 +10,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.jetbrains.annotations.NotNull; import tc.oc.pgm.api.PGM; import tc.oc.pgm.api.map.MapOrder; import tc.oc.pgm.command.util.CommandKeys; @@ -30,9 +30,9 @@ public final class MapPoolParser BlockingSuggestionProvider.Strings { @Override - public @NonNull ArgumentParseResult parse( - final @NonNull CommandContext context, - final @NonNull CommandInput inputQueue) { + public @NotNull ArgumentParseResult parse( + final @NotNull CommandContext context, + final @NotNull CommandInput inputQueue) { MapOrder mapOrder = PGM.get().getMapOrder(); if (!(mapOrder instanceof MapPoolManager)) return failure(exception("pool.mapPoolsDisabled")); @@ -47,8 +47,8 @@ public final class MapPoolParser } @Override - public @NonNull List<@NonNull String> stringSuggestions( - final @NonNull CommandContext context, final @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + final @NotNull CommandContext context, final @NotNull CommandInput input) { final String next = input.readString(); MapOrder mapOrder = PGM.get().getMapOrder(); if (!(mapOrder instanceof MapPoolManager)) return Collections.emptyList(); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/MatchObjectParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/MatchObjectParser.java index 0cdb31c7aa..47e8102233 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/MatchObjectParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/MatchObjectParser.java @@ -11,7 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.paper.PaperCommandManager; @@ -72,8 +71,8 @@ public ArgumentParseResult parse( } @Override - public @NonNull List<@NonNull String> stringSuggestions( - @NonNull CommandContext context, @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + @NotNull CommandContext context, @NotNull CommandInput input) { Match match = CommandUtils.getMatch(context); if (match == null) return Collections.emptyList(); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/PartyParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/PartyParser.java index 65bdb6b306..e430e4f45c 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/PartyParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/PartyParser.java @@ -6,7 +6,6 @@ import java.util.List; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.paper.PaperCommandManager; @@ -42,8 +41,8 @@ public ArgumentParseResult parse( } @Override - public @NonNull List<@NonNull String> stringSuggestions( - @NonNull CommandContext context, @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + @NotNull CommandContext context, @NotNull CommandInput input) { final String next = input.peekString(); List teams = teamParser.stringSuggestions(context, input); if (LiquidMetal.match("obs", next)) teams.add("obs"); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/RotationParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/RotationParser.java index 0c8c0bc269..a843488288 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/RotationParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/RotationParser.java @@ -2,12 +2,12 @@ import java.util.List; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.jetbrains.annotations.NotNull; import tc.oc.pgm.command.util.CommandKeys; import tc.oc.pgm.rotation.pools.MapPoolType; import tc.oc.pgm.rotation.pools.Rotation; @@ -19,16 +19,16 @@ public final class RotationParser private final MapPoolParser POOL_PARSER = new MapPoolParser(); @Override - public @NonNull ArgumentParseResult parse( - final @NonNull CommandContext context, - final @NonNull CommandInput inputQueue) { + public @NotNull ArgumentParseResult parse( + final @NotNull CommandContext context, + final @NotNull CommandInput inputQueue) { context.set(CommandKeys.POOL_TYPE, MapPoolType.ORDERED); return POOL_PARSER.parse(context, inputQueue).mapParsedValue(p -> (Rotation) p); } @Override - public @NonNull List<@NonNull String> stringSuggestions( - final @NonNull CommandContext context, final @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + final @NotNull CommandContext context, final @NotNull CommandInput input) { context.set(CommandKeys.POOL_TYPE, MapPoolType.ORDERED); return POOL_PARSER.stringSuggestions(context, input); } diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/StringLikeParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/StringLikeParser.java index 4040499197..58440c05d9 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/StringLikeParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/StringLikeParser.java @@ -7,7 +7,6 @@ import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.parser.ParserParameters; -import org.incendo.cloud.parser.standard.StringParser; import org.jetbrains.annotations.NotNull; import tc.oc.pgm.util.StringUtils; @@ -28,8 +27,9 @@ public StringLikeParser(CommandManager manager, ParserParameters options) { @Override public @NotNull ArgumentParseResult parse( @NotNull CommandContext context, @NotNull CommandInput args) { - return stringParser.parse(context, args).flatMapParsedValue( - text -> parse(context, StringUtils.suggestionToText(text))); + return stringParser + .parse(context, args) + .flatMapParsedValue(text -> parse(context, StringUtils.suggestionToText(text))); } public abstract ArgumentParseResult parse( diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/TeamsParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/TeamsParser.java index 3bcf1dbf73..c6c8bdfe2d 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/TeamsParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/TeamsParser.java @@ -9,7 +9,6 @@ import java.util.Collections; import java.util.List; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.paper.PaperCommandManager; @@ -49,8 +48,8 @@ public ArgumentParseResult> parse( } @Override - public @NonNull List<@NonNull String> stringSuggestions( - @NonNull CommandContext context, @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + @NotNull CommandContext context, @NotNull CommandInput input) { final String next = input.peekString(); List teams = teamParser.stringSuggestions(context, input); if ("*".startsWith(next)) teams.add("*"); diff --git a/core/src/main/java/tc/oc/pgm/command/parsers/VictoryConditionParser.java b/core/src/main/java/tc/oc/pgm/command/parsers/VictoryConditionParser.java index 4223e74f66..173fec9412 100644 --- a/core/src/main/java/tc/oc/pgm/command/parsers/VictoryConditionParser.java +++ b/core/src/main/java/tc/oc/pgm/command/parsers/VictoryConditionParser.java @@ -11,12 +11,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.parser.ArgumentParser; import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.jetbrains.annotations.NotNull; import tc.oc.pgm.api.match.Match; import tc.oc.pgm.api.party.VictoryCondition; import tc.oc.pgm.command.util.CommandUtils; @@ -33,8 +33,8 @@ public final class VictoryConditionParser BlockingSuggestionProvider.Strings { @Override - public @NonNull ArgumentParseResult<@NonNull Optional> parse( - @NonNull CommandContext<@NonNull CommandSender> context, @NonNull CommandInput inputQueue) { + public @NotNull ArgumentParseResult<@NotNull Optional> parse( + @NotNull CommandContext<@NotNull CommandSender> context, @NotNull CommandInput inputQueue) { final String input = inputQueue.readString(); final Match match = CommandUtils.getMatch(context); @@ -58,8 +58,8 @@ public final class VictoryConditionParser Arrays.asList("default", "tie", "objectives", "score"); @Override - public @NonNull List<@NonNull String> stringSuggestions( - @NonNull CommandContext context, @NonNull CommandInput input) { + public @NotNull List<@NotNull String> stringSuggestions( + @NotNull CommandContext context, @NotNull CommandInput input) { final String next = input.readString(); final Match match = CommandUtils.getMatch(context); if (match == null) return BASE_SUGGESTIONS;