From 62afe293e0469f0b826ce51182fb700729bb503d Mon Sep 17 00:00:00 2001 From: Vankka Date: Sun, 7 Jul 2024 13:29:01 +0300 Subject: [PATCH] Get rid of unwanted annotations at compile time --- api/build.gradle | 2 +- build.gradle | 11 +++++++- .../bukkit/scheduler/IFoliaScheduler.java | 4 +++ .../discordsrv/common/AbstractDiscordSRV.java | 8 +++--- .../discordsrv/common/ServerDiscordSRV.java | 4 +-- .../FieldValueDiscovererProxy.java | 2 +- .../OrderedFieldDiscovererProxy.java | 2 +- .../abstraction/ConfigurateConfigManager.java | 2 +- .../serializer/ColorSerializer.java | 2 +- .../DiscordMessageEmbedSerializer.java | 2 +- .../serializer/EnumSerializer.java | 2 +- .../MinecraftMessageSerializer.java | 2 +- .../serializer/PatternSerializer.java | 2 +- .../SendableDiscordMessageSerializer.java | 2 +- .../main/channels/base/IChannelConfig.java | 2 +- .../discordsrv/common/debug/DebugReport.java | 1 - .../common/discord/api/DiscordAPIImpl.java | 10 +++---- .../common/groupsync/GroupSyncModule.java | 2 +- .../linking/impl/CachedLinkProvider.java | 26 +++++++++---------- .../common/module/type/PluginIntegration.java | 5 ++-- .../placeholder/PlaceholderServiceImpl.java | 5 ++-- settings.gradle | 5 ++-- 22 files changed, 54 insertions(+), 49 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index bd69b916..a20811a5 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'maven-publish' dependencies { // Annotations compileOnlyApi(libs.jetbrains.annotations) - compileOnlyApi(libs.findbugs.annotations) // JDA api(libs.jda) { @@ -17,6 +16,7 @@ dependencies { // Relocations are in buildscript/api.gradle sourceSets { + // Annotation Processor ap { java { compileClasspath += sourceSets.main.compileClasspath + sourceSets.main.output diff --git a/build.gradle b/build.gradle index 5e84b7f2..525b996d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,15 @@ subprojects { runtimeClasspath.extendsFrom runtimeExclude runtimeDownloadOnly.extendsFrom runtimeExclude + // Exclude dependencies at compile time + compileExclude { + // Stuff we aren't using but is included with dependencies + exclude group: 'org.checkerframework', module: 'checker-qual' + exclude group: 'com.google.code.findbugs', module: 'jsr305' + exclude group: 'com.google.errorprone', module: 'error_prone_annotations' + } + compileClasspath.extendsFrom compileExclude + // Create runtimeDownloadApi configuration (compileOnlyApi + runtimeDownloadOnly) runtimeDownloadApi compileOnlyApi.extendsFrom runtimeDownloadApi @@ -141,7 +150,7 @@ subprojects { if (rootProject.version.endsWith("-SNAPSHOT")) { var gitHash = indraGit.commit().getName() if (gitHash.length() > 7) { - gitHash = gitHash.substring(0, 7); + gitHash = gitHash.substring(0, 7) } archiveClassifier = gitHash } diff --git a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java index 9d04b24b..4a9fdb4b 100644 --- a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java +++ b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java @@ -23,6 +23,7 @@ import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; import org.bukkit.command.ProxiedCommandSender; import org.bukkit.entity.Entity; +import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; public interface IFoliaScheduler extends ServerScheduler, IBukkitScheduler { @@ -52,16 +53,19 @@ public interface IFoliaScheduler extends ServerScheduler, IBukkitScheduler { } @Override + @MustBeInvokedByOverriders default void runOnMainThread(@NotNull Runnable task) { runWithArgs((server, plugin) -> server.getGlobalRegionScheduler().execute(plugin, task)); } @Override + @MustBeInvokedByOverriders default void runOnMainThreadLaterInTicks(@NotNull Runnable task, int ticks) { runWithArgs((server, plugin) -> server.getGlobalRegionScheduler().runDelayed(plugin, r -> task.run(), ticks)); } @Override + @MustBeInvokedByOverriders default void runOnMainThreadAtFixedRateInTicks(@NotNull Runnable task, int initialTicks, int rateTicks) { runWithArgs((server, plugin) -> server.getGlobalRegionScheduler().execute(plugin, task)); } diff --git a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java index 3a0ce4c3..6cfa2871 100644 --- a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java @@ -96,10 +96,10 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import org.apache.commons.lang3.StringUtils; import org.intellij.lang.annotations.Language; +import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.OverridingMethodsMustInvokeSuper; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Constructor; @@ -558,7 +558,7 @@ public abstract class AbstractDiscordSRV< } } - @OverridingMethodsMustInvokeSuper + @MustBeInvokedByOverriders protected void enable() throws Throwable { if (eventBus == null) { // Error that should only occur with new platforms @@ -627,7 +627,7 @@ public abstract class AbstractDiscordSRV< throw new StorageException("Unknown storage backend \"" + backend + "\""); } - @OverridingMethodsMustInvokeSuper + @MustBeInvokedByOverriders protected void disable() { Status status = this.status.get(); if (status == Status.INITIALIZED || status.isShutdown()) { @@ -647,7 +647,7 @@ public abstract class AbstractDiscordSRV< this.status.set(Status.SHUTDOWN); } - @OverridingMethodsMustInvokeSuper + @MustBeInvokedByOverriders public List reload(Set flags, boolean initial) throws Throwable { if (!initial) { logger().info("Reloading DiscordSRV..."); diff --git a/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java index 45c71b26..72c4efdf 100644 --- a/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java @@ -26,9 +26,9 @@ import com.discordsrv.common.messageforwarding.game.AwardMessageModule; import com.discordsrv.common.messageforwarding.game.DeathMessageModule; import com.discordsrv.common.player.provider.ServerPlayerProvider; import com.discordsrv.common.scheduler.ServerScheduler; +import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; -import javax.annotation.OverridingMethodsMustInvokeSuper; import java.util.concurrent.CompletableFuture; public abstract class ServerDiscordSRV< @@ -79,7 +79,7 @@ public abstract class ServerDiscordSRV< }); } - @OverridingMethodsMustInvokeSuper + @MustBeInvokedByOverriders protected void serverStarted() { serverStarted = true; moduleManager().enableModules(); diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/FieldValueDiscovererProxy.java b/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/FieldValueDiscovererProxy.java index 86df8b84..dcf0d09f 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/FieldValueDiscovererProxy.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/FieldValueDiscovererProxy.java @@ -18,7 +18,7 @@ package com.discordsrv.common.config.configurate.fielddiscoverer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.FieldDiscoverer; import org.spongepowered.configurate.serialize.SerializationException; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/OrderedFieldDiscovererProxy.java b/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/OrderedFieldDiscovererProxy.java index e565ac19..bef10465 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/OrderedFieldDiscovererProxy.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/fielddiscoverer/OrderedFieldDiscovererProxy.java @@ -18,7 +18,7 @@ package com.discordsrv.common.config.configurate.fielddiscoverer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.objectmapping.FieldData; import org.spongepowered.configurate.objectmapping.FieldDiscoverer; import org.spongepowered.configurate.serialize.SerializationException; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java index c43bd9e4..c5a10858 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java @@ -161,7 +161,7 @@ public abstract class ConfigurateConfigManager hint = YamlConfigurationLoader.SCALAR_STYLE; ScalarStyle style = node.hint(hint); diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/ColorSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/ColorSerializer.java index 51317d35..38555f0a 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/ColorSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/ColorSerializer.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.configurate.serializer; import com.discordsrv.api.color.Color; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/DiscordMessageEmbedSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/DiscordMessageEmbedSerializer.java index 580bf524..81823a3f 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/DiscordMessageEmbedSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/DiscordMessageEmbedSerializer.java @@ -22,7 +22,7 @@ import com.discordsrv.api.color.Color; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import net.dv8tion.jda.api.entities.Role; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java index f49a175c..9c7fb455 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java @@ -20,7 +20,7 @@ package com.discordsrv.common.config.configurate.serializer; import com.discordsrv.common.logging.Logger; import io.leangen.geantyref.GenericTypeReflector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/MinecraftMessageSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/MinecraftMessageSerializer.java index fe2e6b7b..8a7f4cd0 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/MinecraftMessageSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/MinecraftMessageSerializer.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.configurate.serializer; import com.discordsrv.common.config.helper.MinecraftMessage; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/PatternSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/PatternSerializer.java index 8bfbb25e..00a2b088 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/PatternSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/PatternSerializer.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.configurate.serializer; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/SendableDiscordMessageSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/SendableDiscordMessageSerializer.java index f9f27a9d..d00e6999 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/SendableDiscordMessageSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/SendableDiscordMessageSerializer.java @@ -21,7 +21,7 @@ package com.discordsrv.common.config.configurate.serializer; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; import org.spongepowered.configurate.serialize.TypeSerializer; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/base/IChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/IChannelConfig.java index e3a1f1c1..bce153a9 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/base/IChannelConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/IChannelConfig.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.main.channels.base; import com.discordsrv.common.config.main.generic.DestinationConfig; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.objectmapping.ObjectMapper; import org.spongepowered.configurate.serialize.SerializationException; diff --git a/common/src/main/java/com/discordsrv/common/debug/DebugReport.java b/common/src/main/java/com/discordsrv/common/debug/DebugReport.java index 07168b90..edf09400 100644 --- a/common/src/main/java/com/discordsrv/common/debug/DebugReport.java +++ b/common/src/main/java/com/discordsrv/common/debug/DebugReport.java @@ -27,7 +27,6 @@ import com.discordsrv.common.config.messages.MessagesConfig; import com.discordsrv.common.debug.file.DebugFile; import com.discordsrv.common.debug.file.KeyValueDebugFile; import com.discordsrv.common.debug.file.TextDebugFile; -import com.discordsrv.common.exception.ConfigException; import com.discordsrv.common.paste.Paste; import com.discordsrv.common.paste.PasteService; import com.discordsrv.common.plugin.Plugin; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java index e0d7c7e4..178dbf3f 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java @@ -55,8 +55,6 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.entities.emoji.CustomEmoji; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.requests.ErrorResponse; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -324,7 +322,7 @@ public class DiscordAPIImpl implements DiscordAPI { private class WebhookCacheLoader implements AsyncCacheLoader> { @Override - public @NonNull CompletableFuture> asyncLoad(@NonNull Long channelId, @NonNull Executor executor) { + public @NotNull CompletableFuture> asyncLoad(@NotNull Long channelId, @NotNull Executor executor) { JDA jda = discordSRV.jda(); if (jda == null) { return notReady(); @@ -393,17 +391,17 @@ public class DiscordAPIImpl implements DiscordAPI { } @Override - public long expireAfterCreate(@NonNull Long channelId, @NonNull WebhookClient webhookClient, long currentTime) { + public long expireAfterCreate(@NotNull Long channelId, @NotNull WebhookClient webhookClient, long currentTime) { return expireAfterWrite(channelId); } @Override - public long expireAfterUpdate(@NonNull Long channelId, @NonNull WebhookClient webhookClient, long currentTime, @NonNegative long currentDuration) { + public long expireAfterUpdate(@NotNull Long channelId, @NotNull WebhookClient webhookClient, long currentTime, long currentDuration) { return expireAfterWrite(channelId); } @Override - public long expireAfterRead(@NonNull Long channelId, @NonNull WebhookClient webhookClient, long currentTime, @NonNegative long currentDuration) { + public long expireAfterRead(@NotNull Long channelId, @NotNull WebhookClient webhookClient, long currentTime, long currentDuration) { return isConfiguredChannel(channelId) ? Long.MAX_VALUE : TimeUnit.MINUTES.toNanos(10); } } diff --git a/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java b/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java index c73bebd4..8c69034a 100644 --- a/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java +++ b/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java @@ -32,9 +32,9 @@ import com.discordsrv.common.groupsync.enums.GroupSyncCause; import com.discordsrv.common.groupsync.enums.GroupSyncResult; import com.discordsrv.common.someone.Someone; import com.discordsrv.common.sync.AbstractSyncModule; -import com.discordsrv.common.sync.result.ISyncResult; import com.discordsrv.common.sync.SyncFail; import com.discordsrv.common.sync.result.GenericSyncResults; +import com.discordsrv.common.sync.result.ISyncResult; import com.github.benmanes.caffeine.cache.Cache; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java b/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java index 3116f388..9de579ac 100644 --- a/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java +++ b/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java @@ -27,8 +27,6 @@ import com.github.benmanes.caffeine.cache.AsyncCacheLoader; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Expiry; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -55,26 +53,26 @@ public abstract class CachedLinkProvider implements LinkProvider { this.playerToUser = discordSRV.caffeineBuilder() .expireAfter(new Expiry() { @Override - public long expireAfterCreate(@NonNull UUID key, @NonNull Long value, long currentTime) { + public long expireAfterCreate(@NotNull UUID key, @NotNull Long value, long currentTime) { return TimeUnit.MINUTES.toNanos(5); } @Override public long expireAfterUpdate( - @NonNull UUID key, - @NonNull Long value, + @NotNull UUID key, + @NotNull Long value, long currentTime, - @NonNegative long currentDuration + long currentDuration ) { return currentDuration; } @Override public long expireAfterRead( - @NonNull UUID key, - @NonNull Long value, + @NotNull UUID key, + @NotNull Long value, long currentTime, - @NonNegative long currentDuration + long currentDuration ) { return currentDuration; } @@ -86,15 +84,15 @@ public abstract class CachedLinkProvider implements LinkProvider { }) .buildAsync(new AsyncCacheLoader() { @Override - public @NonNull CompletableFuture asyncLoad(@NonNull UUID key, @NonNull Executor executor) { + public @NotNull CompletableFuture asyncLoad(@NotNull UUID key, @NotNull Executor executor) { return queryUserId(key, linkingAllowed.remove(key)).thenApply(opt -> opt.orElse(UNLINKED_USER)); } @Override - public @NonNull CompletableFuture asyncReload( - @NonNull UUID key, - @NonNull Long oldValue, - @NonNull Executor executor + public @NotNull CompletableFuture asyncReload( + @NotNull UUID key, + @NotNull Long oldValue, + @NotNull Executor executor ) { if (discordSRV.playerProvider().player(key) == null) { // Don't keep players that aren't online in cache diff --git a/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java b/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java index 577def9b..d37be857 100644 --- a/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java +++ b/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java @@ -20,10 +20,9 @@ package com.discordsrv.common.module.type; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.logging.Logger; +import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; -import javax.annotation.OverridingMethodsMustInvokeSuper; - public abstract class PluginIntegration
extends AbstractModule
{ public PluginIntegration(DT discordSRV) { @@ -42,7 +41,7 @@ public abstract class PluginIntegration
extends AbstractM public abstract String getIntegrationName(); @Override - @OverridingMethodsMustInvokeSuper + @MustBeInvokedByOverriders public boolean isEnabled() { if (discordSRV.config().integrations.disabledIntegrations.contains(getIntegrationName())) { return false; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java b/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java index 45f7c70b..94aca8d5 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java +++ b/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java @@ -33,9 +33,8 @@ import com.discordsrv.common.placeholder.provider.AnnotationPlaceholderProvider; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.LoadingCache; import org.apache.commons.lang3.StringUtils; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -342,7 +341,7 @@ public class PlaceholderServiceImpl implements PlaceholderService { } @Override - public @Nullable Set load(@NonNull Class key) { + public @Nullable Set load(@NotNull Class key) { return loadProviders(key, null); } } diff --git a/settings.gradle b/settings.gradle index 660f17b3..32a58f4d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,14 +35,14 @@ dependencyResolutionManagement { library('velocity', 'com.velocitypowered', 'velocity-api').version('3.0.0') // DependencyDownload - version('dependencydownload', '1.3.1-SNAPSHOT') + version('dependencydownload', '1.3.1') plugin('dependencydownload-plugin', 'dev.vankka.dependencydownload.plugin').versionRef('dependencydownload') library('dependencydownload-runtime', 'dev.vankka', 'dependencydownload-runtime').versionRef('dependencydownload') library('dependencydownload-jarinjar-bootstrap', 'dev.vankka', 'dependencydownload-jarinjar-bootstrap').versionRef('dependencydownload') library('dependencydownload-jarinjar-loader', 'dev.vankka', 'dependencydownload-jarinjar-loader').versionRef('dependencydownload') // MinecraftDependencyDownload - version('mcdependencydownload', '1.0.0-SNAPSHOT') + version('mcdependencydownload', '1.0.0') library('mcdependencydownload-bukkit-bootstrap', 'dev.vankka', 'minecraftdependencydownload-bukkit').versionRef('mcdependencydownload') library('mcdependencydownload-bukkit-loader', 'dev.vankka', 'minecraftdependencydownload-bukkit-loader').versionRef('mcdependencydownload') library('mcdependencydownload-bungee-bootstrap', 'dev.vankka', 'minecraftdependencydownload-bungee').versionRef('mcdependencydownload') @@ -51,7 +51,6 @@ dependencyResolutionManagement { // Annotations library('jetbrains-annotations', 'org.jetbrains', 'annotations').version('24.1.0') - library('findbugs-annotations', 'com.google.code.findbugs', 'jsr305').version('3.0.2') // JDA library('jda', 'net.dv8tion', 'JDA').version('5.0.0-beta.20')