From eb3a8ffb7500ca399e3d54faf185d21f4dbd0b1b Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 9 Aug 2019 11:47:17 +0300 Subject: Revert "More caches" This reverts commit 82cbd49555a723f91ed3684a64debeade9c0b3f8. --- .../java/com/juick/server/configuration/WwwAppConfiguration.java | 2 +- src/main/java/com/juick/service/MessagesService.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java index 45950eb0..0c5c8dbf 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", "messages", "replies"); + return new CaffeineCacheManager("help", "users_by_name", "discussions"); } @Bean diff --git a/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java index 2b75a53a..490e0cfc 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", "messages", "replies" }, allEntries = true) + @CacheEvict(value = "discussions", allEntries = true) int createMessage(int uid, String txt, String attachment, List tags); - @CacheEvict(value = { "discussions", "messages", "replies" }, allEntries = true) + @CacheEvict(value = "discussions", 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 getPrivate(int uid, int before); - @Cacheable(value = "discussions", key="#uid + #to") + @Cacheable(value = "discussions", key="#uid") List getDiscussions(int uid, Long to); List getRecommended(int uid, int before); @@ -112,12 +112,10 @@ public interface MessagesService { List getUserSearch(User visitor, int UID, String search, int privacy, int page); - @Cacheable(value = "messages", key="#visitor.uid + #mids.hashCode()") List getMessages(User visitor, List mids); Map> updateReactionsFor(final List mid); - @Cacheable(value = "replies", key="#user.uid + #mid") List getReplies(User user, int mid); boolean setMessagePopular(int mid, int popular); -- cgit v1.2.3