diff --git a/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt b/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt index c1f5a35..04c226d 100644 --- a/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt +++ b/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt @@ -36,7 +36,6 @@ import org.junit.jupiter.api.assertThrows import org.mockito.Mockito.mock import org.mockito.Mockito.times import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyNoInteractions @DisplayName("Regression tests") class RegressionTest { diff --git a/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java b/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java index e4a2d90..965218f 100644 --- a/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java +++ b/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java @@ -20,20 +20,7 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.Object; -import java.lang.String; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import org.enginehub.piston.CommandManager; @@ -43,6 +30,15 @@ import org.enginehub.piston.inject.Key; import org.enginehub.piston.part.CommandArgument; +import java.lang.reflect.Method; +import java.util.Collection; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; +import static org.enginehub.piston.part.CommandParts.arg; + final class CollectionArgRegistration implements CommandRegistration { private static final Key string_Key = Key.of(String.class); private static final Key object_Key = Key.of(Object.class); diff --git a/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java b/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java index 7d39cf9..5594755 100644 --- a/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java +++ b/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java @@ -20,18 +20,7 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import org.enginehub.piston.CommandManager; @@ -41,6 +30,15 @@ import org.enginehub.piston.gen.CommandRegistration; import org.enginehub.piston.part.CommandArgument; +import java.lang.reflect.Method; +import java.util.Collection; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; +import static org.enginehub.piston.part.CommandParts.arg; + final class CommandValueArgRegistration implements CommandRegistration { private CommandManager commandManager; diff --git a/core-ap/processor/src/test/resources/gen/FlagsRegistration.java b/core-ap/processor/src/test/resources/gen/FlagsRegistration.java index d0dcaf9..29364d9 100644 --- a/core-ap/processor/src/test/resources/gen/FlagsRegistration.java +++ b/core-ap/processor/src/test/resources/gen/FlagsRegistration.java @@ -19,19 +19,7 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.String; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import org.enginehub.piston.CommandManager; @@ -42,6 +30,15 @@ import org.enginehub.piston.part.ArgAcceptingCommandFlag; import org.enginehub.piston.part.NoArgCommandFlag; +import java.lang.reflect.Method; +import java.util.Collection; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; +import static org.enginehub.piston.part.CommandParts.flag; + final class FlagsRegistration implements CommandRegistration { private static final Key string_Key = Key.of(String.class); private CommandManager commandManager; diff --git a/core-ap/processor/src/test/resources/gen/IntArgRegistration.java b/core-ap/processor/src/test/resources/gen/IntArgRegistration.java index c99123c..b9367f5 100644 --- a/core-ap/processor/src/test/resources/gen/IntArgRegistration.java +++ b/core-ap/processor/src/test/resources/gen/IntArgRegistration.java @@ -19,24 +19,7 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.Integer; -import java.lang.NoSuchMethodException; -import java.lang.Object; -import java.lang.RuntimeException; -import java.lang.Throwable; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.List; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import org.enginehub.piston.CommandManager; @@ -49,6 +32,17 @@ import org.enginehub.piston.inject.Key; import org.enginehub.piston.part.CommandArgument; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.List; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; +import static org.enginehub.piston.part.CommandParts.arg; + final class IntArgRegistration implements CommandRegistration { private static final Key integer_Key = Key.of(Integer.class); private static final Key integer_injectGamma_something_to_match__Key = Key.of(Integer.class, new Object() { diff --git a/core-ap/processor/src/test/resources/gen/NoArgRegistration.java b/core-ap/processor/src/test/resources/gen/NoArgRegistration.java index f404237..618cc17 100644 --- a/core-ap/processor/src/test/resources/gen/NoArgRegistration.java +++ b/core-ap/processor/src/test/resources/gen/NoArgRegistration.java @@ -19,19 +19,7 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.Exception; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; import net.kyori.adventure.text.TextComponent; import org.enginehub.piston.Command; import org.enginehub.piston.CommandManager; @@ -40,6 +28,14 @@ import org.enginehub.piston.gen.CommandCallListener; import org.enginehub.piston.gen.CommandRegistration; +import java.lang.reflect.Method; +import java.util.Collection; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; + final class NoArgRegistration implements CommandRegistration { private CommandManager commandManager; diff --git a/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java b/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java index f26ac12..38d5f89 100644 --- a/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java +++ b/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java @@ -19,21 +19,8 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; -import java.lang.Object; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.concurrent.Callable; import net.kyori.adventure.text.TextComponent; import org.enginehub.piston.CommandManager; import org.enginehub.piston.CommandParameters; @@ -41,6 +28,16 @@ import org.enginehub.piston.gen.CommandRegistration; import org.enginehub.piston.inject.Key; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.concurrent.Callable; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; +import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; + final class NonArgParametersRegistration implements CommandRegistration { private static final Key> callable$Object_Key = Key.of(new TypeToken>() { }); diff --git a/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java b/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java index fcf228e..f2c0c15 100644 --- a/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java +++ b/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java @@ -19,25 +19,21 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.lang.Exception; -import java.lang.Throwable; -import java.lang.reflect.Method; -import java.util.Collection; import net.kyori.adventure.text.TextComponent; import org.enginehub.piston.CommandManager; import org.enginehub.piston.CommandParameters; import org.enginehub.piston.gen.CommandCallListener; import org.enginehub.piston.gen.CommandRegistration; +import java.lang.reflect.Method; +import java.util.Collection; + +import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; +import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; +import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; + final class Outer_BasicNestedRegistration implements CommandRegistration { private CommandManager commandManager; diff --git a/core-ap/processor/src/test/resources/gen/SuperTypeRegistration.java b/core-ap/processor/src/test/resources/gen/SuperTypeRegistration.java index 650a135..f38f26f 100644 --- a/core-ap/processor/src/test/resources/gen/SuperTypeRegistration.java +++ b/core-ap/processor/src/test/resources/gen/SuperTypeRegistration.java @@ -20,22 +20,15 @@ package eh; -import static org.enginehub.piston.internal.RegistrationUtil.getCommandMethod; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterCall; -import static org.enginehub.piston.internal.RegistrationUtil.listenersAfterThrow; -import static org.enginehub.piston.internal.RegistrationUtil.listenersBeforeCall; -import static org.enginehub.piston.internal.RegistrationUtil.requireOptional; -import static org.enginehub.piston.part.CommandParts.arg; -import static org.enginehub.piston.part.CommandParts.flag; - import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.enginehub.piston.CommandManager; import org.enginehub.piston.gen.CommandCallListener; import org.enginehub.piston.gen.CommandRegistration; import org.enginehub.piston.gen.EmptySuperClass; import org.enginehub.piston.gen.EmptySuperInterface; +import java.util.Collection; + final class SuperTypeRegistration extends EmptySuperClass implements CommandRegistration, EmptySuperInterface { private CommandManager commandManager; diff --git a/core/src/test/java/org/enginehub/piston/ConditionTest.java b/core/src/test/java/org/enginehub/piston/ConditionTest.java index 05464d3..855ed29 100644 --- a/core/src/test/java/org/enginehub/piston/ConditionTest.java +++ b/core/src/test/java/org/enginehub/piston/ConditionTest.java @@ -19,7 +19,6 @@ package org.enginehub.piston; -import org.enginehub.piston.inject.InjectedValueAccess; import org.junit.jupiter.api.Test; import static org.enginehub.piston.Command.Condition.FALSE; diff --git a/default-impl/src/main/java/org/enginehub/piston/impl/CommandParser.java b/default-impl/src/main/java/org/enginehub/piston/impl/CommandParser.java index 323415b..c7256bf 100644 --- a/default-impl/src/main/java/org/enginehub/piston/impl/CommandParser.java +++ b/default-impl/src/main/java/org/enginehub/piston/impl/CommandParser.java @@ -19,22 +19,6 @@ package org.enginehub.piston.impl; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import static java.util.Objects.requireNonNull; - - -import javax.annotation.Nullable; -import java.util.HashSet; -import java.util.Iterator; -import java.util.ListIterator; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ThreadLocalRandom; -import java.util.function.Consumer; -import java.util.stream.Collectors; - import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -68,6 +52,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; +import java.util.HashSet; +import java.util.Iterator; +import java.util.ListIterator; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ThreadLocalRandom; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + class CommandParser { private static final Logger LOGGER = LoggerFactory.getLogger(CommandParser.class);