diff --git a/src/main/java/org/hankki/hankkiserver/api/advice/GlobalExceptionHandler.java b/src/main/java/org/hankki/hankkiserver/api/advice/GlobalExceptionHandler.java index 9b41dfff..79484a6d 100644 --- a/src/main/java/org/hankki/hankkiserver/api/advice/GlobalExceptionHandler.java +++ b/src/main/java/org/hankki/hankkiserver/api/advice/GlobalExceptionHandler.java @@ -34,9 +34,9 @@ public HankkiResponse handleEntityNotFoundException(NotFoundException e) { } @ExceptionHandler(ConflictException.class) - public HankkiResponse handleConflictException(ConflictException e) { + public HankkiResponse handleConflictException(ConflictException e) { log.error("handleConflictException() in GlobalExceptionHandler throw ConflictException : {}", e.getMessage()); - return HankkiResponse.fail(e.getErrorCode(), e.getData()); + return HankkiResponse.fail(e.getErrorCode()); } @ExceptionHandler(MissingServletRequestParameterException.class) diff --git a/src/main/java/org/hankki/hankkiserver/api/dto/HankkiResponse.java b/src/main/java/org/hankki/hankkiserver/api/dto/HankkiResponse.java index 46e548e9..4e2d6b00 100644 --- a/src/main/java/org/hankki/hankkiserver/api/dto/HankkiResponse.java +++ b/src/main/java/org/hankki/hankkiserver/api/dto/HankkiResponse.java @@ -27,8 +27,4 @@ public static HankkiResponse success(SuccessCode success, T data) { public static HankkiResponse fail(ErrorCode error) { return new HankkiResponse<>(error.getHttpStatus().value(), error.getMessage()); } - - public static HankkiResponse fail(ErrorCode error, T data) { - return new HankkiResponse<>(error.getHttpStatus().value(), error.getMessage(), data); - } } diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java index 6cd4649e..4cf9ff5e 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java @@ -89,7 +89,7 @@ public void validateDuplicatedStore(final StoreValidationCommand command) { private void findUniversityStore(final Long universityId, final Store store) { if (universityStoreFinder.findByUniversityIdAndStore(universityId, store)) { - throw new ConflictException(StoreErrorCode.STORE_ALREADY_REGISTERED, new StoreDuplicateErrorResponse(store.getId())); + throw new ConflictException(StoreErrorCode.STORE_ALREADY_REGISTERED); } } } diff --git a/src/main/java/org/hankki/hankkiserver/common/exception/ConflictException.java b/src/main/java/org/hankki/hankkiserver/common/exception/ConflictException.java index b55fa18e..aa2d9182 100644 --- a/src/main/java/org/hankki/hankkiserver/common/exception/ConflictException.java +++ b/src/main/java/org/hankki/hankkiserver/common/exception/ConflictException.java @@ -6,16 +6,9 @@ @Getter public class ConflictException extends RuntimeException { private final ErrorCode errorCode; - private Object data; public ConflictException(ErrorCode errorCode) { super(errorCode.getMessage()); this.errorCode = errorCode; } - - public ConflictException(ErrorCode errorCode, Object data) { - super(errorCode.getMessage()); - this.errorCode = errorCode; - this.data = data; - } }