addressed sonar code smells

2026-06-04 10:26:42 +00:00 · 2020-05-27 19:32:19 +02:00
parent 175a92408c
commit 3fa5edf67a
77 changed files with 164 additions and 243 deletions
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/config/CommandCreationListener.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/config/CommandCreationListener.java
@@ -33,7 +33,7 @@ public class CommandCreationListener {
    @EventListener
    @Transactional
    public void handleContextRefreshEvent(ContextRefreshedEvent ctxStartEvt) {
-        featureFlagService.getAllFeatureConfigs().forEach((featureFlagKey) -> {
+        featureFlagService.getAllFeatureConfigs().forEach(featureFlagKey -> {
            String featureKey = featureFlagKey.getFeature().getKey();
            if(!featureManagementService.featureExists(featureKey)) {
                featureManagementService.createFeature(featureKey);
@@ -44,7 +44,7 @@ public class CommandCreationListener {
                log.warn("Command {} has null configuration.", command);
                return;
            }
-            if(!commandService.doesCommandExist(command.getConfiguration().getName())) {
+            if(commandService.doesCommandExist(command.getConfiguration().getName())) {
                commandService.createCommand(command.getConfiguration().getName(), command.getConfiguration().getModule(), command.getFeature());
            }
        });
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java
@@ -50,7 +50,7 @@ public class CommandServiceBean implements CommandService {
    }

    @Override
-    public Boolean doesCommandExist(String name) {
+    public boolean doesCommandExist(String name) {
        return commandManagementService.doesCommandExist(name);
    }

@@ -66,9 +66,7 @@ public class CommandServiceBean implements CommandService {
    @Override
    public void allowFeatureForRole(FeatureEnum featureEnum, ARole role) {
        AFeature feature = featureManagementService.getFeature(featureEnum.getKey());
-        feature.getCommands().forEach(command -> {
-            this.allowCommandForRole(command, role);
-        });
+        feature.getCommands().forEach(command -> this.allowCommandForRole(command, role));
    }

    @Override
@@ -107,9 +105,7 @@ public class CommandServiceBean implements CommandService {
    @Override
    public void disAllowFeatureForRole(FeatureEnum featureEnum, ARole role) {
        AFeature feature = featureManagementService.getFeature(featureEnum.getKey());
-        feature.getCommands().forEach(command -> {
-            this.disAllowCommandForRole(command, role);
-        });
+        feature.getCommands().forEach(command -> this.disAllowCommandForRole(command, role));
    }

    public ConditionResult isCommandExecutable(Command command, CommandContext commandContext) {
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java
@@ -44,7 +44,7 @@ public class CommandManagementServiceBean implements CommandManagementService {
    }

    @Override
-    public Boolean doesCommandExist(String name) {
+    public boolean doesCommandExist(String name) {
        return findCommandByName(name) != null;
    }

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/AllowRole.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/AllowRole.java
@@ -4,6 +4,7 @@ import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand
 import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
 import dev.sheldan.abstracto.core.command.config.HelpInfo;
 import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.features.CoreFeatures;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.command.models.database.ACommand;
@@ -11,12 +12,9 @@ import dev.sheldan.abstracto.core.command.service.CommandService;
 import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
 import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
 import dev.sheldan.abstracto.core.commands.config.ConfigModuleInterface;
-import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.core.command.config.features.CoreFeatures;
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.service.FeatureConfigService;
-import dev.sheldan.abstracto.core.service.FeatureFlagService;
 import dev.sheldan.abstracto.core.service.management.RoleManagementService;
 import dev.sheldan.abstracto.templating.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/Disable.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/Disable.java
@@ -51,9 +51,9 @@ public class Disable extends AbstractConditionableCommand {
            FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(flagKey);
            featureFlagService.disableFeature(feature, commandContext.getGuild().getIdLong());
            if(feature.getDependantFeatures() != null) {
-                feature.getDependantFeatures().forEach(featureDisplay -> {
-                    featureFlagService.disableFeature(featureDisplay, commandContext.getUserInitiatedContext().getServer());
-                });
+                feature.getDependantFeatures().forEach(featureDisplay ->
+                    featureFlagService.disableFeature(featureDisplay, commandContext.getUserInitiatedContext().getServer())
+                );
            }
        }
        return CommandResult.fromSuccess();
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/Enable.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/features/Enable.java
@@ -50,7 +50,7 @@ public class Enable extends AbstractConditionableCommand {
            String flagKey = (String) commandContext.getParameters().getParameters().get(0);
            FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(flagKey);
            FeatureValidationResult featureSetup = featureConfigService.validateFeatureSetup(feature, commandContext.getUserInitiatedContext().getServer());
-            if(!featureSetup.getValidationResult()) {
+            if(Boolean.FALSE.equals(featureSetup.getValidationResult())) {
                channelService.sendTextToChannelNoFuture(templateService.renderTemplatable(featureSetup), commandContext.getChannel());
            }
            featureFlagService.enableFeature(feature, commandContext.getUserInitiatedContext().getServer());
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java
@@ -89,7 +89,7 @@ public class Help implements Command {
                ACommand aCommand = commandManagementService.findCommandByName(parameter);
                ACommandInAServer aCommandInAServer = commandInServerManagementService.getCommandForServer(aCommand, commandContext.getUserInitiatedContext().getServer());
                HelpCommandDetailsModel model = (HelpCommandDetailsModel) ContextConverter.fromCommandContext(commandContext, HelpCommandDetailsModel.class);
-                if(aCommandInAServer.getRestricted()) {
+                if(Boolean.TRUE.equals(aCommandInAServer.getRestricted())) {
                    model.setImmuneRoles(roleService.getRolesFromGuild(aCommandInAServer.getImmuneRoles()));
                    model.setAllowedRoles(roleService.getRolesFromGuild(aCommandInAServer.getAllowedRoles()));
                    model.setRestricted(true);
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveServiceBean.java
@@ -2,7 +2,6 @@ package dev.sheldan.abstracto.core.interactive;

 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jdautilities.menu.ButtonMenu;
-import dev.sheldan.abstracto.core.models.FullUser;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AEmote;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
@@ -14,16 +13,12 @@ import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Emote;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -100,7 +95,7 @@ public class InteractiveServiceBean implements InteractiveService {

    private void addEmoteToBuilder(String key, Consumer<Void> consumer, Long serverId, ButtonMenu.Builder builder, HashMap<String, Consumer<Void>> actions) {
        AEmote emoteOrFakeEmote = emoteService.getEmoteOrFakeEmote(key, serverId);
-        if(emoteOrFakeEmote.getCustom()){
+        if(Boolean.TRUE.equals(emoteOrFakeEmote.getCustom())){
            Optional<Emote> emote = botService.getEmote(serverId, emoteOrFakeEmote);
            emote.ifPresent(emote1 -> {
                builder.addChoice(emote1);
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SetupSummaryStep.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SetupSummaryStep.java
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/FeatureFlagListener.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/FeatureFlagListener.java
@@ -46,7 +46,7 @@ public class FeatureFlagListener implements ServerConfigListener {
    @Override
    public void updateServerConfig(AServer server) {
        log.info("Setting up feature flags if necessary.");
-        featureFlagService.getAllFeatureConfigs().forEach((featureFlagKey) -> {
+        featureFlagService.getAllFeatureConfigs().forEach(featureFlagKey -> {
            String featureKey = featureFlagKey.getFeature().getKey();
            AFeature feature = featureManagementService.getFeature(featureKey);
            if(featureConfigLoader.getFeatures().containsKey(featureKey)) {
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java
@@ -42,7 +42,7 @@ public class ReactionUpdatedListener extends ListenerAdapter {
    private List<ReactionClearedListener> clearedListenerList;

    @Autowired
-    private List<ReactedRemovedListener> reactionRemovedListener;
+    private List<ReactedRemovedListener> reactionRemovedListeners;

    @Autowired
    private ReactionUpdatedListener self;
@@ -63,15 +63,15 @@ public class ReactionUpdatedListener extends ListenerAdapter {
            return;
        }
        CompletableFuture<CachedMessage> asyncMessageFromCache = messageCache.getMessageFromCache(event.getGuild().getIdLong(), event.getChannel().getIdLong(), event.getMessageIdLong());
-        asyncMessageFromCache.thenAccept(cachedMessage -> {
+        asyncMessageFromCache.thenAccept(cachedMessage ->
            messageCache.getCachedReactionFromReaction(event.getReaction()).thenAccept(reaction -> {
                self.callAddedListeners(event, cachedMessage, reaction);
                messageCache.putMessageInCache(cachedMessage);
            }).exceptionally(throwable -> {
                log.error("Failed to add reaction to message {} ", event.getMessageIdLong(), throwable);
                return null;
-            });
-        }).exceptionally(throwable -> {
+            })
+        ).exceptionally(throwable -> {
            log.error("Message retrieval {} from cache failed. ", event.getMessageIdLong(), throwable);
            return null;
        });
@@ -146,7 +146,7 @@ public class ReactionUpdatedListener extends ListenerAdapter {
    public void callRemoveListeners(@Nonnull GuildMessageReactionRemoveEvent event, CachedMessage cachedMessage, CachedReaction reaction) {
        AUserInAServer userInAServer = userInServerManagementService.loadUser(event.getGuild().getIdLong(), event.getUserIdLong());
        removeReactionIfThere(cachedMessage, reaction, userInAServer);
-        reactionRemovedListener.forEach(reactionRemovedListener -> {
+        reactionRemovedListeners.forEach(reactionRemovedListener -> {
            FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(reactionRemovedListener.getFeature());
            if(!featureFlagService.isFeatureEnabled(feature, event.getGuild().getIdLong())) {
                return;
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java
@@ -131,7 +131,7 @@ public class BotServiceBean implements BotService {

    @Override
    public Optional<Emote> getEmote(Long serverId, AEmote emote)  {
-        if(!emote.getCustom()) {
+        if(Boolean.FALSE.equals(emote.getCustom())) {
            return Optional.empty();
        }
        Optional<Guild> guildById = getGuildById(serverId);
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java
@@ -21,9 +21,6 @@ import java.util.Optional;
@Component
 public class ChannelGroupServiceBean implements ChannelGroupService {

-    private static final String CHANNEL_GROUP_NOT_FOUND = "Channel group %s was not found.";
-    private static final String COMMAND_NOT_FOUND = "Command %s not found.";
-
    @Autowired
    private ChannelGroupManagementService channelGroupManagementService;

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java
@@ -15,11 +15,11 @@ public class DelayedActionServiceBean implements DelayedActionService {

    @Override
    public void executeDelayedActions(List<DelayedActionConfig> delayedActionConfigList) {
-        delayedActionConfigList.forEach(delayedActionConfig -> {
+        delayedActionConfigList.forEach(delayedActionConfig ->
            delayedActions.stream()
                    .filter(delayedAction -> delayedAction.handles(delayedActionConfig))
                    .findFirst()
-                    .ifPresent(delayedAction -> delayedAction.execute(delayedActionConfig));
-        });
+                    .ifPresent(delayedAction -> delayedAction.execute(delayedActionConfig))
+        );
    }
 }
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java
@@ -91,7 +91,8 @@ public class FeatureConfigServiceBean implements FeatureConfigService {
        Predicate<PostTargetEnum> postTargetComparison = postTargetEnum -> postTargetEnum.getKey().equalsIgnoreCase(key);
        Optional<FeatureConfig> foundFeature = availableFeatures.stream().filter(featureDisplay -> featureDisplay.getRequiredPostTargets().stream().anyMatch(postTargetComparison)).findAny();
        if(foundFeature.isPresent()) {
-            return foundFeature.get().getRequiredPostTargets().stream().filter(postTargetComparison).findAny().get();
+            Optional<PostTargetEnum> any = foundFeature.get().getRequiredPostTargets().stream().filter(postTargetComparison).findAny();
+            return any.orElse(null);
        }
        throw new AbstractoRunTimeException(String.format("Post target %s not found.", key));
    }
@@ -99,18 +100,18 @@ public class FeatureConfigServiceBean implements FeatureConfigService {
    @Override
    public FeatureValidationResult validateFeatureSetup(FeatureConfig featureConfig, AServer server) {
        FeatureValidationResult featureValidationResult = FeatureValidationResult.validationSuccessful(featureConfig);
-        featureConfig.getRequiredPostTargets().forEach(s -> {
-            featureValidatorService.checkPostTarget(s, server, featureValidationResult);
-        });
-        featureConfig.getRequiredSystemConfigKeys().forEach(s -> {
-            featureValidatorService.checkSystemConfig(s, server, featureValidationResult);
-        });
-        featureConfig.getRequiredEmotes().forEach(s -> {
-            featureValidatorService.checkEmote(s, server, featureValidationResult);
-        });
-        featureConfig.getAdditionalFeatureValidators().forEach(featureValidator -> {
-            featureValidator.featureIsSetup(featureConfig, server, featureValidationResult);
-        });
+        featureConfig.getRequiredPostTargets().forEach(s ->
+            featureValidatorService.checkPostTarget(s, server, featureValidationResult)
+        );
+        featureConfig.getRequiredSystemConfigKeys().forEach(s ->
+            featureValidatorService.checkSystemConfig(s, server, featureValidationResult)
+        );
+        featureConfig.getRequiredEmotes().forEach(s ->
+            featureValidatorService.checkEmote(s, server, featureValidationResult)
+        );
+        featureConfig.getAdditionalFeatureValidators().forEach(featureValidator ->
+            featureValidator.featureIsSetup(featureConfig, server, featureValidationResult)
+        );
        return featureValidationResult;
    }

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureFlagServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureFlagServiceBean.java
@@ -3,10 +3,7 @@ package dev.sheldan.abstracto.core.service;
 import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
-import dev.sheldan.abstracto.core.config.PostTargetEnum;
-import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.exception.FeatureNotFoundException;
-import dev.sheldan.abstracto.core.models.FeatureValidationResult;
 import dev.sheldan.abstracto.core.models.database.AFeature;
 import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
 import dev.sheldan.abstracto.core.models.database.AServer;
@@ -15,11 +12,6 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
@Component
 public class FeatureFlagServiceBean implements FeatureFlagService {

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java
@@ -88,15 +88,15 @@ public class MessageCacheBean implements MessageCache {
            if(textChannelByIdOptional.isPresent()) {
                TextChannel textChannel = textChannelByIdOptional.get();
                textChannel.retrieveMessageById(messageId).queue(message ->
-                        {
+
                            buildCachedMessageFromMessage(message)
                                    .thenAccept(future::complete)
                                    .exceptionally(throwable -> {
                                        log.error("Failed to load message for caching.", throwable);
                                        future.completeExceptionally(throwable);
                                        return null;
-                                    });
-                        }
+                                    })
+
                );
            } else {
                log.error("Not able to load message {} in channel {} in guild {}. Text channel not found.", messageId, textChannelId, guildId);
@@ -123,9 +123,7 @@ public class MessageCacheBean implements MessageCache {
        );

        List<CompletableFuture<CachedReaction>> futures = new ArrayList<>();
-        message.getReactions().forEach(messageReaction -> {
-            futures.add(self.getCachedReactionFromReaction(messageReaction));
-        });
+        message.getReactions().forEach(messageReaction -> futures.add(self.getCachedReactionFromReaction(messageReaction)));

        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).thenAccept(aVoid ->
        future.complete(CachedMessage.builder()
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
@@ -48,7 +48,7 @@ public class MessageServiceBean implements MessageService {
        AEmote emote = emoteService.getEmoteOrFakeEmote(emoteKey, serverId);
        if(guildByIdOptional.isPresent()) {
            Guild guild = guildByIdOptional.get();
-            if(emote.getCustom()) {
+            if(Boolean.TRUE.equals(emote.getCustom())) {
                Emote emoteById = botService.getInstance().getEmoteById(emote.getEmoteId());
                if(emoteById != null) {
                    return message.addReaction(emoteById).submit();
@@ -68,9 +68,7 @@ public class MessageServiceBean implements MessageService {
    @Override
    public List<CompletableFuture<Void>> addReactionsToMessageWithFuture(List<String> emoteKeys, Long serverId, Message message) {
        List<CompletableFuture<Void>> futures = new ArrayList<>();
-        emoteKeys.forEach(s -> {
-            futures.add(addReactionToMessageWithFuture(s, serverId, message));
-        });
+        emoteKeys.forEach(s -> futures.add(addReactionToMessageWithFuture(s, serverId, message)));
        return futures;
    }

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PaginatorServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PaginatorServiceBean.java
@@ -42,9 +42,7 @@ public class PaginatorServiceBean implements PaginatorService {
                .setEventWaiter(waiter)
                .waitOnSinglePage(true)
                .setTimeout(ObjectUtils.defaultIfNull(configuration.getTimeoutSeconds(), 120L), TimeUnit.SECONDS)
-                .setFinalAction(message -> {
-                    message.delete().queue();
-                })
+                .setFinalAction(message -> message.delete().queue())
                .build();
    }

--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/SetupServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/SetupServiceBean.java
@@ -137,9 +137,7 @@ public class SetupServiceBean implements SetupService {
                .delayedActionList(delayedActionConfigs)
                .previousMessageId(initialMessage)
                .build();
-        setupSummaryStep.execute(user, parameter).thenAccept(ignored -> {
-            self.notifyAboutCompletion(user, featureConfig);
-        });
+        setupSummaryStep.execute(user, parameter).thenAccept(ignored -> self.notifyAboutCompletion(user, featureConfig));
    }

    @Transactional
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/UndoActionServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/UndoActionServiceBean.java
@@ -23,26 +23,24 @@ public class UndoActionServiceBean implements UndoActionService {
        actionsToPerform.forEach(undoActionInstance -> {
            UndoAction action = undoActionInstance.getAction();
            List<Long> ids = undoActionInstance.getIds();
-            switch (action) {
-                case DELETE_CHANNEL:
-                    if(ids.size() != 2) {
-                        log.error("Not the correct amount of ids provided for the channel deletion undo action.");
-                        break;
-                    }
-                    deleteChannel(ids.get(0), ids.get(1));
-                    break;
-                case DELETE_MESSAGE:
-                    if(ids.size() != 2) {
-                        log.error("Not the correct amount of ids provided for the message deletion undo action.");
-                        break;
-                    }
-                    botService.deleteMessage(ids.get(0), ids.get(1));
+            if(action.equals(UndoAction.DELETE_CHANNEL)) {
+                if(ids.size() != 2) {
+                    log.error("Not the correct amount of ids provided for the channel deletion undo action.");
+                    return;
+                }
+                deleteChannel(ids.get(0), ids.get(1));
+            } else if(action.equals(UndoAction.DELETE_MESSAGE)) {
+                if(ids.size() != 2) {
+                    log.error("Not the correct amount of ids provided for the message deletion undo action.");
+                    return;
+                }
+                botService.deleteMessage(ids.get(0), ids.get(1));
            }
        });
    }

    private void deleteChannel(Long serverId, Long channelId) {
-        channelService.deleteTextChannel(serverId, channelId).exceptionally((throwable) -> {
+        channelService.deleteTextChannel(serverId, channelId).exceptionally(throwable -> {
            log.error("Failed to execute undo action channel delete for channel {} in server {}", channelId, serverId, throwable);
            return null;
        });
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/FeatureFlagManagementServiceBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/FeatureFlagManagementServiceBean.java
@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import java.util.List;
-import java.util.Optional;

@Component
 public class FeatureFlagManagementServiceBean implements FeatureFlagManagementService {
--- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java
+++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java
@@ -86,7 +86,7 @@ public class PostTargetManagementBean implements PostTargetManagement {
    }

    @Override
-    public Boolean postTargetExists(String name, Long serverId) {
+    public boolean postTargetExists(String name, Long serverId) {
        AServer dbServer = serverManagementService.loadOrCreate(serverId);
        return postTargetExists(name, dbServer);
    }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java
@@ -5,8 +5,6 @@ import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.listener.FeatureAware;

-import java.io.Serializable;
-
 public interface Command extends FeatureAware {

    CommandResult execute(CommandContext commandContext);
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java
@@ -33,7 +33,7 @@ public class CommandDisallowedCondition implements CommandCondition {
    public ConditionResult shouldExecute(CommandContext context, Command command) {
        ACommand aCommand = commandService.findCommandByName(command.getConfiguration().getName());
        ACommandInAServer commandForServer = commandInServerManagementService.getCommandForServer(aCommand, context.getUserInitiatedContext().getServer());
-        if(!commandForServer.getRestricted()) {
+        if(Boolean.FALSE.equals(commandForServer.getRestricted())) {
            return ConditionResult.builder().result(true).build();
        }
        for (ARole role : commandForServer.getAllowedRoles()) {
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java
@@ -1,5 +1,6 @@
 package dev.sheldan.abstracto.core.command.execution;

+import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.extern.slf4j.Slf4j;

@@ -30,6 +31,6 @@ public class ContextConverter {
        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
            log.error("Failed to execute builder method", e);
        }
-        throw new RuntimeException("Failed to create model from context");
+        throw new AbstractoRunTimeException("Failed to create model from context");
    }
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java
@@ -5,6 +5,7 @@ import lombok.*;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.Objects;

@Entity
@@ -15,7 +16,7 @@ import java.util.Objects;
@Getter
@Cacheable
@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-public class ACommand {
+public class ACommand implements Serializable {
    @Id
    @Column(name = "id")
    @GeneratedValue(strategy = GenerationType.IDENTITY)
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommandInAServer.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommandInAServer.java
@@ -6,6 +6,7 @@ import lombok.*;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;

@@ -17,7 +18,7 @@ import java.util.Objects;
@NoArgsConstructor
@Cacheable
@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-public class ACommandInAServer {
+public class ACommandInAServer implements Serializable {

    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -19,7 +20,7 @@ import java.util.Objects;
@Getter
@Cacheable
@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-public class AModule {
+public class AModule implements Serializable {

    @Id
    @Column(name = "id")
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java
@@ -10,7 +10,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;

 public interface CommandService {
    ACommand createCommand(String name, String moduleName, FeatureEnum featureEnum);
-    Boolean doesCommandExist(String name);
+    boolean doesCommandExist(String name);
    void allowCommandForRole(ACommand aCommand, ARole role);
    void allowFeatureForRole(FeatureEnum featureEnum, ARole role);
    void makeRoleImmuneForCommand(ACommand aCommand, ARole role);
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java
@@ -8,5 +8,5 @@ public interface CommandManagementService {
    ACommand createCommand(String name, String moduleName, String featureName);
    ACommand createCommand(String name, AModule moduleName, AFeature feature);
    ACommand findCommandByName(String name);
-    Boolean doesCommandExist(String name);
+    boolean doesCommandExist(String name);
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/CategoryNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/CategoryNotFoundException.java
@@ -6,12 +6,8 @@ import java.util.HashMap;

 public class CategoryNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private Long categoryId;
-    private Long guildId;
-
-    public CategoryNotFoundException(String message) {
-        super(message);
-    }
+    private final Long categoryId;
+    private final Long guildId;

    public CategoryNotFoundException(Long categoryId, Long guildId) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/ChannelNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/ChannelNotFoundException.java
@@ -6,12 +6,8 @@ import java.util.HashMap;

 public class ChannelNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private Long channelId;
-    private Long guildId;
-
-    public ChannelNotFoundException(String message) {
-        super(message);
-    }
+    private final Long channelId;
+    private final Long guildId;

    public ChannelNotFoundException(Long channelId, Long guildId) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/ConfigurationKeyNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/ConfigurationKeyNotFoundException.java
@@ -6,7 +6,7 @@ import java.util.HashMap;

 public class ConfigurationKeyNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private String key;
+    private final String key;

    public ConfigurationKeyNotFoundException(String key) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/DurationFormatException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/DurationFormatException.java
@@ -7,8 +7,8 @@ import java.util.List;

 public class DurationFormatException extends AbstractoRunTimeException implements Templatable {

-    private String invalidFormat;
-    private List<String> validFormats;
+    private final String invalidFormat;
+    private final List<String> validFormats;

    public DurationFormatException(String wrongFormat, List<String> validFormats) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/EmoteNotDefinedException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/EmoteNotDefinedException.java
@@ -3,11 +3,10 @@ package dev.sheldan.abstracto.core.exception;
 import dev.sheldan.abstracto.templating.Templatable;

 import java.util.HashMap;
-import java.util.List;

 public class EmoteNotDefinedException extends AbstractoRunTimeException implements Templatable {

-    private String emoteKey;
+    private final String emoteKey;

    public EmoteNotDefinedException(String key) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/EmoteNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/EmoteNotFoundException.java
@@ -7,8 +7,8 @@ import java.util.List;

 public class EmoteNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private String emoteKey;
-    private List<String> available;
+    private final String emoteKey;
+    private final List<String> available;

    public EmoteNotFoundException(String key, List<String> availableEmotes) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/GuildException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/GuildException.java
@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.templating.Templatable;
 import java.util.HashMap;

 public class GuildException extends AbstractoRunTimeException implements Templatable {
-    private Long guildId;
+    private final Long guildId;

    public GuildException(String message, Long guildId) {
        super(message);
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java
@@ -3,11 +3,10 @@ package dev.sheldan.abstracto.core.exception;
 import dev.sheldan.abstracto.templating.Templatable;

 import java.util.HashMap;
-import java.util.List;

 public class PostTargetNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private String postTargetKey;
+    private final String postTargetKey;

    public PostTargetNotFoundException(String key) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java
@@ -7,8 +7,8 @@ import java.util.List;

 public class PostTargetNotValidException extends AbstractoRunTimeException implements Templatable {

-    private String postTargetKey;
-    private List<String> availableTargets;
+    private final String postTargetKey;
+    private final List<String> availableTargets;

    public PostTargetNotValidException(String key, List<String> available) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/RoleNotFoundInDBException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/RoleNotFoundInDBException.java
@@ -6,8 +6,8 @@ import java.util.HashMap;

 public class RoleNotFoundInDBException extends AbstractoRunTimeException implements Templatable {

-    private Long roleId;
-    private Long serverId;
+    private final Long roleId;
+    private final Long serverId;

    public RoleNotFoundInDBException(Long roleId, Long serverId) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/RoleNotFoundInGuildException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/RoleNotFoundInGuildException.java
@@ -6,8 +6,8 @@ import java.util.HashMap;

 public class RoleNotFoundInGuildException extends AbstractoRunTimeException implements Templatable {

-    private Long roleId;
-    private Long serverId;
+    private final Long roleId;
+    private final Long serverId;

    public RoleNotFoundInGuildException(Long roleId, Long serverId) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/UserInServerNotFoundException.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/UserInServerNotFoundException.java
@@ -6,7 +6,7 @@ import java.util.HashMap;

 public class UserInServerNotFoundException extends AbstractoRunTimeException implements Templatable {

-    private Long userInServerId;
+    private final Long userInServerId;

    public UserInServerNotFoundException(Long userInServerId) {
        super("");
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/AbstractConfigSetupStep.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/AbstractConfigSetupStep.java
@@ -27,9 +27,7 @@ public abstract class AbstractConfigSetupStep implements SetupStep {


    protected Runnable getTimeoutRunnable(Long serverId, Long channelId) {
-        return () -> {
-            interactiveUtils.sendTimeoutMessage(serverId, channelId);
-        };
+        return () -> interactiveUtils.sendTimeoutMessage(serverId, channelId);
    }

    protected boolean checkForExit(Message message) {
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveUtils.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveUtils.java
@@ -22,8 +22,6 @@ public class InteractiveUtils {
    public void sendTimeoutMessage(Long serverId, Long channelId) {
        String s = templateService.renderSimpleTemplate("setup_configuration_timeout");
        Optional<TextChannel> channelOptional = channelService.getTextChannelInGuild(serverId, channelId);
-        channelOptional.ifPresent(channel -> {
-            channelService.sendTextToChannelNoFuture(s, channel);
-        });
+        channelOptional.ifPresent(channel -> channelService.sendTextToChannelNoFuture(s, channel));
    }
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/FeatureValidationResult.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/FeatureValidationResult.java
@@ -1,14 +1,11 @@
 package dev.sheldan.abstracto.core.models;

 import dev.sheldan.abstracto.core.config.FeatureConfig;
-import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.templating.Templatable;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import org.hibernate.annotations.CacheConcurrencyStrategy;

-import javax.persistence.GeneratedValue;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java
@@ -5,7 +5,6 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

-import java.io.Serializable;
 import java.time.Instant;
 import java.util.List;

--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java
@@ -2,7 +2,6 @@ package dev.sheldan.abstracto.core.models.database;

 import dev.sheldan.abstracto.core.models.SnowFlake;
 import lombok.*;
-import net.dv8tion.jda.api.entities.ChannelType;
 import org.hibernate.annotations.CacheConcurrencyStrategy;

 import javax.persistence.*;
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AConfig.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AConfig.java
@@ -20,7 +20,7 @@ public class AConfig implements Serializable {

    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer Id;
+    private Integer id;

    @Column
    private String name;
@@ -75,7 +75,7 @@ public class AConfig implements Serializable {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        AConfig config = (AConfig) o;
-        return Objects.equals(Id, config.Id) &&
+        return Objects.equals(id, config.id) &&
                Objects.equals(name, config.name) &&
                Objects.equals(stringValue, config.stringValue) &&
                Objects.equals(doubleValue, config.doubleValue) &&
@@ -84,6 +84,6 @@ public class AConfig implements Serializable {

    @Override
    public int hashCode() {
-        return Objects.hash(Id, name, stringValue, doubleValue, server);
+        return Objects.hash(id, name, stringValue, doubleValue, server);
    }
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/ADefaultConfig.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/ADefaultConfig.java
@@ -15,7 +15,7 @@ import java.time.Instant;
 public class ADefaultConfig implements Serializable {
    @javax.persistence.Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer Id;
+    private Integer id;

    @Column
    private String name;
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AEmote.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AEmote.java
@@ -20,7 +20,7 @@ public class AEmote implements Serializable {

    @javax.persistence.Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer Id;
+    private Integer id;

    @Column
    private String name;
@@ -66,7 +66,7 @@ public class AEmote implements Serializable {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        AEmote emote = (AEmote) o;
-        return Objects.equals(Id, emote.Id) &&
+        return Objects.equals(id, emote.id) &&
                Objects.equals(name, emote.name) &&
                Objects.equals(emoteKey, emote.emoteKey) &&
                Objects.equals(emoteId, emote.emoteId) &&
@@ -77,6 +77,6 @@ public class AEmote implements Serializable {

    @Override
    public int hashCode() {
-        return Objects.hash(Id, name, emoteKey, emoteId, animated, custom, serverRef);
+        return Objects.hash(id, name, emoteKey, emoteId, animated, custom, serverRef);
    }
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/help/HelpModuleOverviewModel.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/help/HelpModuleOverviewModel.java
@@ -1,7 +1,6 @@
 package dev.sheldan.abstracto.core.models.template.commands.help;

 import dev.sheldan.abstracto.core.command.config.ModuleInterface;
-import dev.sheldan.abstracto.core.command.config.SingleLevelPackedModule;
 import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
 import lombok.Getter;
 import lombok.Setter;
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java
@@ -5,7 +5,6 @@ import dev.sheldan.abstracto.core.models.cache.CachedReaction;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageReaction;

-import java.util.List;
 import java.util.concurrent.CompletableFuture;

 public interface MessageCache {
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagement.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagement.java
@@ -12,6 +12,6 @@ public interface PostTargetManagement {
    PostTarget getPostTarget(String name, AServer server);
    PostTarget getPostTarget(String name, Long serverId);
    Boolean postTargetExists(String name, AServer server);
-    Boolean postTargetExists(String name, Long serverId);
+    boolean postTargetExists(String name, Long serverId);
    PostTarget updatePostTarget(PostTarget target, AServer server, AChannel newTargetChannel);
 }
--- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java
+++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java
@@ -32,10 +32,10 @@ public class EmoteUtils {
    }

    public static boolean compareAEmote(AEmote a, AEmote b) {
-        if(a.getCustom() && b.getCustom()) {
+        if(Boolean.TRUE.equals(a.getCustom()) && Boolean.TRUE.equals(b.getCustom())) {
            return a.getEmoteId().equals(b.getEmoteId());
        } else {
-            if(!a.getCustom() && !b.getCustom()) {
+            if(Boolean.FALSE.equals(a.getCustom()) && Boolean.FALSE.equals(b.getCustom())) {
                return a.getEmoteKey().equals(b.getEmoteKey());
            } else {
                return false;