diff --git a/src/main/java/net/dv8tion/jda/api/entities/StageInstance.java b/src/main/java/net/dv8tion/jda/api/entities/StageInstance.java index 794a1e36fc..7e82633ac2 100644 --- a/src/main/java/net/dv8tion/jda/api/entities/StageInstance.java +++ b/src/main/java/net/dv8tion/jda/api/entities/StageInstance.java @@ -66,18 +66,6 @@ public interface StageInstance extends ISnowflake @Nonnull PrivacyLevel getPrivacyLevel(); - /** - * Whether this stage instance can be found in stage discovery. - * - * @return True if this is a public stage that can be found in stage discovery - * - * @deprecated Stage discovery has been removed from the platform - */ - @Deprecated - @ForRemoval - @DeprecatedSince("5.0.0") - boolean isDiscoverable(); - /** * All current speakers of this stage instance. * diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java index 3e6b387f2c..4bf72015ff 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java @@ -1252,7 +1252,6 @@ public StageInstance createStageInstance(GuildImpl guild, DataObject json) long id = json.getUnsignedLong("id"); String topic = json.getString("topic"); - boolean discoverable = !json.getBoolean("discoverable_disabled"); StageInstance.PrivacyLevel level = StageInstance.PrivacyLevel.fromKey(json.getInt("privacy_level", -1)); @@ -1265,7 +1264,6 @@ public StageInstance createStageInstance(GuildImpl guild, DataObject json) return instance .setPrivacyLevel(level) - .setDiscoverable(discoverable) .setTopic(topic); } diff --git a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java index a86511c1e9..5c3f166b7a 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java @@ -39,8 +39,6 @@ import net.dv8tion.jda.api.requests.restaction.order.ChannelOrderAction; import net.dv8tion.jda.api.requests.restaction.order.RoleOrderAction; import net.dv8tion.jda.api.requests.restaction.pagination.AuditLogPaginationAction; -import net.dv8tion.jda.api.requests.restaction.pagination.BanPaginationAction; -import net.dv8tion.jda.api.requests.restaction.pagination.PaginationAction; import net.dv8tion.jda.api.utils.cache.*; import net.dv8tion.jda.api.utils.concurrent.Task; import net.dv8tion.jda.api.utils.data.DataArray; @@ -58,7 +56,6 @@ import net.dv8tion.jda.internal.requests.restaction.order.RoleOrderActionImpl; import net.dv8tion.jda.internal.requests.restaction.pagination.AuditLogPaginationActionImpl; import net.dv8tion.jda.internal.requests.restaction.pagination.BanPaginationActionImpl; -import net.dv8tion.jda.internal.requests.restaction.pagination.PaginationActionImpl; import net.dv8tion.jda.internal.utils.*; import net.dv8tion.jda.internal.utils.cache.AbstractCacheView; import net.dv8tion.jda.internal.utils.cache.MemberCacheViewImpl; @@ -303,6 +300,7 @@ public RestAction> updateCommandPrivilegesById(@Nonnull S @Nonnull @Override + @SuppressWarnings("deprecation") public RestAction>> updateCommandPrivileges(@Nonnull Map> privileges) { Checks.notNull(privileges, "Privileges"); diff --git a/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java index bf8c03ded7..59a3fb88b7 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java @@ -38,7 +38,6 @@ public class StageInstanceImpl implements StageInstance private String topic; private PrivacyLevel privacyLevel; - private boolean discoverable; public StageInstanceImpl(long id, StageChannel channel) { @@ -83,12 +82,6 @@ public PrivacyLevel getPrivacyLevel() return privacyLevel; } - @Override - public boolean isDiscoverable() - { - return discoverable; - } - @Nonnull @Override public RestAction delete() @@ -120,12 +113,6 @@ public StageInstanceImpl setPrivacyLevel(PrivacyLevel privacyLevel) return this; } - public StageInstanceImpl setDiscoverable(boolean discoverable) - { - this.discoverable = discoverable; - return this; - } - private void checkPermissions() { EnumSet permissions = getGuild().getSelfMember().getPermissions(getChannel()); diff --git a/src/main/java/net/dv8tion/jda/internal/requests/Requester.java b/src/main/java/net/dv8tion/jda/internal/requests/Requester.java index 1610bcedcb..f2f3aa6123 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/Requester.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/Requester.java @@ -50,6 +50,7 @@ public class Requester public static final Logger LOG = JDALogger.getLog(Requester.class); public static final String DISCORD_API_PREFIX = Helpers.format("https://discord.com/api/v%d/", JDAInfo.DISCORD_REST_VERSION); public static final String USER_AGENT = "DiscordBot (" + JDAInfo.GITHUB + ", " + JDAInfo.VERSION + ")"; + @SuppressWarnings("deprecation") public static final RequestBody EMPTY_BODY = RequestBody.create(null, new byte[0]); public static final MediaType MEDIA_TYPE_JSON = MediaType.parse("application/json; charset=utf-8"); public static final MediaType MEDIA_TYPE_OCTET = MediaType.parse("application/octet-stream; charset=utf-8"); diff --git a/src/main/java/net/dv8tion/jda/internal/requests/RestActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/RestActionImpl.java index 4b660ee46d..6581ffd7e2 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/RestActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/RestActionImpl.java @@ -131,6 +131,7 @@ public RestActionImpl(JDA api, Route.CompiledRoute route, BiFunction, T> handler) { this(api, route, data == null ? null : RequestBody.create(Requester.MEDIA_TYPE_JSON, data.toJson()), handler); @@ -241,6 +242,7 @@ public T complete(boolean shouldQueue) throws RateLimitedException protected CaseInsensitiveMap finalizeHeaders() { return null; } protected BooleanSupplier finalizeChecks() { return null; } + @SuppressWarnings("deprecation") protected RequestBody getRequestBody(DataObject object) { this.rawData = object; @@ -248,6 +250,7 @@ protected RequestBody getRequestBody(DataObject object) return object == null ? null : RequestBody.create(Requester.MEDIA_TYPE_JSON, object.toJson()); } + @SuppressWarnings("deprecation") protected RequestBody getRequestBody(DataArray array) { this.rawData = array; diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java index 6088bbb05c..7c23bcd4b5 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java @@ -500,6 +500,7 @@ protected RequestBody asMultipart() return builder.build(); } + @SuppressWarnings("deprecation") protected RequestBody asJSON() { return RequestBody.create(Requester.MEDIA_TYPE_JSON, getJSON().toJson());