Merge pull request #4 from Tempo-Bot-Ltd/feat/premium-app-subscriptions

Document throwable exceptions and make overload functions defaults for EntitlementPaginationAction
discord-jda · Dec 11, 2023 · 7635deb · 7635deb
2 parents a7a9644 + 10826b7
commit 7635deb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/.../java/net/dv8tion/jda/api/requests/restaction/pagination/EntitlementPaginationAction.java b/.../java/net/dv8tion/jda/api/requests/restaction/pagination/EntitlementPaginationAction.java
@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.UserSnowflake;
+import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -85,21 +86,38 @@ public interface EntitlementPaginationAction extends PaginationAction<Entitlemen
      * @param guildId
      *        The guild id to filter by
      *
+     * @throws java.lang.IllegalArgumentException
+     *         If the provided {@code guildId} is {@code null}, empty or is not a valid snowflake
+     * @throws java.lang.NumberFormatException
+     *         If the provided {@code guildId} is negative or has a value greater than {@link Long#MAX_VALUE Long.MAX_VALUE}
+     *
      * @return The current EntitlementPaginationAction for chaining convenience
      */
     @Nonnull
-    EntitlementPaginationAction guild(@Nonnull String guildId);
+    default EntitlementPaginationAction guild(@Nonnull String guildId) {
+        Checks.notNull(guildId, "guildId");
+        Checks.isSnowflake(guildId, "guildId");
+        guild(Long.parseUnsignedLong(guildId));
+        return this;
+    }
 
     /**
      * Filters {@link Entitlement Entitlement} by a {@link Guild Guild}
      *
      * @param guild
      *        The {@link Guild Guild} to filter by
      *
+     * @throws java.lang.IllegalArgumentException
+     *         If the provided {@code guild} is {@code null}
+     *
      * @return The current EntitlementPaginationAction for chaining convenience
      */
     @Nonnull
-    EntitlementPaginationAction guild(@Nonnull Guild guild);
+    default EntitlementPaginationAction guild(@Nonnull Guild guild) {
+        Checks.notNull(guild, "guild");
+        guild(guild.getIdLong());
+        return this;
+    }
 
     /**
      * Whether to exclude subscriptions which have gone past their end date.

diff --git a/.../dv8tion/jda/internal/requests/restaction/pagination/EntitlementPaginationActionImpl.java b/.../dv8tion/jda/internal/requests/restaction/pagination/EntitlementPaginationActionImpl.java
@@ -18,20 +18,17 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Entitlement;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.UserSnowflake;
 import net.dv8tion.jda.api.exceptions.ParsingException;
 import net.dv8tion.jda.api.requests.Request;
 import net.dv8tion.jda.api.requests.Response;
 import net.dv8tion.jda.api.requests.Route;
 import net.dv8tion.jda.api.requests.restaction.pagination.EntitlementPaginationAction;
 import net.dv8tion.jda.api.requests.restaction.pagination.PaginationAction;
-import net.dv8tion.jda.api.utils.MiscUtil;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.entities.EntityBuilder;
 import net.dv8tion.jda.internal.utils.Checks;
-import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -110,25 +107,6 @@ public EntitlementPaginationAction guild(long guildId)
         return this;
     }
 
-    @NotNull
-    @Override
-    public EntitlementPaginationAction guild(@NotNull String guildId)
-    {
-        Checks.notNull(guildId, "guildId");
-        Checks.isSnowflake(guildId, "guildId");
-        this.guildId = MiscUtil.parseSnowflake(guildId);
-        return this;
-    }
-
-    @NotNull
-    @Override
-    public EntitlementPaginationAction guild(@NotNull Guild guild)
-    {
-        Checks.notNull(guild, "guild");
-        this.guildId = guild.getIdLong();
-        return this;
-    }
-
     @Nonnull
     @Override
     public EntitlementPaginationAction excludeEnded(boolean excludeEnded)