From a6c3bb5aa2f9735cec8bf1cb2cdd66856b803278 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sun, 25 Jul 2021 17:27:32 +0200 Subject: [PATCH] [AB-313] ignoring referenced message parameter in parameter handler if not needed --- .../parameter/handler/TrackedEmoteParameterHandler.java | 3 ++- .../handler/TrackedEmoteParameterParameterHandler.java | 3 ++- .../command/handler/TrackedEmoteParameterHandlerTest.java | 2 ++ .../handler/TrackedEmoteParameterParameterHandlerTest.java | 2 ++ .../core/command/handler/AChannelParameterHandlerImpl.java | 3 ++- .../core/command/handler/AEmoteParameterHandlerImpl.java | 3 ++- .../core/command/handler/ARoleParameterHandlerImpl.java | 3 ++- .../command/handler/AUserInAServerParameterHandlerImpl.java | 3 ++- .../core/command/handler/CombinedParameterHandlerImpl.java | 3 ++- .../core/command/handler/EmoteParameterHandlerImpl.java | 3 ++- .../core/command/handler/FullEmoteParameterHandlerImpl.java | 3 ++- .../core/command/handler/FullRoleParameterHandlerImpl.java | 3 ++- .../core/command/handler/MemberParameterHandlerImpl.java | 3 ++- .../core/command/handler/StringParameterHandlerImpl.java | 3 ++- .../core/command/handler/UserParameterHandlerImpl.java | 3 ++- .../core/command/handler/AChannelParameterHandlerImplTest.java | 2 ++ .../command/handler/AEmoteParameterHandlerImplImplTest.java | 2 ++ .../command/handler/ARoleParameterHandlerImplImplTest.java | 2 ++ .../core/command/handler/EmoteParameterHandlerImplTest.java | 2 ++ .../command/handler/FullEmoteParameterHandlerImplImplTest.java | 2 ++ .../command/handler/FullRoleParameterHandlerImplImplTest.java | 2 ++ .../core/command/handler/MemberParameterHandlerImplTest.java | 2 ++ 22 files changed, 44 insertions(+), 13 deletions(-) diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterHandler.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterHandler.java index 8daa3ea13..637926837 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterHandler.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterHandler.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.statistic.emote.command.parameter.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.CommandParameterHandler; import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators; @@ -38,7 +39,7 @@ public class TrackedEmoteParameterHandler implements CommandParameterHandler { */ @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(TrackedEmote.class); + return clazz.equals(TrackedEmote.class) && value.getType().equals(ParameterPieceType.STRING); } /** diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterParameterHandler.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterParameterHandler.java index 7bd3cd647..e8e7cfd27 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterParameterHandler.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/parameter/handler/TrackedEmoteParameterParameterHandler.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.statistic.emote.command.parameter.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.CommandParameterHandler; import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators; @@ -42,7 +43,7 @@ public class TrackedEmoteParameterParameterHandler implements CommandParameterHa */ @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(TrackEmoteParameter.class); + return clazz.equals(TrackEmoteParameter.class) && value.getType().equals(ParameterPieceType.STRING); } /** diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterHandlerTest.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterHandlerTest.java index 34576889b..fa47f18c1 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterHandlerTest.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterHandlerTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.statistic.emote.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators; import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler; @@ -70,6 +71,7 @@ public class TrackedEmoteParameterHandlerTest { @Test public void testHandleCorrect() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(TrackedEmote.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterParameterHandlerTest.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterParameterHandlerTest.java index 107b52b95..b49fdcf60 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterParameterHandlerTest.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/command/handler/TrackedEmoteParameterParameterHandlerTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.statistic.emote.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.CommandParameterIterators; import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler; @@ -73,6 +74,7 @@ public class TrackedEmoteParameterParameterHandlerTest { @Test public void testHandleCorrect() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(TrackEmoteParameter.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImpl.java index 9a7eccc53..cdd5b7aed 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.AChannelParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.TextChannelParameterHandler; @@ -28,7 +29,7 @@ public class AChannelParameterHandlerImpl implements AChannelParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(AChannel.class); + return clazz.equals(AChannel.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImpl.java index 6a890f73d..32504ef7f 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.AEmoteParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler; @@ -28,7 +29,7 @@ public class AEmoteParameterHandlerImpl implements AEmoteParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(AEmote.class); + return clazz.equals(AEmote.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImpl.java index bcd486c69..bd9a279f7 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.ARoleParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.RoleParameterHandler; @@ -32,7 +33,7 @@ public class ARoleParameterHandlerImpl implements ARoleParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(ARole.class); + return clazz.equals(ARole.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AUserInAServerParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AUserInAServerParameterHandlerImpl.java index 4f7612bff..31ce23506 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AUserInAServerParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AUserInAServerParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.AUserInAServerParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.MemberParameterHandler; @@ -56,7 +57,7 @@ public class AUserInAServerParameterHandlerImpl implements AUserInAServerParamet @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(AUserInAServer.class); + return clazz.equals(AUserInAServer.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CombinedParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CombinedParameterHandlerImpl.java index 938af2a57..8a2e8b9f7 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CombinedParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CombinedParameterHandlerImpl.java @@ -4,6 +4,7 @@ import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.exception.IncorrectParameterException; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.parameter.CombinedParameter; import dev.sheldan.abstracto.core.command.handler.provided.CombinedParametersHandler; @@ -76,7 +77,7 @@ public class CombinedParameterHandlerImpl implements CombinedParametersHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(CombinedParameter.class); + return clazz.equals(CombinedParameter.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImpl.java index bc09d150b..ddefe6791 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler; import net.dv8tion.jda.api.entities.Emote; @@ -17,7 +18,7 @@ public class EmoteParameterHandlerImpl implements EmoteParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(Emote.class); + return clazz.equals(Emote.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImpl.java index 85b5c3672..54f974573 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.EmoteParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.FullEmoteParameterHandler; @@ -29,7 +30,7 @@ public class FullEmoteParameterHandlerImpl implements FullEmoteParameterHandler @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(FullEmote.class); + return clazz.equals(FullEmote.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImpl.java index e6f11c4c1..a9ce43ab6 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.FullRoleParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.RoleParameterHandler; @@ -29,7 +30,7 @@ public class FullRoleParameterHandlerImpl implements FullRoleParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(FullRole.class); + return clazz.equals(FullRole.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImpl.java index f310aee25..72e064534 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImpl.java @@ -4,6 +4,7 @@ import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.exception.AbstractoTemplatedException; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.MemberParameterHandler; import net.dv8tion.jda.api.entities.Member; @@ -20,7 +21,7 @@ import java.util.regex.Matcher; public class MemberParameterHandlerImpl implements MemberParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(Member.class); + return clazz.equals(Member.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/StringParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/StringParameterHandlerImpl.java index febff94ee..dda37912b 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/StringParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/StringParameterHandlerImpl.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.StringParameterHandler; import net.dv8tion.jda.api.entities.Message; @@ -22,7 +23,7 @@ public class StringParameterHandlerImpl implements StringParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(String.class); + return clazz.equals(String.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/UserParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/UserParameterHandlerImpl.java index 93e446669..a609faf23 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/UserParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/UserParameterHandlerImpl.java @@ -4,6 +4,7 @@ import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.CommandConstants; import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.exception.AbstractoTemplatedException; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.handler.provided.MemberParameterHandler; import dev.sheldan.abstracto.core.command.handler.provided.UserParameterHandler; @@ -24,7 +25,7 @@ public class UserParameterHandlerImpl implements UserParameterHandler { @Override public boolean handles(Class clazz, UnparsedCommandParameterPiece value) { - return clazz.equals(User.class); + return clazz.equals(User.class) && value.getType().equals(ParameterPieceType.STRING); } @Override diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImplTest.java index 7f2a5639c..852895d94 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.service.ChannelService; @@ -51,6 +52,7 @@ public class AChannelParameterHandlerImplTest extends AbstractParameterHandlerTe @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(AChannel.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImplImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImplImplTest.java index dccef00f3..4264061a8 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImplImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/AEmoteParameterHandlerImplImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.service.CommandService; import dev.sheldan.abstracto.core.models.database.AEmote; @@ -59,6 +60,7 @@ public class AEmoteParameterHandlerImplImplTest extends AbstractParameterHandler @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(AEmote.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImplImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImplImplTest.java index be93be9e9..cc230e4b2 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImplImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/ARoleParameterHandlerImplImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.service.CommandService; import dev.sheldan.abstracto.core.models.database.ARole; @@ -58,6 +59,7 @@ public class ARoleParameterHandlerImplImplTest extends AbstractParameterHandlerT @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(ARole.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImplTest.java index 6fa1b181f..219d768c2 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import net.dv8tion.jda.api.entities.Emote; import net.dv8tion.jda.api.entities.Guild; @@ -50,6 +51,7 @@ public class EmoteParameterHandlerImplTest extends AbstractParameterHandlerTest @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(Emote.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImplImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImplImplTest.java index b2f4670f8..2b9719035 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImplImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullEmoteParameterHandlerImplImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.service.CommandService; import dev.sheldan.abstracto.core.models.FullEmote; @@ -59,6 +60,7 @@ public class FullEmoteParameterHandlerImplImplTest extends AbstractParameterHand @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(FullEmote.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImplImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImplImplTest.java index 4cfe5891b..ab7d32f4b 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImplImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/FullRoleParameterHandlerImplImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import dev.sheldan.abstracto.core.command.service.CommandService; import dev.sheldan.abstracto.core.models.FullRole; @@ -59,6 +60,7 @@ public class FullRoleParameterHandlerImplImplTest extends AbstractParameterHandl @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(FullRole.class, unparsedCommandParameterPiece)); } diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImplTest.java index 4436e61a3..47b37e4e2 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImplTest.java @@ -2,6 +2,7 @@ package dev.sheldan.abstracto.core.command.handler; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.execution.ParameterPieceType; import dev.sheldan.abstracto.core.command.execution.UnparsedCommandParameterPiece; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; @@ -54,6 +55,7 @@ public class MemberParameterHandlerImplTest extends AbstractParameterHandlerTest @Test public void testSuccessfulCondition() { + when(unparsedCommandParameterPiece.getType()).thenReturn(ParameterPieceType.STRING); Assert.assertTrue(testUnit.handles(Member.class, unparsedCommandParameterPiece)); }