diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9d733d07..c54dd4ecf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: id: version run: echo "version=$(mvn --file abstracto-application/pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV - name: Publish to GitHub Packages - run: mvn --file abstracto-application/pom.xml -B deploy -P documentation,deployment-docker -Dmaven.wagon.http.pool=false -DskipTests=true + run: mvn --file abstracto-application/pom.xml -B deploy -P documentation,javadoc -Dmaven.wagon.http.pool=false -DskipTests=true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy documentation to GitHub pages 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 2089c86ea..9a7eccc53 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 @@ -35,7 +35,7 @@ public class AChannelParameterHandlerImpl implements AChannelParameterHandler { public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { TextChannel textChannel = (TextChannel) textChannelParameterHandler.handle(input, iterators, param, context, command); if(textChannel == null) { - Long channelId = Long.parseLong((String) input.getValue()); + Long channelId = Long.parseLong(((String) input.getValue()).trim()); AChannel actualInstance = channelManagementService.loadChannel(channelId); return AChannel.builder().fake(true).id(actualInstance.getId()).build(); } else { 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 d596bc249..4f7612bff 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 @@ -41,7 +41,7 @@ public class AUserInAServerParameterHandlerImpl implements AUserInAServerParamet Member member = (Member) o; actualInstance = userInServerManagementService.loadOrCreateUser(member); } else { - Long userId = Long.parseLong((String) input.getValue()); + Long userId = Long.parseLong(((String) input.getValue()).trim()); actualInstance = userInServerManagementService.loadAUserInAServerOptional(context.getGuild().getIdLong(), userId).orElseThrow(() -> new UserInServerNotFoundException(0L)); } future.complete(AUserInAServer.builder().userInServerId(actualInstance.getUserInServerId()).build()); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImpl.java index af6223385..19833643d 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImpl.java @@ -18,7 +18,7 @@ public class BooleanParameterHandlerImpl implements BooleanParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return Boolean.valueOf((String) input.getValue()); + return Boolean.valueOf(((String) input.getValue()).trim()); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupParameterHandlerImpl.java index 0bff772c3..e95b364b9 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupParameterHandlerImpl.java @@ -28,7 +28,7 @@ public class ChannelGroupParameterHandlerImpl implements ChannelGroupParameterHa @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { AServer server = serverManagementService.loadServer(context.getGuild().getIdLong()); - String inputString = (String) input.getValue(); + String inputString = ((String) input.getValue()).trim(); AChannelGroup actualInstance = channelGroupManagementService.findByNameAndServerOptional(inputString, server) .orElseThrow(() -> new ChannelGroupNotFoundException(inputString, channelGroupManagementService.getAllAvailableAsString(server))); ChannelGroupType channelGroupType = ChannelGroupType diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupTypeParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupTypeParameterHandlerImpl.java index 681db9e17..0a58cdf6d 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupTypeParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupTypeParameterHandlerImpl.java @@ -29,7 +29,7 @@ public class ChannelGroupTypeParameterHandlerImpl implements ChannelGroupTypePar @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - ChannelGroupType actualGroupType = channelGroupTypeManagementService.findChannelGroupTypeByKey((String) input.getValue()); + ChannelGroupType actualGroupType = channelGroupTypeManagementService.findChannelGroupTypeByKey(((String) input.getValue()).trim()); return ChannelGroupType .builder() .groupTypeKey(actualGroupType.getGroupTypeKey()) diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandKeyParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandKeyParameterHandlerImpl.java index 12b04dbbb..dd118e53a 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandKeyParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandKeyParameterHandlerImpl.java @@ -20,7 +20,7 @@ public class CommandKeyParameterHandlerImpl implements CommandKeyParameterHandle @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return CommandParameterKey.getEnumFromKey(param.getType(), (String) input.getValue()); + return CommandParameterKey.getEnumFromKey(param.getType(), ((String) input.getValue()).trim()); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DoubleParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DoubleParameterHandlerImpl.java index 6ed931ef0..2334c9415 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DoubleParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DoubleParameterHandlerImpl.java @@ -18,7 +18,7 @@ public class DoubleParameterHandlerImpl implements DoubleParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return Double.parseDouble((String) input.getValue()); + return Double.parseDouble(((String) input.getValue()).trim()); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImpl.java index 5b2019690..6becc416e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImpl.java @@ -21,7 +21,7 @@ public class DurationParameterHandlerImpl implements DurationParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return ParseUtils.parseDuration((String) input.getValue()); + return ParseUtils.parseDuration(((String) input.getValue()).trim()); } @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 2fa78bf27..bc09d150b 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 @@ -22,7 +22,7 @@ public class EmoteParameterHandlerImpl implements EmoteParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - String inputString = (String) input.getValue(); + String inputString = ((String) input.getValue()).trim(); Matcher matcher = Message.MentionType.EMOTE.getPattern().matcher(inputString); if(matcher.matches() && iterators.getEmoteIterator().hasNext()) { return iterators.getEmoteIterator().next(); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImpl.java index 75c255a6e..bd534c943 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImpl.java @@ -19,7 +19,7 @@ public class IntegerParameterHandlerImpl implements IntegerParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return Integer.parseInt((String) input.getValue()); + return Integer.parseInt(((String) input.getValue()).trim()); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImpl.java index a203ea911..a01102105 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImpl.java @@ -19,7 +19,7 @@ public class LongParameterHandlerImpl implements LongParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - return Long.parseLong((String) input.getValue()); + return Long.parseLong(((String) input.getValue()).trim()); } @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 bdb16e7c6..f310aee25 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 @@ -30,7 +30,7 @@ public class MemberParameterHandlerImpl implements MemberParameterHandler { @Override public CompletableFuture handleAsync(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - String inputString = (String) input.getValue(); + String inputString = ((String) input.getValue()).trim(); Matcher matcher = Message.MentionType.USER.getPattern().matcher(inputString); if(matcher.matches() && iterators.getMemberIterator().hasNext()) { return CompletableFuture.completedFuture(iterators.getMemberIterator().next()); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/RoleParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/RoleParameterHandlerImpl.java index ec7314094..3544b742a 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/RoleParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/RoleParameterHandlerImpl.java @@ -24,7 +24,7 @@ public class RoleParameterHandlerImpl implements RoleParameterHandler { @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - String inputString = (String) input.getValue(); + String inputString = ((String) input.getValue()).trim(); Matcher matcher = Message.MentionType.ROLE.getPattern().matcher(inputString); if(matcher.matches() && iterators.getRoleIterator().hasNext()) { return iterators.getRoleIterator().next(); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImpl.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImpl.java index 3b07825fe..ce6a26031 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImpl.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImpl.java @@ -24,7 +24,7 @@ public class TextChannelParameterHandlerImpl implements TextChannelParameterHand @Override public Object handle(UnparsedCommandParameterPiece input, CommandParameterIterators iterators, Parameter param, Message context, Command command) { - String inputString = (String) input.getValue(); + String inputString = ((String) input.getValue()).trim(); Matcher matcher = Message.MentionType.CHANNEL.getPattern().matcher(inputString); if(matcher.matches() && iterators.getChannelIterator().hasNext()) { return iterators.getChannelIterator().next(); diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImplTest.java index 2fb132ab7..60bde84c1 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImplTest.java @@ -51,12 +51,6 @@ public class BooleanParameterHandlerImplTest extends AbstractParameterHandlerTes Assert.assertFalse((Boolean)testUnit.handle(piece, null, parameter, null, command)); } - @Test - public void testNullInput() { - UnparsedCommandParameterPiece piece = getPieceWithValue(null); - Assert.assertFalse((Boolean)testUnit.handle(piece, null, parameter, null, command)); - } - @Test public void testEmptyStringAsInput() { UnparsedCommandParameterPiece piece = getPieceWithValue(""); diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImplTest.java index 453f9099d..0e42de287 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImplTest.java @@ -54,11 +54,6 @@ public class DurationParameterHandlerImplTest extends AbstractParameterHandlerTe Assert.assertEquals(targetDuration, testUnit.handle(getPieceWithValue("5h5m4d"), null, parameter, null, command)); } - @Test(expected = DurationFormatException.class) - public void testNullInput() { - testUnit.handle(getPieceWithValue(null), null, parameter, null, command); - } - @Test(expected = DurationFormatException.class) public void testEmptyStringAsInput() { testUnit.handle(getPieceWithValue(""), null, parameter, null, command); diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImplTest.java index 059129588..01386cd60 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImplTest.java @@ -60,11 +60,6 @@ public class IntegerParameterHandlerImplTest extends AbstractParameterHandlerTes testUnit.handle(getPieceWithValue("someText"), null, parameter, null, command); } - @Test(expected = NumberFormatException.class) - public void testNullInput() { - testUnit.handle(getPieceWithValue(null), null, parameter, null, command); - } - @Test(expected = NumberFormatException.class) public void testEmptyStringAsInput() { testUnit.handle(getPieceWithValue(""), null, parameter, null, command); diff --git a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImplTest.java b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImplTest.java index f35eed361..485dbf528 100644 --- a/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImplTest.java +++ b/abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImplTest.java @@ -59,11 +59,6 @@ public class LongParameterHandlerImplTest extends AbstractParameterHandlerTest { testUnit.handle(getPieceWithValue("someText"), null, parameter, null, command); } - @Test(expected = NumberFormatException.class) - public void testNullInput() { - testUnit.handle(getPieceWithValue(null), null, parameter, null, command); - } - @Test(expected = NumberFormatException.class) public void testEmptyStringAsInput() { testUnit.handle(getPieceWithValue(""), null, parameter, null, command); diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java index 877a2f6fd..f3b0b044c 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; @Getter public class UnParsedCommandParameter { - private static Pattern SPLIT_REGEX = Pattern.compile("\"([^\"]*)\"|(\\S+)"); + private static Pattern SPLIT_REGEX = Pattern.compile("\"([^\"]*)\"|(\\S+\\n*)"); public UnParsedCommandParameter(String parameters, Message message) { this.parameters = new ArrayList<>(); diff --git a/abstracto-application/pom.xml b/abstracto-application/pom.xml index 227a3a350..db4bcf47c 100644 --- a/abstracto-application/pom.xml +++ b/abstracto-application/pom.xml @@ -139,21 +139,31 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - + + + javadoc + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + +