Consistently use JetBrains' annotations

Signed-off-by: BT (calcastor/mame) <[email protected]>
PGMDev · May 20, 2024 · 4a7009a · 4a7009a
1 parent c577142
commit 4a7009a
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 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
@@ -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<CommandSender> {
 
   @Override
-  public @NonNull ArgumentParseResult<Duration> parse(
-      final @NonNull CommandContext<CommandSender> context,
-      final @NonNull CommandInput inputQueue) {
+  public @NotNull ArgumentParseResult<Duration> parse(
+      final @NotNull CommandContext<CommandSender> 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<CommandSender> commandContext,
-      final @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      final @NotNull CommandContext<CommandSender> 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
@@ -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<E> enumClass, @Nullable CloudKey<E> key) {
   }
 
   @Override
-  public @NonNull ArgumentParseResult<E> parse(
-      final @NonNull CommandContext<CommandSender> context,
-      final @NonNull CommandInput inputQueue) {
+  public @NotNull ArgumentParseResult<E> parse(
+      final @NotNull CommandContext<CommandSender> context,
+      final @NotNull CommandInput inputQueue) {
     final String input = inputQueue.peekString();
 
     E bestMatch = bestMatch(context, input);
@@ -68,8 +68,8 @@ protected E bestMatch(CommandContext<CommandSender> context, String input) {
   }
 
   @Override
-  public @NonNull List<@NonNull String> stringSuggestions(
-      final @NonNull CommandContext<CommandSender> context, final @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      final @NotNull CommandContext<CommandSender> 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
@@ -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<CommandSender> manager, ParserParameter
   }
 
   @Override
-  public @NonNull List<@NonNull String> stringSuggestions(
-      @NonNull CommandContext<CommandSender> context, @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      @NotNull CommandContext<CommandSender> 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
@@ -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<CommandSender> {
 
   @Override
-  public @NonNull ArgumentParseResult<MapPool> parse(
-      final @NonNull CommandContext<CommandSender> context,
-      final @NonNull CommandInput inputQueue) {
+  public @NotNull ArgumentParseResult<MapPool> parse(
+      final @NotNull CommandContext<CommandSender> 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<CommandSender> context, final @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      final @NotNull CommandContext<CommandSender> 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
@@ -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<T> parse(
   }
 
   @Override
-  public @NonNull List<@NonNull String> stringSuggestions(
-      @NonNull CommandContext<CommandSender> context, @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      @NotNull CommandContext<CommandSender> 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
@@ -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<Party> parse(
   }
 
   @Override
-  public @NonNull List<@NonNull String> stringSuggestions(
-      @NonNull CommandContext<CommandSender> context, @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      @NotNull CommandContext<CommandSender> context, @NotNull CommandInput input) {
     final String next = input.peekString();
     List<String> 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
@@ -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<Rotation> parse(
-      final @NonNull CommandContext<CommandSender> context,
-      final @NonNull CommandInput inputQueue) {
+  public @NotNull ArgumentParseResult<Rotation> parse(
+      final @NotNull CommandContext<CommandSender> 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<CommandSender> context, final @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      final @NotNull CommandContext<CommandSender> 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
@@ -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<S> manager, ParserParameters options) {
   @Override
   public @NotNull ArgumentParseResult<T> parse(
       @NotNull CommandContext<S> 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<T> 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
@@ -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<Collection<Team>> parse(
   }
 
   @Override
-  public @NonNull List<@NonNull String> stringSuggestions(
-      @NonNull CommandContext<CommandSender> context, @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      @NotNull CommandContext<CommandSender> context, @NotNull CommandInput input) {
     final String next = input.peekString();
     List<String> 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
@@ -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<CommandSender> {
 
   @Override
-  public @NonNull ArgumentParseResult<@NonNull Optional<VictoryCondition>> parse(
-      @NonNull CommandContext<@NonNull CommandSender> context, @NonNull CommandInput inputQueue) {
+  public @NotNull ArgumentParseResult<@NotNull Optional<VictoryCondition>> 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<CommandSender> context, @NonNull CommandInput input) {
+  public @NotNull List<@NotNull String> stringSuggestions(
+      @NotNull CommandContext<CommandSender> context, @NotNull CommandInput input) {
     final String next = input.readString();
     final Match match = CommandUtils.getMatch(context);
     if (match == null) return BASE_SUGGESTIONS;