Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistently use JetBrains' annotations #1321

Closed
wants to merge 1 commit into from
Closed

Consistently use JetBrains' annotations #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/tc/oc/pgm/command/injectors/MatchModuleInjectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import cloud.commandframework.exceptions.CommandExecutionException;
import cloud.commandframework.types.tuples.Triplet;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import tc.oc.pgm.api.match.Match;
import tc.oc.pgm.api.match.MatchModule;
import tc.oc.pgm.command.util.CommandUtils;
Expand All @@ -20,7 +20,7 @@ public class MatchModuleInjectionService implements InjectionService<CommandSend

@Override
public @Nullable Object handle(
@NonNull Triplet<CommandContext<CommandSender>, Class<?>, AnnotationAccessor> param)
@NotNull Triplet<CommandContext<CommandSender>, Class<?>, AnnotationAccessor> param)
throws Exception {
// Not a match module? we do not handle that.
Class<?> cls = param.getSecond();
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/tc/oc/pgm/command/parsers/DurationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull;
import tc.oc.pgm.util.text.TextException;
import tc.oc.pgm.util.text.TextParser;

public final class DurationParser implements ArgumentParser<CommandSender, Duration> {

@Override
public @NonNull ArgumentParseResult<Duration> parse(
final @NonNull CommandContext<CommandSender> context,
final @NonNull Queue<String> inputQueue) {
public @NotNull ArgumentParseResult<Duration> parse(
final @NotNull CommandContext<CommandSender> context,
final @NotNull Queue<String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return failure(new NoInputProvidedException(DurationParser.class, context));
Expand All @@ -40,8 +40,8 @@ public final class DurationParser implements ArgumentParser<CommandSender, Durat
}

@Override
public @NonNull List<@NonNull String> suggestions(
final @NonNull CommandContext<CommandSender> commandContext, final @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
final @NotNull CommandContext<CommandSender> commandContext, final @NotNull String input) {
char[] chars = input.toLowerCase(Locale.ROOT).toCharArray();

if (chars.length == 0) {
Expand Down
14 changes: 7 additions & 7 deletions core/src/main/java/tc/oc/pgm/command/parsers/EnumParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
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.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;
Expand Down Expand Up @@ -45,9 +45,9 @@ public EnumParser(Class<E> enumClass, @Nullable CloudKey<E> key) {
}

@Override
public @NonNull ArgumentParseResult<E> parse(
final @NonNull CommandContext<CommandSender> context,
final @NonNull Queue<String> inputQueue) {
public @NotNull ArgumentParseResult<E> parse(
final @NotNull CommandContext<CommandSender> context,
final @NotNull Queue<String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return failure(new NoInputProvidedException(EnumParser.class, context));
Expand All @@ -70,8 +70,8 @@ protected E bestMatch(CommandContext<CommandSender> context, String input) {
}

@Override
public @NonNull List<@NonNull String> suggestions(
final @NonNull CommandContext<CommandSender> context, final @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
final @NotNull CommandContext<CommandSender> context, final @NotNull String input) {
return filteredOptions(context, input).collect(Collectors.toList());
}

Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/tc/oc/pgm/command/parsers/MapInfoParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull;
import tc.oc.pgm.api.PGM;
import tc.oc.pgm.api.map.MapInfo;
Expand Down Expand Up @@ -47,8 +46,8 @@ public MapInfoParser(PaperCommandManager<CommandSender> manager, ParserParameter
}

@Override
public @NonNull List<@NonNull String> suggestions(
@NonNull CommandContext<CommandSender> context, @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
@NotNull CommandContext<CommandSender> context, @NotNull String input) {
List<String> inputQueue = context.get(CommandKeys.INPUT_QUEUE);

// Words to keep, as they cannot be replaced (they're not the last arg)
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/tc/oc/pgm/command/parsers/MapPoolParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
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;
Expand All @@ -27,9 +27,9 @@
public final class MapPoolParser implements ArgumentParser<CommandSender, MapPool> {

@Override
public @NonNull ArgumentParseResult<MapPool> parse(
final @NonNull CommandContext<CommandSender> context,
final @NonNull Queue<String> inputQueue) {
public @NotNull ArgumentParseResult<MapPool> parse(
final @NotNull CommandContext<CommandSender> context,
final @NotNull Queue<String> inputQueue) {
MapOrder mapOrder = PGM.get().getMapOrder();
if (!(mapOrder instanceof MapPoolManager)) return failure(exception("pool.mapPoolsDisabled"));

Expand All @@ -44,8 +44,8 @@ public final class MapPoolParser implements ArgumentParser<CommandSender, MapPoo
}

@Override
public @NonNull List<@NonNull String> suggestions(
final @NonNull CommandContext<CommandSender> context, final @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
final @NotNull CommandContext<CommandSender> context, final @NotNull String input) {
MapOrder mapOrder = PGM.get().getMapOrder();
if (!(mapOrder instanceof MapPoolManager)) return Collections.emptyList();

Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/tc/oc/pgm/command/parsers/MatchObjectParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.jetbrains.annotations.NotNull;
import tc.oc.pgm.api.match.Match;
import tc.oc.pgm.api.match.MatchModule;
Expand Down Expand Up @@ -70,8 +69,8 @@ public ArgumentParseResult<T> parse(
}

@Override
public @NonNull List<@NonNull String> suggestions(
@NonNull CommandContext<CommandSender> context, @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
@NotNull CommandContext<CommandSender> context, @NotNull String input) {
Match match = CommandUtils.getMatch(context);
if (match == null) return Collections.emptyList();

Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/tc/oc/pgm/command/parsers/PartyParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import cloud.commandframework.paper.PaperCommandManager;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull;
import tc.oc.pgm.api.match.Match;
import tc.oc.pgm.api.party.Party;
Expand Down Expand Up @@ -39,8 +38,8 @@ public ArgumentParseResult<Party> parse(
}

@Override
public @NonNull List<@NonNull String> suggestions(
@NonNull CommandContext<CommandSender> context, @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
@NotNull CommandContext<CommandSender> context, @NotNull String input) {
List<String> teams = teamParser.suggestions(context, input);
if (LiquidMetal.match("obs", input)) teams.add("obs");
return teams;
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/tc/oc/pgm/command/parsers/RotationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.List;
import java.util.Queue;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
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;
Expand All @@ -16,16 +16,16 @@ public final class RotationParser implements ArgumentParser<CommandSender, Rotat
private final MapPoolParser POOL_PARSER = new MapPoolParser();

@Override
public @NonNull ArgumentParseResult<Rotation> parse(
final @NonNull CommandContext<CommandSender> context,
final @NonNull Queue<String> inputQueue) {
public @NotNull ArgumentParseResult<Rotation> parse(
final @NotNull CommandContext<CommandSender> context,
final @NotNull Queue<String> inputQueue) {
context.set(CommandKeys.POOL_TYPE, MapPoolType.ORDERED);
return POOL_PARSER.parse(context, inputQueue).mapParsedValue(p -> (Rotation) p);
}

@Override
public @NonNull List<@NonNull String> suggestions(
final @NonNull CommandContext<CommandSender> context, final @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
final @NotNull CommandContext<CommandSender> context, final @NotNull String input) {
context.set(CommandKeys.POOL_TYPE, MapPoolType.ORDERED);
return POOL_PARSER.suggestions(context, input);
}
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/tc/oc/pgm/command/parsers/TeamsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.util.Collections;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull;
import tc.oc.pgm.api.match.Match;
import tc.oc.pgm.command.util.CommandUtils;
Expand Down Expand Up @@ -46,8 +45,8 @@ public ArgumentParseResult<Collection<Team>> parse(
}

@Override
public @NonNull List<@NonNull String> suggestions(
@NonNull CommandContext<CommandSender> context, @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
@NotNull CommandContext<CommandSender> context, @NotNull String input) {
List<String> teams = teamParser.suggestions(context, input);
if ("*".startsWith(input)) teams.add("*");
return teams;
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/tc/oc/pgm/command/parsers/VictoryConditionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
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;
Expand All @@ -32,9 +32,9 @@ public final class VictoryConditionParser
implements ArgumentParser<CommandSender, Optional<VictoryCondition>> {

@Override
public @NonNull ArgumentParseResult<@NonNull Optional<VictoryCondition>> parse(
@NonNull CommandContext<@NonNull CommandSender> context,
@NonNull Queue<@NonNull String> inputQueue) {
public @NotNull ArgumentParseResult<@NotNull Optional<VictoryCondition>> parse(
@NotNull CommandContext<@NotNull CommandSender> context,
@NotNull Queue<@NotNull String> inputQueue) {
final String input = inputQueue.poll();
if (input == null) {
return failure(new NoInputProvidedException(VictoryConditionParser.class, context));
Expand All @@ -61,8 +61,8 @@ public final class VictoryConditionParser
Arrays.asList("default", "tie", "objectives", "score");

@Override
public @NonNull List<@NonNull String> suggestions(
@NonNull CommandContext<CommandSender> context, @NonNull String input) {
public @NotNull List<@NotNull String> suggestions(
@NotNull CommandContext<CommandSender> context, @NotNull String input) {
final Match match = CommandUtils.getMatch(context);
if (match == null) return BASE_SUGGESTIONS;

Expand Down