Rename SlashCommandInteractionOptionsProvider methods that are only u…

…sable if they get arguments from getOption* to getArgument* and changed the implementation to get the arguments instead

build.gradle.kts

@@ -6,8 +6,8 @@ plugins {
     `java-library`
     `maven-publish`
     signing
-    id("com.github.johnrengelman.shadow") version "2.0.4" apply false
-    id("net.researchgate.release") version "2.7.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+    id("net.researchgate.release") version "3.0.2" apply false
 }
 
 repositories {

javacord-api/build.gradle.kts

@@ -2,8 +2,8 @@ import java.time.Instant
 
 plugins {
     `java-library`
-    id("com.gorylenko.gradle-git-properties") version "2.4.0"
-    id("biz.aQute.bnd.builder") version "6.2.0"
+    id("com.gorylenko.gradle-git-properties") version "2.4.1"
+    id("biz.aQute.bnd.builder") version "6.3.1"
 }
 
 repositories {

javacord-api/src/main/java/org/javacord/api/interaction/SlashCommandInteraction.java

@@ -1,19 +1,7 @@
 package org.javacord.api.interaction;
 
-import java.util.List;
-
 public interface SlashCommandInteraction extends ApplicationCommandInteraction, SlashCommandInteractionOptionsProvider {
 
-    /**
-     * Gets the arguments of this slash command if there are any.
-     *
-     * <p>This is a shorthand method to avoid checking for Subcommmands or SubcommandGroups
-     * to get the slash command arguments.
-     *
-     * @return The argument options.
-     */
-    List<SlashCommandInteractionOption> getArguments();
-
     /**
      * Gets the full command name of this slash command including the name of the Subcommand and SubcommandGroup.
      *

javacord-core/build.gradle.kts

@@ -2,7 +2,7 @@ import aQute.bnd.version.MavenVersion.parseMavenString
 
 plugins {
     `java-library`
-    id("biz.aQute.bnd.builder") version "6.2.0"
+    id("biz.aQute.bnd.builder") version "6.3.1"
 }
 
 repositories {

javacord-core/src/main/java/org/javacord/core/interaction/SlashCommandInteractionImpl.java

@@ -100,6 +100,8 @@ public String getCommandName() {
         return commandName;
     }
 
+    // TODO: Move the implementation to the SlashCommandInteractionOptionsProvider once we upgraded to Java 9+
+    // because interfaces currently do not support private methods
     @Override
     public List<SlashCommandInteractionOption> getArguments() {
         return getArgumentsRecursive(getOptions());

javacord-core/src/main/java/org/javacord/core/interaction/SlashCommandInteractionOptionImpl.java

@@ -242,4 +242,21 @@ public Optional<CompletableFuture<Mentionable>> requestMentionableValue() {
     public List<SlashCommandInteractionOption> getOptions() {
         return Collections.unmodifiableList(options);
     }
+
+    // TODO: Move the implementation to the SlashCommandInteractionOptionsProvider once we upgraded to Java 9+
+    // because interfaces currently do not support private methods
+    @Override
+    public List<SlashCommandInteractionOption> getArguments() {
+        return getArgumentsRecursive(getOptions());
+    }
+
+    private List<SlashCommandInteractionOption> getArgumentsRecursive(List<SlashCommandInteractionOption> options) {
+        if (options.isEmpty()) {
+            return Collections.emptyList();
+        } else if (options.get(0).isSubcommandOrGroup()) {
+            return getArgumentsRecursive(options.get(0).getOptions());
+        } else {
+            return options;
+        }
+    }
 }