Fix import order

.checkstyle/checkstyle.xml

@@ -156,6 +156,13 @@
             <property name="processJavadoc" value="true"/>
         </module>
 
+        <!-- https://checkstyle.org/config_imports.html#CustomImportOrder -->
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STATIC"/>
+            <property name="standardPackageRegExp" value="^$"/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+        </module>
+
         <!-- Checks for whitespace                               -->
         <!-- See https://checkstyle.org/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>

.editorconfig

@@ -137,7 +137,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_if_brace_force = always
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_imports_layout = *,|,$*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true

cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java

@@ -48,12 +48,6 @@ import cloud.commandframework.extra.confirmation.CommandConfirmationManager;
 import cloud.commandframework.meta.CommandMeta;
 import cloud.commandframework.meta.SimpleCommandMeta;
 import io.leangen.geantyref.TypeToken;
-
-import java.util.function.Predicate;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -71,6 +65,9 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Parser that parses class instances {@link Command commands}

cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java

@@ -23,13 +23,12 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Annotation used to indicate that a method parameter is a command argument

cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java

@@ -23,13 +23,12 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Utility that extract {@link Argument arguments} from

cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java

@@ -23,9 +23,8 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.reflect.Parameter;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class ArgumentParameterPair {
 

cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java

@@ -24,12 +24,11 @@
 package cloud.commandframework.annotations;
 
 import cloud.commandframework.arguments.parser.StandardParameters;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Maps to {@link StandardParameters#DESCRIPTION}

cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java

@@ -23,12 +23,11 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Used to declare a class method as a command method

cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java

@@ -23,9 +23,8 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.reflect.Method;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class CommandMethodPair {
 

cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java

@@ -23,12 +23,11 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Equivalent to {@link cloud.commandframework.Command.Builder#permission(String)}

cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java

@@ -23,13 +23,12 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Indicates that the parameter should be treated like a {@link cloud.commandframework.arguments.flags.CommandFlag}.

cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java

@@ -31,8 +31,6 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.ParserRegistry;
 import cloud.commandframework.permission.Permission;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -42,6 +40,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class FlagExtractor implements Function<@NonNull Method, Collection<@NonNull CommandFlag<?>>> {
 

cloud-annotations/src/main/java/cloud/commandframework/annotations/Hidden.java

@@ -24,7 +24,6 @@
 package cloud.commandframework.annotations;
 
 import cloud.commandframework.Command;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java

@@ -25,11 +25,10 @@ package cloud.commandframework.annotations;
 
 import cloud.commandframework.arguments.parser.ParserParameters;
 import cloud.commandframework.meta.CommandMeta;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 class MetaFactory implements Function<@NonNull Method, @NonNull CommandMeta> {
 

cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java

@@ -29,8 +29,6 @@ import cloud.commandframework.arguments.flags.FlagContext;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.CommandExecutionException;
 import cloud.commandframework.execution.CommandExecutionHandler;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
@@ -39,6 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A command execution handler that invokes a method.

cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java

@@ -24,12 +24,11 @@
 package cloud.commandframework.annotations;
 
 import cloud.commandframework.Command;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Creates a command proxy for the command. This is similar to

cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java

@@ -23,13 +23,12 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Annotation version of adding {@link cloud.commandframework.arguments.preprocessor.RegexPreprocessor}

cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java

@@ -23,9 +23,8 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class SyntaxFragment {
 

cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java

@@ -23,8 +23,6 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -32,6 +30,7 @@ import java.util.StringTokenizer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Parses command syntax into syntax fragments

cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/MethodArgumentParser.java

@@ -26,14 +26,13 @@ package cloud.commandframework.annotations.parsers;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents a method annotated with {@link Parser}

cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/MethodSuggestionsProvider.java

@@ -24,13 +24,12 @@
 package cloud.commandframework.annotations.suggestions;
 
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Represents a method annotated with {@link Suggestions}

cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/Suggestions.java

@@ -23,12 +23,11 @@
 //
 package cloud.commandframework.annotations.suggestions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * This annotation allows you to create annotated methods that behave like suggestions providers.

cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java

@@ -38,7 +38,6 @@ import cloud.commandframework.arguments.standard.StringArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.meta.SimpleCommandMeta;
 import io.leangen.geantyref.TypeToken;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -55,7 +54,6 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.CompletionException;
 import java.util.function.BiFunction;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

cloud-annotations/src/test/java/cloud/commandframework/annotations/SyntaxParserTest.java

@@ -26,7 +26,6 @@ package cloud.commandframework.annotations;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

cloud-core/src/main/java/cloud/commandframework/Command.java

@@ -38,9 +38,6 @@ import cloud.commandframework.permission.PredicatePermission;
 import cloud.commandframework.types.tuples.Pair;
 import cloud.commandframework.types.tuples.Triplet;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -51,6 +48,8 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A command consists out of a chain of {@link CommandArgument command arguments}.

cloud-core/src/main/java/cloud/commandframework/CommandComponent.java

@@ -24,9 +24,8 @@
 package cloud.commandframework;
 
 import cloud.commandframework.arguments.CommandArgument;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A single literal or argument component of a command

cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java

@@ -26,9 +26,6 @@ package cloud.commandframework;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.StaticArgument;
 import cloud.commandframework.meta.CommandMeta;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -39,6 +36,8 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class CommandHelpHandler<C> {
 

cloud-core/src/main/java/cloud/commandframework/CommandManager.java

@@ -60,9 +60,6 @@ import cloud.commandframework.permission.PredicatePermission;
 import cloud.commandframework.services.ServicePipeline;
 import cloud.commandframework.services.State;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -76,6 +73,8 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * The manager is responsible for command registration, parsing delegation, etc.

cloud-core/src/main/java/cloud/commandframework/CommandTree.java

@@ -43,9 +43,6 @@ import cloud.commandframework.permission.OrPermission;
 import cloud.commandframework.types.tuples.Pair;
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -63,6 +60,8 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Tree containing all commands and command paths.

cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java

@@ -26,9 +26,8 @@ package cloud.commandframework;
 import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator;
 import cloud.commandframework.execution.CommandExecutionCoordinator;
 import cloud.commandframework.internal.CommandRegistrationHandler;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * {@link CommandManager} implementation that allows you to lock command registrations.

cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java

@@ -23,15 +23,14 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class AnnotatedElementAccessor implements AnnotationAccessor {
 

cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java

@@ -23,13 +23,12 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Collection;
 import java.util.Collections;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Managed access for {@link java.lang.annotation.Annotation} instances

cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java

@@ -23,14 +23,13 @@
 //
 package cloud.commandframework.annotations;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class MultiDelegateAnnotationAccessor implements AnnotationAccessor {
 

cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java

@@ -28,9 +28,6 @@ import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.services.ServicePipeline;
 import cloud.commandframework.types.tuples.Triplet;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -39,6 +36,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Registry containing mappings between {@link Class classes} and {@link ParameterInjector injectors}

cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Range.java

@@ -24,12 +24,11 @@
 package cloud.commandframework.annotations.specifier;
 
 import cloud.commandframework.arguments.parser.ArgumentParser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Used to specify min and max values of numerical

cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java

@@ -34,9 +34,6 @@ import cloud.commandframework.keys.CloudKey;
 import cloud.commandframework.keys.CloudKeyHolder;
 import cloud.commandframework.keys.SimpleCloudKey;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -45,6 +42,8 @@ import java.util.Objects;
 import java.util.Queue;
 import java.util.function.BiFunction;
 import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A argument that belongs to a command

cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.arguments;
 
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Handler that produces command suggestions depending on input

cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java

@@ -24,11 +24,10 @@
 package cloud.commandframework.arguments;
 
 import cloud.commandframework.CommandTree;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.List;
-
 /**
  * Utility that formats chains of {@link CommandArgument command arguments} into syntax strings
  *

cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java

@@ -29,11 +29,10 @@ import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
 import cloud.commandframework.internal.CommandInputTokenizer;
 import cloud.commandframework.services.State;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Command suggestion engine that delegates to a {@link cloud.commandframework.CommandTree}

cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java

@@ -25,10 +25,9 @@ package cloud.commandframework.arguments;
 
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class DelegatingSuggestionsProvider<C> implements BiFunction<@NonNull CommandContext<C>,
         @NonNull String, @NonNull List<String>> {

cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java

@@ -27,11 +27,10 @@ import cloud.commandframework.CommandTree;
 import cloud.commandframework.arguments.compound.CompoundArgument;
 import cloud.commandframework.arguments.compound.FlagArgument;
 import cloud.commandframework.arguments.flags.CommandFlag;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Iterator;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * {@link CommandSyntaxFormatter} implementation that uses the following rules:

cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java

@@ -27,8 +27,6 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,6 +35,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * {@link CommandArgument} type that recognizes fixed strings. This type does not parse variables.

cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java

@@ -29,9 +29,8 @@ import cloud.commandframework.arguments.parser.ParserParameters;
 import cloud.commandframework.arguments.parser.ParserRegistry;
 import cloud.commandframework.types.tuples.Pair;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A compound argument consisting of two inner arguments

cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java

@@ -29,9 +29,8 @@ import cloud.commandframework.arguments.parser.ParserParameters;
 import cloud.commandframework.arguments.parser.ParserRegistry;
 import cloud.commandframework.types.tuples.Triplet;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A compound argument consisting of three inner arguments

cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java

@@ -29,12 +29,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.types.tuples.Tuple;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Compound argument

cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java

@@ -35,8 +35,6 @@ import cloud.commandframework.exceptions.parsing.ParserException;
 import cloud.commandframework.keys.CloudKey;
 import cloud.commandframework.keys.SimpleCloudKey;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -49,6 +47,7 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Container for flag parsing logic. This should not be be used directly.

cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java

@@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.permission.CommandPermission;
 import cloud.commandframework.permission.Permission;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A flag is an optional command argument that may have an associated parser,

cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java

@@ -23,12 +23,11 @@
 //
 package cloud.commandframework.arguments.flags;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Flag value mappings

cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java

@@ -23,10 +23,9 @@
 //
 package cloud.commandframework.arguments.parser;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Optional;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Result of the parsing done by a {@link ArgumentParser}

cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java

@@ -24,12 +24,11 @@
 package cloud.commandframework.arguments.parser;
 
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import static java.util.Objects.requireNonNull;
 

cloud-core/src/main/java/cloud/commandframework/arguments/parser/MappedArgumentParser.java

@@ -24,12 +24,11 @@
 package cloud.commandframework.arguments.parser;
 
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * An argument parser which wraps another argument parser, converting the output type.

cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.arguments.parser;
 
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Parser parameter used when retrieving parsers from the {@link ParserRegistry}

cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java

@@ -23,11 +23,10 @@
 //
 package cloud.commandframework.arguments.parser;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Collection of {@link ParserParameter parameter}-{@link Object object} pairs

cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserRegistry.java

@@ -25,14 +25,13 @@ package cloud.commandframework.arguments.parser;
 
 import cloud.commandframework.context.CommandContext;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Registry of {@link ArgumentParser} that allows these arguments to be

cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java

@@ -42,8 +42,6 @@ import cloud.commandframework.arguments.standard.UUIDArgument;
 import cloud.commandframework.context.CommandContext;
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Collection;
@@ -55,6 +53,7 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Standard implementation of {@link ParserRegistry}

cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java

@@ -29,12 +29,11 @@ import cloud.commandframework.captions.CaptionVariable;
 import cloud.commandframework.captions.StandardCaptionKeys;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Queue;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Command preprocessor that filters based on regular expressions

cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java

@@ -32,13 +32,12 @@ import cloud.commandframework.captions.StandardCaptionKeys;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.ParserException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java

@@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class ByteArgument<C> extends CommandArgument<C, Byte> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java

@@ -32,12 +32,11 @@ import cloud.commandframework.captions.StandardCaptionKeys;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.ParserException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class CharArgument<C> extends CommandArgument<C, Character> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java

@@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class DoubleArgument<C> extends CommandArgument<C, Double> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java

@@ -32,14 +32,13 @@ import cloud.commandframework.captions.StandardCaptionKeys;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.ParserException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Argument type that recognizes enums

cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java

@@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class FloatArgument<C> extends CommandArgument<C, Float> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java

@@ -30,9 +30,6 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -40,6 +37,8 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class IntegerArgument<C> extends CommandArgument<C, Integer> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java

@@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class LongArgument<C> extends CommandArgument<C, Long> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java

@@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.NumberParseException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class ShortArgument<C> extends CommandArgument<C, Short> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java

@@ -33,8 +33,6 @@ import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.ParserException;
 import cloud.commandframework.util.StringUtils;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
@@ -42,6 +40,7 @@ import java.util.StringJoiner;
 import java.util.function.BiFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @SuppressWarnings("unused")
 public final class StringArgument<C> extends CommandArgument<C, String> {

cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java

@@ -29,12 +29,11 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.context.CommandContext;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * This is a command argument type that essentially mimics {@link StringArgument#greedy(String)},

cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java

@@ -32,13 +32,12 @@ import cloud.commandframework.captions.StandardCaptionKeys;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import cloud.commandframework.exceptions.parsing.ParserException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
 import java.util.Queue;
 import java.util.UUID;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("unused")
 public final class UUIDArgument<C> extends CommandArgument<C, UUID> {

cloud-core/src/main/java/cloud/commandframework/captions/Caption.java

@@ -23,9 +23,8 @@
 //
 package cloud.commandframework.captions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * This is a reference to a caption and does not contain any message itself

cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java

@@ -23,9 +23,8 @@
 //
 package cloud.commandframework.captions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Caption registry that delegates to factory methods

cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java

@@ -23,11 +23,10 @@
 //
 package cloud.commandframework.captions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Caption registry that uses bi-functions to produce messages

cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java

@@ -23,11 +23,10 @@
 //
 package cloud.commandframework.captions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * {@link Caption} instances for messages in cloud-core

cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java

@@ -36,15 +36,14 @@ import cloud.commandframework.keys.CloudKey;
 import cloud.commandframework.keys.CloudKeyHolder;
 import cloud.commandframework.keys.SimpleCloudKey;
 import cloud.commandframework.permission.CommandPermission;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Command context used to assist in the parsing of commands

cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java

@@ -26,11 +26,10 @@ package cloud.commandframework.exceptions;
 import cloud.commandframework.CommandTree;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Iterator;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Exception thrown when a {@link CommandContext}

cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.exceptions;
 
 import cloud.commandframework.arguments.CommandArgument;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class ArgumentParseException extends CommandParseException {
 

cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java

@@ -24,10 +24,9 @@
 package cloud.commandframework.exceptions;
 
 import cloud.commandframework.arguments.CommandArgument;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Exception thrown when parsing user input into a command

cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java

@@ -25,11 +25,10 @@ package cloud.commandframework.exceptions;
 
 import cloud.commandframework.Command;
 import cloud.commandframework.arguments.CommandArgument;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.List;
-
 /**
  * Exception thrown when an invalid command sender tries to execute a command
  */

cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.exceptions;
 
 import cloud.commandframework.arguments.CommandArgument;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Exception sent when a command sender inputs invalid command syntax

cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java

@@ -26,9 +26,8 @@ package cloud.commandframework.exceptions;
 import cloud.commandframework.Command;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.permission.CommandPermission;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Exception thrown when a command sender misses a permission required

cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.exceptions;
 
 import cloud.commandframework.arguments.CommandArgument;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Exception thrown when a command sender tries to execute

cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/ParserException.java

@@ -26,9 +26,8 @@ package cloud.commandframework.exceptions.parsing;
 import cloud.commandframework.captions.Caption;
 import cloud.commandframework.captions.CaptionVariable;
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Arrays;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class ParserException extends IllegalArgumentException {
 

cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java

@@ -30,15 +30,14 @@ import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.CommandExecutionException;
 import cloud.commandframework.services.State;
 import cloud.commandframework.types.tuples.Pair;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Execution coordinator parses and/or executes commands on a separate thread from the calling thread

cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java

@@ -29,13 +29,12 @@ import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.exceptions.CommandExecutionException;
 import cloud.commandframework.services.State;
 import cloud.commandframework.types.tuples.Pair;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Objects;
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * The command execution coordinator is responsible for

cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java

@@ -25,9 +25,7 @@ package cloud.commandframework.execution;
 
 import cloud.commandframework.Command;
 import cloud.commandframework.context.CommandContext;
-
 import java.util.concurrent.CompletableFuture;
-
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 

cloud-core/src/main/java/cloud/commandframework/execution/CommandSuggestionProcessor.java

@@ -24,10 +24,9 @@
 package cloud.commandframework.execution;
 
 import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
 import java.util.function.BiFunction;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Processor that formats command suggestions

cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java

@@ -24,10 +24,9 @@
 package cloud.commandframework.execution;
 
 import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.LinkedList;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Command suggestions processor that checks the input queue head and filters based on that

cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java

@@ -25,9 +25,8 @@ package cloud.commandframework.execution.postprocessor;
 
 import cloud.commandframework.Command;
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Context for {@link CommandPostprocessor command postprocessors}

cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java

@@ -24,10 +24,9 @@
 package cloud.commandframework.execution.preprocessor;
 
 import cloud.commandframework.context.CommandContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.LinkedList;
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Context for {@link CommandPreprocessor command preprocessors}

cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java

@@ -31,16 +31,13 @@ import cloud.commandframework.meta.CommandMeta;
 import cloud.commandframework.meta.SimpleCommandMeta;
 import cloud.commandframework.services.types.ConsumerService;
 import cloud.commandframework.types.tuples.Pair;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Manager for the command confirmation system that enables the ability to add "confirmation" requirements to commands,

cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java

@@ -23,10 +23,9 @@
 //
 package cloud.commandframework.internal;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.LinkedList;
 import java.util.StringTokenizer;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Tokenizer that splits command inputs into tokens. This will split the string

cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.keys;
 
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Simple immutable implementation of {@link CloudKey}. Key equality is

cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java

@@ -27,12 +27,11 @@ import cloud.commandframework.Command;
 import cloud.commandframework.keys.CloudKey;
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static java.util.Objects.requireNonNull;
 

cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java

@@ -24,14 +24,13 @@
 package cloud.commandframework.meta;
 
 import io.leangen.geantyref.GenericTypeReflector;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A simple immutable string-string map containing command meta

cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java

@@ -25,11 +25,10 @@ package cloud.commandframework.meta;
 
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
+import java.util.function.Function;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.function.Function;
-
 final class SimpleKey<V> implements CommandMeta.Key<V> {
 
     private final @NonNull TypeToken<V> valueType;

cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java

@@ -23,14 +23,13 @@
 //
 package cloud.commandframework.permission;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Accepts if every single permission is accepted.

cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java

@@ -23,12 +23,11 @@
 //
 package cloud.commandframework.permission;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import static java.util.Objects.requireNonNull;
 

cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java

@@ -23,14 +23,13 @@
 //
 package cloud.commandframework.permission;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Accepts as long as at least one of the permissions is accepted

cloud-core/src/main/java/cloud/commandframework/permission/Permission.java

@@ -23,11 +23,10 @@
 //
 package cloud.commandframework.permission;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * {@link cloud.commandframework.arguments.CommandArgument} permission

cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java

@@ -26,11 +26,10 @@ package cloud.commandframework.permission;
 import cloud.commandframework.keys.CloudKey;
 import cloud.commandframework.keys.CloudKeyHolder;
 import cloud.commandframework.keys.SimpleCloudKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.function.Predicate;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A functional {@link CommandPermission} implementation

cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java

@@ -24,9 +24,8 @@
 package cloud.commandframework.permission;
 
 import cloud.commandframework.keys.CloudKey;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.function.Predicate;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class WrappingPredicatePermission<C> implements PredicatePermission<C> {