More caches

2 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
index 0c5c8dbf..45950eb0 100644
--- a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
@@ -63,7 +63,7 @@ public class WwwAppConfiguration implements WebMvcConfigurer {
     private String imgDir;
     @Bean
     public CacheManager cacheManager() {
-        return new CaffeineCacheManager("help", "users_by_name", "discussions");
+        return new CaffeineCacheManager("help", "users_by_name", "discussions", "messages", "replies");
     }
 
     @Bean
diff --git a/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java
index 490e0cfc..2b75a53a 100644
--- a/src/main/java/com/juick/service/MessagesService.java
+++ b/src/main/java/com/juick/service/MessagesService.java
@@ -32,10 +32,10 @@ import java.util.*;
  * Created by aalexeev on 11/13/16.
  */
 public interface MessagesService {
-    @CacheEvict(value = "discussions", allEntries = true)
+    @CacheEvict(value = { "discussions", "messages", "replies" }, allEntries = true)
     int createMessage(int uid, String txt, String attachment, List<com.juick.Tag> tags);
 
-    @CacheEvict(value = "discussions", allEntries = true)
+    @CacheEvict(value = { "discussions", "messages", "replies" }, allEntries = true)
     int createReply(int mid, int rid, User user, String txt, String attachment);
 
     int getReplyIDIncrement(int mid);
@@ -87,7 +87,7 @@ public interface MessagesService {
 
     List<Integer> getPrivate(int uid, int before);
 
-    @Cacheable(value = "discussions", key="#uid")
+    @Cacheable(value = "discussions", key="#uid + #to")
     List<Integer> getDiscussions(int uid, Long to);
 
     List<Integer> getRecommended(int uid, int before);
@@ -112,10 +112,12 @@ public interface MessagesService {
 
     List<Integer> getUserSearch(User visitor, int UID, String search, int privacy, int page);
 
+    @Cacheable(value = "messages", key="#visitor.uid + #mids.hashCode()")
     List<com.juick.Message> getMessages(User visitor, List<Integer> mids);
 
     Map<Integer,Set<Reaction>> updateReactionsFor(final List<Integer> mid);
 
+    @Cacheable(value = "replies", key="#user.uid + #mid")
     List<com.juick.Message> getReplies(User user, int mid);
 
     boolean setMessagePopular(int mid, int popular);