introduced eh-cache as a caching provider instead of caffeine to be used in hibernate (only ram cache is currently possible)

added caching configuration for 2nd level caching in hibernate
added command to clear hibernate caches
changed some interfaces so the api looks a bit more consistent (return the created/updated value)
split user management and user in server management
added try catch block to message received listener execution, to make them independent
moved some feature flag methods to the feature flag service bean instead of the management service, as they used the FeatureEnum directly
fixed feature disable text always rendering
removed some non embed logging
fixed message embed template
added exception logging to message embedding

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedListener.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.listener.MessageReceivedListener;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.MessageCache;
-import dev.sheldan.abstracto.core.service.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.utility.models.MessageEmbedLink;
 import dev.sheldan.abstracto.utility.config.features.UtilityFeature;
 import dev.sheldan.abstracto.utility.service.MessageEmbedService;
@@ -25,10 +25,8 @@ public class MessageEmbedListener implements MessageReceivedListener {
     @Autowired
     private MessageCache messageCache;
 
-    public static final String MESSAGE_EMBED_TEMPLATE = "message";
-
     @Autowired
-    private UserManagementService userManagementService;
+    private UserInServerManagementService userInServerManagementService;
 
     @Autowired
     private MessageEmbedService messageEmbedService;
@@ -39,9 +37,13 @@ public class MessageEmbedListener implements MessageReceivedListener {
         List<MessageEmbedLink> links = messageEmbedService.getLinksInMessage(messageRaw);
         for (MessageEmbedLink messageEmbedLink : links) {
             messageRaw = messageRaw.replace(messageEmbedLink.getWholeUrl(), "");
-            AUserInAServer cause = userManagementService.loadUser(message.getMember());
+            AUserInAServer cause = userInServerManagementService.loadUser(message.getMember());
             Consumer<CachedMessage> cachedMessageConsumer = cachedMessage -> messageEmbedService.embedLink(cachedMessage, message.getTextChannel(), cause, message);
-            messageCache.getMessageFromCache(messageEmbedLink.getServerId(), messageEmbedLink.getChannelId(), messageEmbedLink.getMessageId()).thenAccept(cachedMessageConsumer);
+            messageCache.getMessageFromCache(messageEmbedLink.getServerId(), messageEmbedLink.getChannelId(), messageEmbedLink.getMessageId()).thenAccept(cachedMessageConsumer)
+                    .exceptionally(throwable -> {
+                        log.error("Error when embedding link.", throwable);
+                        return null;
+                    });
         }
         if(StringUtils.isBlank(messageRaw) && !links.isEmpty()) {
             message.delete().queue();

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java

@@ -11,7 +11,7 @@ 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.management.ConfigManagementService;
-import dev.sheldan.abstracto.core.service.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.EmoteUtils;
 import dev.sheldan.abstracto.utility.config.features.UtilityFeature;
 import dev.sheldan.abstracto.utility.models.database.StarboardPost;
@@ -51,7 +51,7 @@ public class StarboardListener implements ReactedAddedListener, ReactedRemovedLi
     private StarboardPostReactorManagementService starboardPostReactorManagementService;
 
     @Autowired
-    private UserManagementService userManagementService;
+    private UserInServerManagementService userInServerManagementService;
 
     @Autowired
     private EmoteService emoteService;
@@ -81,7 +81,7 @@ public class StarboardListener implements ReactedAddedListener, ReactedRemovedLi
             if (userExceptAuthor.size() >= starMinimum) {
                 log.info("Post reached starboard minimum. Message {} in channel {} in server {} will be starred/updated.",
                         message.getMessageId(), message.getChannelId(), message.getServerId());
-                AUserInAServer author = userManagementService.loadUser(message.getServerId(), message.getAuthorId());
+                AUserInAServer author = userInServerManagementService.loadUser(message.getServerId(), message.getAuthorId());
                 if(starboardPostOptional.isPresent()) {
                     StarboardPost starboardPost = starboardPostOptional.get();
                     starboardPost.setIgnored(false);

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/EmbeddedMessageRepository.java

@@ -2,7 +2,12 @@ package dev.sheldan.abstracto.utility.repository;
 
 import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.QueryHints;
+
+import javax.persistence.QueryHint;
 
 public interface EmbeddedMessageRepository extends JpaRepository<EmbeddedMessage, Long> {
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     EmbeddedMessage findByEmbeddingMessageId(Long messageId);
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java

@@ -3,9 +3,15 @@ package dev.sheldan.abstracto.utility.repository;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.utility.models.database.Reminder;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.QueryHints;
+import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
 import java.util.List;
 
+@Repository
 public interface ReminderRepository extends JpaRepository<Reminder, Long> {
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     List<Reminder> getByRemindedUserAndRemindedFalse(AUserInAServer aUserInAServer);
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostReactionRepository.java

@@ -5,11 +5,17 @@ import dev.sheldan.abstracto.utility.models.database.StarboardPost;
 import dev.sheldan.abstracto.utility.models.database.StarboardPostReaction;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.QueryHints;
 
+import javax.persistence.QueryHint;
 import java.util.List;
 
 public interface StarboardPostReactionRepository extends JpaRepository<StarboardPostReaction, Long> {
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     void deleteByReactorAndStarboardPost(AUser user, StarboardPost post);
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     void deleteByStarboardPost(StarboardPost post);
 
     @Query(value = "SELECT r.reactor_id as userId, COUNT(*) AS starCount \n" +

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostRepository.java

@@ -2,12 +2,22 @@ package dev.sheldan.abstracto.utility.repository;
 
 import dev.sheldan.abstracto.utility.models.database.StarboardPost;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.QueryHints;
+import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
 import java.util.List;
 
+@Repository
 public interface StarboardPostRepository extends JpaRepository<StarboardPost, Long> {
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     StarboardPost findByPostMessageId(Long messageId);
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     StarboardPost findByStarboardMessageId(Long messageId);
+
+    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     List<StarboardPost> findByStarboardChannelServerId(Long serverId);
 
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/SuggestionRepository.java

@@ -2,6 +2,8 @@ package dev.sheldan.abstracto.utility.repository;
 
 import dev.sheldan.abstracto.utility.models.database.Suggestion;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface SuggestionRepository extends JpaRepository<Suggestion, Long> {
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java

@@ -12,7 +12,7 @@ import dev.sheldan.abstracto.core.service.MessageCache;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.core.service.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.templating.service.TemplateService;
 import dev.sheldan.abstracto.utility.models.MessageEmbedLink;
 import dev.sheldan.abstracto.utility.service.management.MessageEmbedPostManagementService;
@@ -48,7 +48,7 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
     private ServerManagementService serverManagementService;
 
     @Autowired
-    private UserManagementService userManagementService;
+    private UserInServerManagementService userInServerManagementService;
 
     @Autowired
     private BotService botService;
@@ -128,7 +128,7 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
     private MessageEmbeddedModel buildTemplateParameter(Message message, CachedMessage embeddedMessage) {
         AChannel channel = channelManagementService.loadChannel(message.getChannel().getIdLong());
         AServer server = serverManagementService.loadOrCreate(message.getGuild().getIdLong());
-        AUserInAServer user = userManagementService.loadUser(message.getMember());
+        AUserInAServer user = userInServerManagementService.loadUser(message.getMember());
         Member author = botService.getMemberInServer(embeddedMessage.getServerId(), embeddedMessage.getAuthorId());
         Optional<TextChannel> textChannelFromServer = botService.getTextChannelFromServer(embeddedMessage.getServerId(), embeddedMessage.getChannelId());
         TextChannel sourceChannel = null;

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java

@@ -4,7 +4,7 @@ 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.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage;
 import dev.sheldan.abstracto.utility.repository.EmbeddedMessageRepository;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@ public class MessageEmbedPostManagementServiceBean implements MessageEmbedPostMa
     private EmbeddedMessageRepository embeddedMessageRepository;
 
     @Autowired
-    private UserManagementService userManagementService;
+    private UserInServerManagementService userInServerManagementService;
 
     @Override
     @Transactional
@@ -32,7 +32,7 @@ public class MessageEmbedPostManagementServiceBean implements MessageEmbedPostMa
         AChannel embeddedChannel = AChannel.builder().id(embeddedMessage.getChannelId()).build();
         AServer embeddingServer = AServer.builder().id(messageContainingEmbed.getGuild().getIdLong()).build();
         AChannel embeddingChannel = AChannel.builder().id(messageContainingEmbed.getTextChannel().getIdLong()).build();
-        AUserInAServer embeddedAuthor = userManagementService.loadUser(embeddedMessage.getServerId(), embeddedMessage.getAuthorId());
+        AUserInAServer embeddedAuthor = userInServerManagementService.loadUser(embeddedMessage.getServerId(), embeddedMessage.getAuthorId());
         EmbeddedMessage messageEmbedPost = EmbeddedMessage
                 .builder()
                 .embeddedMessageId(embeddedMessage.getMessageId())

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.utility.service.management;
 
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.ServerManagementService;
-import dev.sheldan.abstracto.core.service.management.UserManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
@@ -26,14 +26,14 @@ public class SuggestionManagementServiceBean implements SuggestionManagementServ
     private ChannelManagementService channelManagementService;
 
     @Autowired
-    private UserManagementService userManagementService;
+    private UserInServerManagementService userInServerManagementService;
 
     @Autowired
     private ServerManagementService serverManagementService;
 
     @Override
     public Suggestion createSuggestion(Member suggester, String text) {
-        AUserInAServer user = userManagementService.loadUser(suggester);
+        AUserInAServer user = userInServerManagementService.loadUser(suggester);
         return this.createSuggestion(user, text);
     }
 

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/EmbeddedMessage.java

@@ -4,8 +4,10 @@ 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 lombok.*;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 @Entity
 @Table(name="embedded_message")
@@ -14,6 +16,8 @@ import javax.persistence.*;
 @NoArgsConstructor
 @Getter
 @Setter
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class EmbeddedMessage {
 
     @Getter
@@ -52,4 +56,24 @@ public class EmbeddedMessage {
     @Column
     @Id
     private Long embeddingMessageId;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        EmbeddedMessage that = (EmbeddedMessage) o;
+        return Objects.equals(embeddedUser, that.embeddedUser) &&
+                Objects.equals(embeddingUser, that.embeddingUser) &&
+                Objects.equals(embeddedServer, that.embeddedServer) &&
+                Objects.equals(embeddedChannel, that.embeddedChannel) &&
+                Objects.equals(embeddedMessageId, that.embeddedMessageId) &&
+                Objects.equals(embeddingServer, that.embeddingServer) &&
+                Objects.equals(embeddingChannel, that.embeddingChannel) &&
+                Objects.equals(embeddingMessageId, that.embeddingMessageId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(embeddedUser, embeddingUser, embeddedServer, embeddedChannel, embeddedMessageId, embeddingServer, embeddingChannel, embeddingMessageId);
+    }
 }

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java

@@ -4,9 +4,11 @@ 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 lombok.*;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.time.Instant;
+import java.util.Objects;
 
 @Entity
 @Table(name="reminder")
@@ -15,6 +17,8 @@ import java.time.Instant;
 @NoArgsConstructor
 @Getter
 @Setter
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Reminder {
 
     @Id
@@ -52,4 +56,24 @@ public class Reminder {
     @Getter
     private boolean reminded;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Reminder reminder = (Reminder) o;
+        return reminded == reminder.reminded &&
+                Objects.equals(id, reminder.id) &&
+                Objects.equals(remindedUser, reminder.remindedUser) &&
+                Objects.equals(messageId, reminder.messageId) &&
+                Objects.equals(channel, reminder.channel) &&
+                Objects.equals(server, reminder.server) &&
+                Objects.equals(reminderDate, reminder.reminderDate) &&
+                Objects.equals(targetDate, reminder.targetDate) &&
+                Objects.equals(text, reminder.text);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, remindedUser, messageId, channel, server, reminderDate, targetDate, text, reminded);
+    }
 }

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPost.java

@@ -3,10 +3,12 @@ package dev.sheldan.abstracto.utility.models.database;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AUser;
 import lombok.*;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 
 @Entity
 @Table(name="starboard_post")
@@ -15,6 +17,8 @@ import java.util.List;
 @NoArgsConstructor
 @Getter
 @Setter
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class StarboardPost {
 
     @Id
@@ -52,6 +56,7 @@ public class StarboardPost {
             orphanRemoval = true,
             cascade =  {CascadeType.PERSIST, CascadeType.MERGE})
     @JoinColumn(name="postId")
+    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<StarboardPostReaction> reactions;
 
     @Column
@@ -66,4 +71,26 @@ public class StarboardPost {
         }
         return this.reactions.size();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StarboardPost post = (StarboardPost) o;
+        return ignored == post.ignored &&
+                Objects.equals(id, post.id) &&
+                Objects.equals(author, post.author) &&
+                Objects.equals(starboardMessageId, post.starboardMessageId) &&
+                Objects.equals(postMessageId, post.postMessageId) &&
+                Objects.equals(starboardChannel, post.starboardChannel) &&
+                Objects.equals(sourceChanel, post.sourceChanel) &&
+                Objects.equals(reactionCount, post.reactionCount) &&
+                Objects.equals(reactions, post.reactions) &&
+                Objects.equals(starredDate, post.starredDate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, author, starboardMessageId, postMessageId, starboardChannel, sourceChanel, reactionCount, reactions, starredDate, ignored);
+    }
 }

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPostReaction.java

@@ -2,8 +2,10 @@ package dev.sheldan.abstracto.utility.models.database;
 
 import dev.sheldan.abstracto.core.models.database.AUser;
 import lombok.*;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 @Entity
 @Table(name="starboard_post_reaction")
@@ -12,6 +14,8 @@ import javax.persistence.*;
 @NoArgsConstructor
 @Getter
 @Setter
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class StarboardPostReaction {
 
     @Id
@@ -26,4 +30,18 @@ public class StarboardPostReaction {
     @JoinColumn(name = "postId", nullable = false)
     private StarboardPost starboardPost;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StarboardPostReaction that = (StarboardPostReaction) o;
+        return Objects.equals(id, that.id) &&
+                Objects.equals(reactor, that.reactor) &&
+                Objects.equals(starboardPost, that.starboardPost);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, reactor, starboardPost);
+    }
 }

abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Suggestion.java

@@ -8,13 +8,15 @@ import lombok.*;
 
 import javax.persistence.*;
 import java.time.Instant;
+import java.util.Objects;
 
 @Entity
 @Table(name="suggestion")
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter @Setter
+@Getter
+@Setter
 public class Suggestion {
 
     @Id
@@ -48,4 +50,22 @@ public class Suggestion {
     @Enumerated(EnumType.STRING)
     private SuggestionState state;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Suggestion that = (Suggestion) o;
+        return Objects.equals(id, that.id) &&
+                Objects.equals(suggester, that.suggester) &&
+                Objects.equals(messageId, that.messageId) &&
+                Objects.equals(channel, that.channel) &&
+                Objects.equals(server, that.server) &&
+                Objects.equals(suggestionDate, that.suggestionDate) &&
+                state == that.state;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, suggester, messageId, channel, server, suggestionDate, state);
+    }
 }