Skip to content

Commit fee5ea2

Browse files
rhkr8521rhkr8521
authored
Merge pull request #162 from Moongeul/refac/#161
[REFAC] Redis 캐싱 임시 해제
2 parents c00aba3 + e45e90a commit fee5ea2

File tree

5 files changed

+100
-100
lines changed

5 files changed

+100
-100
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies {
3030
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
3131

3232
//Redis Cache
33-
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
34-
implementation 'org.springframework.boot:spring-boot-starter-cache'
33+
//implementation 'org.springframework.boot:spring-boot-starter-data-redis'
34+
//implementation 'org.springframework.boot:spring-boot-starter-cache'
3535

3636
//AWS S3
3737
implementation 'software.amazon.awssdk:s3:2.27.12'

‎src/main/java/com/core/book/BookApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.cache.annotation.EnableCaching;
66
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
77

8-
@EnableCaching
8+
//@EnableCaching
99
@EnableJpaAuditing
1010
@SpringBootApplication
1111
public class BookApplication {

‎src/main/java/com/core/book/api/member/service/MemberService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public UserInfoResponseDTO getUserInfo(Long userId) {
303303
}
304304

305305
@Transactional
306-
@CacheEvict(value = {"followers", "following", "userInfo"}, key = "#userId")
306+
//@CacheEvict(value = {"followers", "following", "userInfo"}, key = "#userId")
307307
public boolean followOrUnfollowMember(Long userId, Long followingId) {
308308
// 팔로우 하는 유저를 찾을 수 없을 경우 예외처리
309309
Member follower = memberRepository.findById(userId)
@@ -330,7 +330,7 @@ public boolean followOrUnfollowMember(Long userId, Long followingId) {
330330
}
331331

332332
@Transactional(readOnly = true)
333-
@Cacheable(value = "following", key = "#userId")
333+
//@Cacheable(value = "following", key = "#userId")
334334
public List<FollowedUserDTO> getFollowedUsers(Long userId) {
335335
// 해당 유저를 찾을 수 없을 경우 예외처리
336336
Member member = memberRepository.findById(userId)
@@ -346,7 +346,7 @@ public List<FollowedUserDTO> getFollowedUsers(Long userId) {
346346
}
347347

348348
@Transactional(readOnly = true)
349-
@Cacheable(value = "followers", key = "#userId")
349+
//@Cacheable(value = "followers", key = "#userId")
350350
public List<FollowerUserDTO> getFollowers(Long userId) {
351351
// 해당 유저를 찾을 수 없을 경우 예외처리
352352
Member member = memberRepository.findById(userId)

‎src/main/java/com/core/book/common/config/redis/CacheConfig.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
package com.core.book.common.config.redis;
2-
3-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
6-
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
7-
import org.springframework.cache.annotation.EnableCaching;
8-
import org.springframework.context.annotation.Bean;
9-
import org.springframework.context.annotation.Configuration;
10-
import org.springframework.data.redis.cache.RedisCacheConfiguration;
11-
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
12-
import org.springframework.data.redis.serializer.RedisSerializationContext;
13-
import org.springframework.data.redis.serializer.StringRedisSerializer;
14-
15-
import java.time.Duration;
16-
17-
@EnableCaching
18-
@Configuration
19-
public class CacheConfig {
20-
21-
@Bean
22-
public RedisCacheConfiguration redisCacheConfiguration() {
23-
// ObjectMapper 생성 및 설정
24-
ObjectMapper objectMapper = new ObjectMapper();
25-
objectMapper.registerModule(new JavaTimeModule());
26-
27-
// Configure ObjectMapper to include 타입 정보
28-
objectMapper.activateDefaultTyping(
29-
LaissezFaireSubTypeValidator.instance,
30-
ObjectMapper.DefaultTyping.NON_FINAL,
31-
JsonTypeInfo.As.PROPERTY
32-
);
33-
34-
// 직렬화 생성 using the configured ObjectMapper
35-
GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
36-
37-
return RedisCacheConfiguration.defaultCacheConfig()
38-
.entryTtl(Duration.ofMinutes(5)) // 캐시 유효시간 5분
39-
.disableCachingNullValues()
40-
.serializeKeysWith(
41-
RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())
42-
)
43-
.serializeValuesWith(
44-
RedisSerializationContext.SerializationPair.fromSerializer(jsonRedisSerializer)
45-
);
46-
}
47-
48-
}
1+
//package com.core.book.common.config.redis;
2+
//
3+
//import com.fasterxml.jackson.annotation.JsonTypeInfo;
4+
//import com.fasterxml.jackson.databind.ObjectMapper;
5+
//import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
6+
//import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
7+
//import org.springframework.cache.annotation.EnableCaching;
8+
//import org.springframework.context.annotation.Bean;
9+
//import org.springframework.context.annotation.Configuration;
10+
//import org.springframework.data.redis.cache.RedisCacheConfiguration;
11+
//import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
12+
//import org.springframework.data.redis.serializer.RedisSerializationContext;
13+
//import org.springframework.data.redis.serializer.StringRedisSerializer;
14+
//
15+
//import java.time.Duration;
16+
//
17+
//@EnableCaching
18+
//@Configuration
19+
//public class CacheConfig {
20+
//
21+
// @Bean
22+
// public RedisCacheConfiguration redisCacheConfiguration() {
23+
// // ObjectMapper 생성 및 설정
24+
// ObjectMapper objectMapper = new ObjectMapper();
25+
// objectMapper.registerModule(new JavaTimeModule());
26+
//
27+
// // Configure ObjectMapper to include 타입 정보
28+
// objectMapper.activateDefaultTyping(
29+
// LaissezFaireSubTypeValidator.instance,
30+
// ObjectMapper.DefaultTyping.NON_FINAL,
31+
// JsonTypeInfo.As.PROPERTY
32+
// );
33+
//
34+
// // 직렬화 생성 using the configured ObjectMapper
35+
// GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
36+
//
37+
// return RedisCacheConfiguration.defaultCacheConfig()
38+
// .entryTtl(Duration.ofMinutes(5)) // 캐시 유효시간 5분
39+
// .disableCachingNullValues()
40+
// .serializeKeysWith(
41+
// RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())
42+
// )
43+
// .serializeValuesWith(
44+
// RedisSerializationContext.SerializationPair.fromSerializer(jsonRedisSerializer)
45+
// );
46+
// }
47+
//
48+
//}

‎src/main/java/com/core/book/common/config/redis/RedisConfig.java‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
package com.core.book.common.config.redis;
2-
3-
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
5-
import org.springframework.beans.factory.annotation.Value;
6-
import org.springframework.context.annotation.Bean;
7-
import org.springframework.context.annotation.Configuration;
8-
import org.springframework.data.redis.connection.RedisConnectionFactory;
9-
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
10-
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
11-
import org.springframework.data.redis.core.RedisTemplate;
12-
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
13-
import org.springframework.data.redis.serializer.StringRedisSerializer;
14-
15-
@Configuration
16-
public class RedisConfig {
17-
18-
@Value("${spring.data.redis.host}")
19-
private String host;
20-
21-
@Value("${spring.data.redis.port}")
22-
private int port;
23-
24-
@Bean
25-
public RedisConnectionFactory redisConnectionFactory() {
26-
return new LettuceConnectionFactory(
27-
new RedisStandaloneConfiguration(host, port)
28-
);
29-
}
30-
31-
@Bean
32-
public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
33-
RedisTemplate<String, Object> template = new RedisTemplate<>();
34-
template.setConnectionFactory(connectionFactory);
35-
36-
// Configure the ObjectMapper with the JavaTimeModule
37-
ObjectMapper objectMapper = new ObjectMapper();
38-
objectMapper.registerModule(new JavaTimeModule());
39-
40-
// Set the serializers for the RedisTemplate
41-
template.setKeySerializer(new StringRedisSerializer());
42-
template.setValueSerializer(new GenericJackson2JsonRedisSerializer(objectMapper));
43-
44-
return template;
45-
}
46-
}
1+
//package com.core.book.common.config.redis;
2+
//
3+
//import com.fasterxml.jackson.databind.ObjectMapper;
4+
//import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
5+
//import org.springframework.beans.factory.annotation.Value;
6+
//import org.springframework.context.annotation.Bean;
7+
//import org.springframework.context.annotation.Configuration;
8+
//import org.springframework.data.redis.connection.RedisConnectionFactory;
9+
//import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
10+
//import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
11+
//import org.springframework.data.redis.core.RedisTemplate;
12+
//import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
13+
//import org.springframework.data.redis.serializer.StringRedisSerializer;
14+
//
15+
//@Configuration
16+
//public class RedisConfig {
17+
//
18+
// @Value("${spring.data.redis.host}")
19+
// private String host;
20+
//
21+
// @Value("${spring.data.redis.port}")
22+
// private int port;
23+
//
24+
// @Bean
25+
// public RedisConnectionFactory redisConnectionFactory() {
26+
// return new LettuceConnectionFactory(
27+
// new RedisStandaloneConfiguration(host, port)
28+
// );
29+
// }
30+
//
31+
// @Bean
32+
// public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
33+
// RedisTemplate<String, Object> template = new RedisTemplate<>();
34+
// template.setConnectionFactory(connectionFactory);
35+
//
36+
// // Configure the ObjectMapper with the JavaTimeModule
37+
// ObjectMapper objectMapper = new ObjectMapper();
38+
// objectMapper.registerModule(new JavaTimeModule());
39+
//
40+
// // Set the serializers for the RedisTemplate
41+
// template.setKeySerializer(new StringRedisSerializer());
42+
// template.setValueSerializer(new GenericJackson2JsonRedisSerializer(objectMapper));
43+
//
44+
// return template;
45+
// }
46+
//}

0 commit comments

Comments
 (0)