Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-12 09:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-246] fixing new lines being removed from parameters

Browse Source 
creating javadoc profile to only build javadoc on release builds
This commit is contained in:
Sheldan
2021-05-02 20:33:23 +02:00
parent bbae3575f8
commit a35cc0ab61
21 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AChannelParameterHandlerImpl.java
View File

@@ -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 {

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/AUserInAServerParameterHandlerImpl.java
View File

@@ -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());

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/ChannelGroupTypeParameterHandlerImpl.java
View File

@@ -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())

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandKeyParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DoubleParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/EmoteParameterHandlerImpl.java
View File

@@ -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();

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImpl.java
View File

@@ -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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/MemberParameterHandlerImpl.java
View File

@@ -30,7 +30,7 @@ public class MemberParameterHandlerImpl implements MemberParameterHandler {
@Override
public CompletableFuture<Object> 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());

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/RoleParameterHandlerImpl.java
View File

@@ -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();

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/handler/TextChannelParameterHandlerImpl.java
View File

@@ -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();

6
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/BooleanParameterHandlerImplTest.java
View File

@@ -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("");

5
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/DurationParameterHandlerImplTest.java
View File

@@ -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);

5
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/IntegerParameterHandlerImplTest.java
View File

@@ -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);

5
abstracto-application/core/core-impl/src/test/java/dev/sheldan/abstracto/core/command/handler/LongParameterHandlerImplTest.java
View File

@@ -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);

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java
View File

@@ -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<>();

34
abstracto-application/pom.xml
View File

@@ -139,21 +139,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>javadoc</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>