From 8d02c232d0033379bb501f45391fb3a581c9fece Mon Sep 17 00:00:00 2001 From: hseong3243 Date: Thu, 29 Aug 2024 01:01:11 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20ObjectMapper=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/config/WaitingConfig.java | 6 ++--- .../waitingsystem/ObjectMapperUtils.java | 25 ------------------- .../redis/waiting/RedisWaitingRoom.java | 5 +--- .../waitingsystem/redis/TestRedisConfig.java | 2 +- .../waiting/RedisWaitingManagerTest.java | 3 --- .../redis/waiting/RedisWaitingRoomTest.java | 3 --- 6 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/com/thirdparty/ticketing/global/waitingsystem/ObjectMapperUtils.java diff --git a/src/main/java/com/thirdparty/ticketing/global/config/WaitingConfig.java b/src/main/java/com/thirdparty/ticketing/global/config/WaitingConfig.java index cad6bfa4..cd1330e2 100644 --- a/src/main/java/com/thirdparty/ticketing/global/config/WaitingConfig.java +++ b/src/main/java/com/thirdparty/ticketing/global/config/WaitingConfig.java @@ -4,7 +4,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.StringRedisTemplate; -import com.fasterxml.jackson.databind.ObjectMapper; import com.thirdparty.ticketing.domain.common.EventPublisher; import com.thirdparty.ticketing.domain.waitingsystem.WaitingAspect; import com.thirdparty.ticketing.domain.waitingsystem.WaitingSystem; @@ -43,9 +42,8 @@ public WaitingManager waitingManager( } @Bean - public RedisWaitingRoom waitingRoom( - StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { - return new RedisWaitingRoom(redisTemplate, objectMapper); + public RedisWaitingRoom waitingRoom(StringRedisTemplate redisTemplate) { + return new RedisWaitingRoom(redisTemplate); } @Bean diff --git a/src/main/java/com/thirdparty/ticketing/global/waitingsystem/ObjectMapperUtils.java b/src/main/java/com/thirdparty/ticketing/global/waitingsystem/ObjectMapperUtils.java deleted file mode 100644 index 226ffb4d..00000000 --- a/src/main/java/com/thirdparty/ticketing/global/waitingsystem/ObjectMapperUtils.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.thirdparty.ticketing.global.waitingsystem; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.thirdparty.ticketing.domain.common.ErrorCode; -import com.thirdparty.ticketing.domain.common.TicketingException; - -public class ObjectMapperUtils { - - public static String writeValueAsString(ObjectMapper objectMapper, Object value) { - try { - return objectMapper.writeValueAsString(value); - } catch (JsonProcessingException e) { - throw new TicketingException(ErrorCode.WAITING_WRITE_ERROR); - } - } - - public static T readValue(ObjectMapper objectMapper, String value, Class valueType) { - try { - return objectMapper.readValue(value, valueType); - } catch (JsonProcessingException e) { - throw new TicketingException(ErrorCode.WAITING_READ_ERROR); - } - } -} diff --git a/src/main/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoom.java b/src/main/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoom.java index 6b59185f..80f625d0 100644 --- a/src/main/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoom.java +++ b/src/main/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoom.java @@ -6,7 +6,6 @@ import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; -import com.fasterxml.jackson.databind.ObjectMapper; import com.thirdparty.ticketing.domain.common.ErrorCode; import com.thirdparty.ticketing.domain.common.TicketingException; import com.thirdparty.ticketing.domain.waitingsystem.waiting.WaitingRoom; @@ -16,11 +15,9 @@ public class RedisWaitingRoom implements WaitingRoom { private static final String WAITING_ROOM_KEY = "waiting_room:"; private final HashOperations waitingRoom; - private final ObjectMapper objectMapper; - public RedisWaitingRoom(StringRedisTemplate redisTemplate, ObjectMapper objectMapper) { + public RedisWaitingRoom(StringRedisTemplate redisTemplate) { waitingRoom = redisTemplate.opsForHash(); - this.objectMapper = objectMapper; } public boolean enter(String email, long performanceId) { diff --git a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/TestRedisConfig.java b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/TestRedisConfig.java index 9948f652..29c91bf6 100644 --- a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/TestRedisConfig.java +++ b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/TestRedisConfig.java @@ -41,7 +41,7 @@ public RedisWaitingManager waitingManager( @Bean public RedisWaitingRoom waitingRoom() { - return new RedisWaitingRoom(redisTemplate, objectMapper); + return new RedisWaitingRoom(redisTemplate); } @Bean diff --git a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingManagerTest.java b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingManagerTest.java index 704c59f1..ecbdcfe0 100644 --- a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingManagerTest.java +++ b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingManagerTest.java @@ -18,7 +18,6 @@ import org.springframework.data.redis.core.ZSetOperations; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.thirdparty.ticketing.support.BaseIntegrationTest; class RedisWaitingManagerTest extends BaseIntegrationTest { @@ -27,8 +26,6 @@ class RedisWaitingManagerTest extends BaseIntegrationTest { @Autowired private StringRedisTemplate redisTemplate; - @Autowired private ObjectMapper objectMapper; - @BeforeEach void setUp() { redisTemplate.getConnectionFactory().getConnection().serverCommands().flushAll(); diff --git a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoomTest.java b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoomTest.java index 6f49d4e9..dc9daf24 100644 --- a/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoomTest.java +++ b/src/test/java/com/thirdparty/ticketing/global/waitingsystem/redis/waiting/RedisWaitingRoomTest.java @@ -15,7 +15,6 @@ import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; -import com.fasterxml.jackson.databind.ObjectMapper; import com.thirdparty.ticketing.domain.common.TicketingException; import com.thirdparty.ticketing.support.BaseIntegrationTest; @@ -25,8 +24,6 @@ class RedisWaitingRoomTest extends BaseIntegrationTest { @Autowired private StringRedisTemplate redisTemplate; - @Autowired private ObjectMapper objectMapper; - private HashOperations rawWaitingRoom; private String getWaitingRoomKey(long performanceId) {