diff --git a/src/main/java/com/foru/freebe/errors/errorcode/AwsErrorCode.java b/src/main/java/com/foru/freebe/errors/errorcode/AwsErrorCode.java index ccdaf48..0f80c30 100644 --- a/src/main/java/com/foru/freebe/errors/errorcode/AwsErrorCode.java +++ b/src/main/java/com/foru/freebe/errors/errorcode/AwsErrorCode.java @@ -8,8 +8,7 @@ public enum AwsErrorCode implements ErrorCode { AMAZON_S3_EXCEPTION(404, "Amazon S3 exception"), AMAZON_SERVICE_EXCEPTION(500, "Amazon service exception"), - DELETE_OBJECT_EXCEPTION(500, "Failed to delete image to S3 due to an internal error"), - MAXIMUM_UPLOAD_SIZE_EXCEEDED(413, "Maximum upload size exceeded"); + DELETE_OBJECT_EXCEPTION(500, "Failed to delete image to S3 due to an internal error"); private final int httpStatus; private final String message; diff --git a/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java b/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java index a409e7f..d4fadc6 100644 --- a/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java +++ b/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java @@ -12,7 +12,7 @@ public enum CommonErrorCode implements ErrorCode { RESOURCE_NOT_FOUND(404, "Resource not exists"), INTERNAL_SERVER_ERROR(500, "Internal server error"), IO_EXCEPTION(500, "IoException occurred"), - PAYLOAD_TOO_LARGE(413, "Payload too large"); + MAXIMUM_UPLOAD_SIZE_EXCEEDED(413, "Maximum upload size exceeded"); private final int httpStatus; private final String message; diff --git a/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java b/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java index b1c179b..89fe678 100644 --- a/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java @@ -16,7 +16,6 @@ import org.springframework.web.multipart.MaxUploadSizeExceededException; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import com.foru.freebe.errors.errorcode.AwsErrorCode; import com.foru.freebe.errors.errorcode.CommonErrorCode; import com.foru.freebe.errors.errorcode.ErrorCode; import com.foru.freebe.errors.exception.JwtTokenException; @@ -49,12 +48,6 @@ public ResponseEntity handleDataTruncation(DataTruncation e) { return handleExceptionInternal(errorCode, message); } - @ExceptionHandler(MaxUploadSizeExceededException.class) - public ResponseEntity handleMaxUploadSizeExceeded(MaxUploadSizeExceededException e) { - ErrorCode errorCode = CommonErrorCode.PAYLOAD_TOO_LARGE; - return handleExceptionInternal(errorCode, e.getMessage()); - } - // 메서드 인자의 유효성 검사가 실패했을 때 발생 // 주로 Spring의 @Valid, @Validated 애노테이션을 사용한 검증 실패시 발생 @Override @@ -67,7 +60,7 @@ public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotVali @Override public ResponseEntity handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { - ErrorCode errorCode = AwsErrorCode.MAXIMUM_UPLOAD_SIZE_EXCEEDED; + ErrorCode errorCode = CommonErrorCode.MAXIMUM_UPLOAD_SIZE_EXCEEDED; return handleExceptionInternal(e, errorCode); }