feat: 수정 요구사항 반영

woowacourse-teams · Nov 13, 2023 · 828041b · 828041b
1 parent 933fb35
commit 828041b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/backend/kirikiri/src/main/java/co/kirikiri/common/config/RedisConfig.java b/backend/kirikiri/src/main/java/co/kirikiri/common/config/RedisConfig.java
@@ -1,9 +1,7 @@
 package co.kirikiri.common.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import java.time.Duration;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
@@ -35,14 +33,10 @@ public RedisTemplate<String, String> redisTemplate(final RedisConnectionFactory
 
     @Bean
     public CacheManager redisCacheManager(final RedisConnectionFactory redisConnectionFactory) {
-        final BasicPolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator
-                .builder()
-                .allowIfSubType(Object.class)
-                .build();
         final ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.registerModule(new ParameterNamesModule());
-        objectMapper.activateDefaultTyping(typeValidator, ObjectMapper.DefaultTyping.EVERYTHING);
+        objectMapper.activateDefaultTyping(objectMapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.EVERYTHING);
+
         final RedisSerializer<Object> serializer = new GenericJackson2JsonRedisSerializer(objectMapper);
 
         final RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/service/CacheKeyGenerator.java b/backend/kirikiri/src/main/java/co/kirikiri/service/CacheKeyGenerator.java
@@ -6,7 +6,7 @@
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.stereotype.Component;
 
-@Component("cacheKeyGenerator")
+@Component
 public class CacheKeyGenerator implements KeyGenerator {
 
     private static final String DELIMITER = "_";

diff --git a/backend/kirikiri/src/main/java/co/kirikiri/service/roadmap/RoadmapReadService.java b/backend/kirikiri/src/main/java/co/kirikiri/service/roadmap/RoadmapReadService.java
@@ -190,7 +190,6 @@ private List<RoadmapTagDto> makeRoadmapTagDto(final RoadmapTags roadmapTags) {
                 .toList();
     }
 
-    @Cacheable(value = "roadmapList", keyGenerator = "cacheKeyGenerator", cacheManager = "redisCacheManager")
     public RoadmapForListResponses search(final RoadmapOrderTypeRequest orderTypeRequest,
                                           final RoadmapSearchRequest searchRequest,
                                           final CustomScrollRequest scrollRequest) {

diff --git a/backend/kirikiri/src/test/java/co/kirikiri/persistence/auth/RefreshTokenRepositoryTest.java b/backend/kirikiri/src/test/java/co/kirikiri/persistence/auth/RefreshTokenRepositoryTest.java
@@ -17,32 +17,30 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
 @ExtendWith(MockitoExtension.class)
 class RefreshTokenRepositoryTest {
 
-    private static Member member;
-
     private static final Long refreshTokenValidityInSeconds = 3600000L;
 
+    private static Member member;
+
     @Mock
-    private RedisTemplate<String, String> redisTemplateMock;
+    private RedisTemplate<String, String> redisTemplate;
 
     @Mock
-    private ValueOperations<String, String> valueOperationsMock;
+    private ValueOperations<String, String> valueOperations;
 
     private RefreshTokenRepositoryImpl refreshTokenRepository;
 
     @BeforeEach
     void init() {
-        MockitoAnnotations.openMocks(this);
-        when(redisTemplateMock.opsForValue())
-                .thenReturn(valueOperationsMock);
-        refreshTokenRepository = new RefreshTokenRepositoryImpl(redisTemplateMock, refreshTokenValidityInSeconds);
+        when(redisTemplate.opsForValue())
+                .thenReturn(valueOperations);
+        refreshTokenRepository = new RefreshTokenRepositoryImpl(redisTemplate, refreshTokenValidityInSeconds);
     }
 
 
@@ -74,7 +72,7 @@ static void setUp() {
         final String refreshToken = "refreshToken";
         final String memberIdentifier = member.getIdentifier().getValue();
 
-        when(valueOperationsMock.get(refreshToken))
+        when(valueOperations.get(refreshToken))
                 .thenReturn(memberIdentifier);
 
         //when