diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java index 6f21a3e81..ea0a721df 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java @@ -2,7 +2,6 @@ package dev.sheldan.abstracto.experience.listener; import dev.sheldan.abstracto.core.listener.JoinListener; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.experience.config.ExperienceFeatures; import dev.sheldan.abstracto.experience.models.database.AUserExperience; import dev.sheldan.abstracto.experience.service.AUserExperienceService; @@ -24,9 +23,6 @@ public class JoiningUserRoleListener implements JoinListener { @Autowired private UserExperienceManagementService userExperienceManagementService; - @Autowired - private UserManagementService userManagementService; - @Autowired private AUserExperienceService userExperienceService; diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java index 42c39de86..19fcfa7b7 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java @@ -40,9 +40,6 @@ public class AUserExperienceServiceBean implements AUserExperienceService { @Autowired private UserExperienceManagementService userExperienceManagementService; - @Autowired - private ExperienceLevelService experienceLevelService; - @Autowired private ExperienceRoleService experienceRoleService; diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java index 1d7853571..4e090c12d 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java @@ -8,7 +8,6 @@ import dev.sheldan.abstracto.experience.models.database.AExperienceRole; import dev.sheldan.abstracto.experience.models.database.AUserExperience; import dev.sheldan.abstracto.experience.service.management.ExperienceLevelManagementService; import dev.sheldan.abstracto.experience.service.management.ExperienceRoleManagementService; -import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -30,9 +29,6 @@ public class ExperienceRoleServiceBean implements ExperienceRoleService { @Autowired private AUserExperienceService userExperienceService; - @Autowired - private UserExperienceManagementService userExperienceManagementService; - /** * Unsets the current configuration for the passed level, and sets the {@link ARole} to be used for this level * in the given {@link AServer} diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java index b0c763f6c..19ccd0100 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java @@ -5,7 +5,6 @@ import dev.sheldan.abstracto.core.command.config.HelpInfo; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; -import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.moderation.models.template.commands.WarnLog; @@ -23,9 +22,6 @@ import java.util.List; @Slf4j public class Warn extends AbstractConditionableCommand { - @Autowired - private UserManagementService userManagementService; - @Autowired private WarnService warnService; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java index 35709d0cd..3b935b177 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java @@ -3,7 +3,6 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.JoinListener; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; @@ -24,9 +23,6 @@ public class JoinLogger implements JoinListener { private static final String USER_JOIN_TEMPLATE = "user_join"; private static final String JOIN_LOG_TARGET = "joinLog"; - @Autowired - private ServerManagementService serverManagementService; - @Autowired private TemplateService templateService; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java index a83c0e498..ff769a80e 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java @@ -2,7 +2,6 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.LeaveListener; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; @@ -23,9 +22,6 @@ public class LeaveLogger implements LeaveListener { private static final String USER_LEAVE_TEMPLATE = "user_leave"; private static final String LEAVE_LOG_TARGET = "leaveLog"; - @Autowired - private ServerManagementService serverManagementService; - @Autowired private TemplateService templateService; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java index 12f516a9e..a514ab52e 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java @@ -3,7 +3,6 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageDeletedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.templating.model.MessageToSend; -import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.utils.ContextUtils; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; @@ -22,9 +21,6 @@ public class MessageDeleteLogListener implements MessageDeletedListener { private static String MESSAGE_DELETED_TEMPLATE = "message_deleted"; private static String MESSAGE_DELETED_ATTACHMENT_TEMPLATE = "message_deleted_attachment"; - @Autowired - private MessageCache messageCache; - @Autowired private ContextUtils contextUtils; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java index 128e64f20..6db6a47e3 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java @@ -3,7 +3,6 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageTextUpdatedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.templating.model.MessageToSend; -import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog; @@ -27,9 +26,6 @@ public class MessageEditedListener implements MessageTextUpdatedListener { @Autowired private PostTargetService postTargetService; - @Autowired - private MessageCache messageCache; - @Override @Transactional public void execute(CachedMessage messageBefore, Message messageAfter) { diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java index d9c3dc8be..c630d1d0e 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java @@ -8,7 +8,6 @@ import dev.sheldan.abstracto.moderation.models.template.commands.WarnLog; import dev.sheldan.abstracto.moderation.models.template.commands.WarnNotification; import dev.sheldan.abstracto.moderation.models.database.Warning; import dev.sheldan.abstracto.moderation.service.management.WarnManagementService; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.BotService; @@ -24,15 +23,13 @@ import org.springframework.stereotype.Component; public class WarnServiceBean implements WarnService { public static final String WARN_LOG_TARGET = "warnLog"; + @Autowired private UserManagementService userManagementService; @Autowired private WarnManagementService warnManagementService; - @Autowired - private ServerManagementService serverManagementService; - @Autowired private PostTargetService postTargetService; @@ -99,7 +96,7 @@ public class WarnServiceBean implements WarnService { } private void sendWarnLog(ServerContext warnLogModel) { - MessageToSend message = templateService.renderEmbedTemplate("warn_log", warnLogModel); + MessageToSend message = templateService.renderEmbedTemplate(WARN_LOG_TEMPLATE, warnLogModel); postTargetService.sendEmbedInPostTarget(message, WARN_LOG_TARGET, warnLogModel.getServer().getId()); } } diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java index 7e075eec6..33a1a6745 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java @@ -23,6 +23,7 @@ import java.util.List; public class StarStats extends AbstractConditionableCommand { public static final String STARSTATS_RESPONSE_TEMPLATE = "starStats_response"; + @Autowired private StarboardService starboardService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java index 9391eeaec..5896d4ff5 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java @@ -8,7 +8,6 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.BotService; import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.MessageService; -import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.utils.EmoteUtils; import dev.sheldan.abstracto.utility.config.UtilityFeatures; import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; @@ -27,9 +26,6 @@ public class MessageEmbedRemovalReactionListener implements ReactedAddedListener public static final String REMOVAL_EMOTE = "removeEmbed"; - @Autowired - private EmoteManagementService emoteManagementService; - @Autowired private BotService botService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java index 440c6bf90..d09eb1658 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java @@ -9,9 +9,7 @@ import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.BotService; import dev.sheldan.abstracto.core.service.EmoteService; -import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.management.ConfigManagementService; -import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.utils.EmoteUtils; import dev.sheldan.abstracto.utility.config.UtilityFeatures; @@ -36,15 +34,9 @@ public class StarboardListener implements ReactedAddedListener, ReactedRemovedLi public static final String STAR_EMOTE = "star"; - @Autowired - private EmoteManagementService emoteManagementService; - @Autowired private BotService botService; - @Autowired - private MessageCache messageCache; - @Autowired private ConfigManagementService configManagementService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java index 115e3b19a..2911bf006 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java @@ -23,8 +23,7 @@ public class StarboardPostDeletedListener implements MessageDeletedListener { Optional byStarboardPostId = starboardPostManagementService.findByStarboardPostId(messageBefore.getMessageId()); if(byStarboardPostId.isPresent()) { StarboardPost post = byStarboardPostId.get(); - // TODO channel missing - log.info("Removing starboard post: message {}, channel {}, server {}, because the message was deleted", post.getPostMessageId(), messageBefore.getChannelId(), post.getAuthor().getId()); + log.info("Removing starboard post: message {}, channel {}, server {}, because the message was deleted", post.getPostMessageId(), post.getSourceChanel().getId(), post.getAuthor().getId()); starboardPostManagementService.setStarboardPostIgnored(messageBefore.getMessageId(), true); } } diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java index b69a80049..da80c9b3e 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java @@ -1,6 +1,5 @@ package dev.sheldan.abstracto.utility.repository.converter; -import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.service.BotService; import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; @@ -14,9 +13,6 @@ import java.util.List; @Component public class StarStatsUserConverter { - @Autowired - private UserManagementService userManagementService; - @Autowired private BotService botService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java index 3b5a8c97c..ab47bfecd 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java @@ -1,8 +1,6 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; -import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.AServerAChannelMessage; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.*; @@ -39,6 +37,7 @@ public class StarboardServiceBean implements StarboardService { public static final String STARBOARD_POSTTARGET = "starboard"; public static final String STARBOARD_POST_TEMPLATE = "starboard_post"; + @Autowired private BotService botService; @@ -48,9 +47,6 @@ public class StarboardServiceBean implements StarboardService { @Autowired private TemplateService templateService; - @Autowired - private EmoteManagementService emoteManagementService; - @Autowired private ConfigService configService; @@ -60,9 +56,6 @@ public class StarboardServiceBean implements StarboardService { @Autowired private StarboardConfig starboardConfig; - @Autowired - private UserManagementService userManagementService; - @Autowired private StarboardPostReactorManagementService starboardPostReactorManagementService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java index d1863aadf..b781f6d73 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java @@ -1,7 +1,5 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.core.service.EmoteService; -import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.BotService; @@ -34,6 +32,7 @@ public class SuggestionServiceBean implements SuggestionService { private static final String SUGGESTION_YES_EMOTE = "suggestionYes"; private static final String SUGGESTION_NO_EMOTE = "suggestionNo"; public static final String SUGGESTIONS_TARGET = "suggestions"; + @Autowired private SuggestionManagementService suggestionManagementService; @@ -46,12 +45,6 @@ public class SuggestionServiceBean implements SuggestionService { @Autowired private BotService botService; - @Autowired - private EmoteManagementService emoteManagementService; - - @Autowired - private EmoteService emoteService; - @Autowired private MessageService messageService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java index 3ca9b838c..70d989638 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java @@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; import dev.sheldan.abstracto.utility.repository.EmbeddedMessageRepository; @@ -26,9 +25,6 @@ public class MessageEmbedPostManagementServiceBean implements MessageEmbedPostMa @Autowired private UserManagementService userManagementService; - @Autowired - private MessageService messageService; - @Override @Transactional public void createMessageEmbed(CachedMessage embeddedMessage, Message messageContainingEmbed, AUserInAServer cause) { diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java index a2e62c86f..c856c7830 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java @@ -6,7 +6,6 @@ import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.utility.models.database.StarboardPost; import dev.sheldan.abstracto.utility.repository.StarboardPostRepository; -import dev.sheldan.abstracto.utility.repository.converter.StarStatsUserConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -22,9 +21,6 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme @Autowired private StarboardPostRepository repository; - @Autowired - private StarStatsUserConverter converter; - @Override public StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerAChannelMessage starboardPost) { StarboardPost post = StarboardPost diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java index 5e3a79e65..1da706ae2 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java @@ -7,13 +7,11 @@ import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.config.Parameters; import dev.sheldan.abstracto.core.command.exception.IncorrectParameter; import dev.sheldan.abstracto.core.command.exception.ParameterTooLong; -import dev.sheldan.abstracto.core.command.service.ChannelGroupCommandService; import dev.sheldan.abstracto.core.command.service.CommandManager; import dev.sheldan.abstracto.core.command.service.PostCommandExecution; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter; import dev.sheldan.abstracto.core.Constants; -import dev.sheldan.abstracto.core.command.service.management.CommandManagementService; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import dev.sheldan.abstracto.core.models.database.ARole; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; @@ -66,12 +64,6 @@ public class CommandReceivedHandler extends ListenerAdapter { @Lazy private CommandReceivedHandler self; - @Autowired - private ChannelGroupCommandService channelGroupCommandService; - - @Autowired - private CommandManagementService commandManagementService; - @Autowired private RoleManagementService roleManagementService; diff --git 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 index 24058575c..20c0de020 100644 --- 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 @@ -3,16 +3,12 @@ package dev.sheldan.abstracto.core.command.service.management; import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.command.models.database.AModule; import dev.sheldan.abstracto.core.command.repository.CommandRepository; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component public class CommandManagementServiceBean implements CommandManagementService { - @Autowired - private ServerManagementService serverManagementService; - @Autowired private ModuleManagementService moduleManagementService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java index da8e0824a..6b5fc02a8 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java @@ -7,7 +7,6 @@ import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.models.template.commands.PostTargetErrorModel; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; @@ -26,15 +25,13 @@ public class PostTarget implements Command { public static final String POST_TARGET_NO_TARGET_TEMPLATE = "posttarget_no_target"; public static final String POST_TARGET_INVALID_TARGET_TEMPLATE = "posttarget_invalid_target"; + @Autowired private PostTargetManagement postTargetManagement; @Autowired private PostTargetService postTargetService; - @Autowired - private ChannelManagementService channelManagementService; - @Autowired private TemplateService templateService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java index ab7f91dcc..fbc036fb5 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java @@ -6,7 +6,6 @@ import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import net.dv8tion.jda.api.entities.Emote; import org.springframework.beans.factory.annotation.Autowired; @@ -21,9 +20,6 @@ public class SetEmote implements Command { @Autowired private EmoteManagementService emoteManagementService; - @Autowired - private EmoteService emoteService; - @Override public CommandResult execute(CommandContext commandContext) { String emoteKey = (String) commandContext.getParameters().getParameters().get(0); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java index 4e9b2c98f..612840358 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java @@ -1,7 +1,6 @@ package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.models.database.AChannelType; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; @@ -27,9 +26,6 @@ public class ChannelListener extends ListenerAdapter { @Autowired private ChannelManagementService channelManagementService; - @Autowired - private ServerManagementService serverManagementService; - @Override @Transactional public void onTextChannelDelete(@Nonnull TextChannelDeleteEvent event) { diff --git 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 index 3695e51c4..b7a31e70c 100644 --- 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 @@ -8,7 +8,6 @@ import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.utils.EmoteUtils; import lombok.extern.slf4j.Slf4j; @@ -32,9 +31,6 @@ public class ReactionUpdatedListener extends ListenerAdapter { @Autowired private MessageCache messageCache; - @Autowired - private EmoteService emoteService; - @Autowired private UserManagementService userManagementService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java index 6b6a5861b..d8cd25ca1 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java @@ -3,7 +3,6 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; -import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.models.database.AChannel; import lombok.extern.slf4j.Slf4j; @@ -28,9 +27,6 @@ public class ChannelServiceBean implements ChannelService { @Autowired private BotService botService; - @Autowired - private ChannelManagementService channelManagementService; - @Override public void sendTextInAChannel(String text, AChannel channel) { sendTextInAChannelFuture(text, channel); diff --git 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 index f070f9963..c1bc1c88e 100644 --- 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 @@ -2,8 +2,6 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; -import dev.sheldan.abstracto.core.service.management.EmoteManagementService; -import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AUser; @@ -33,17 +31,12 @@ public class MessageCacheBean implements MessageCache { @Autowired private BotService botService; - @Autowired - private UserManagementService userManagementService; - - @Autowired - private EmoteManagementService emoteManagementService; - @Autowired private EmoteService emoteService; @Autowired @Lazy + // needs to be lazy, because of circular dependency private MessageCache self; @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java index 40648c65f..7b19f8ede 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java @@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.DynamicKeyLoader; import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; -import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.models.database.PostTarget; import dev.sheldan.abstracto.templating.model.MessageToSend; import lombok.extern.slf4j.Slf4j; @@ -25,9 +24,6 @@ import java.util.concurrent.CompletableFuture; @Component public class PostTargetServiceBean implements PostTargetService { - @Autowired - private ServerManagementService serverManagementService; - @Autowired private PostTargetManagement postTargetManagement; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java index fff3d4b10..7e0ea8f81 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java @@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.DynamicKeyLoader; import dev.sheldan.abstracto.core.exception.EmoteException; import dev.sheldan.abstracto.core.models.database.AEmote; import dev.sheldan.abstracto.core.models.database.AServer; -import dev.sheldan.abstracto.core.service.BotService; import dev.sheldan.abstracto.core.repository.EmoteRepository; import net.dv8tion.jda.api.entities.Emote; import org.springframework.beans.factory.annotation.Autowired; @@ -25,9 +24,6 @@ public class EmoteManagementServiceBean implements EmoteManagementService { @Autowired private DynamicKeyLoader dynamicKeyLoader; - @Autowired - private BotService botService; - @Override public AEmote loadEmote(Long id) { return repository.getOne(id); diff --git 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 index 06e3fe5ea..8627df1d4 100644 --- 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 @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j public class PostTargetManagementBean implements PostTargetManagement { + @Autowired private PostTargetRepository postTargetRepository; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ServerManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ServerManagementServiceBean.java index 7b16685a3..3a8066543 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ServerManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ServerManagementServiceBean.java @@ -18,9 +18,6 @@ public class ServerManagementServiceBean implements ServerManagementService { @Autowired private PostTargetManagement postTargetManagement; - @Autowired - private ChannelManagementService channelManagementService; - @Autowired private UserManagementService userManagementService; diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java index 506f984f0..9dcc21850 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java @@ -11,6 +11,7 @@ import java.util.List; @Component @Slf4j public class SchedulerJobManagementServiceBean { + @Autowired private SchedulerJobRepository repository;