diff --git a/src/main/java/com/petlog/auth/controller/AuthSuccessCode.java b/src/main/java/com/petlog/auth/controller/AuthSuccessCode.java index ffe70b2..245e5a7 100644 --- a/src/main/java/com/petlog/auth/controller/AuthSuccessCode.java +++ b/src/main/java/com/petlog/auth/controller/AuthSuccessCode.java @@ -9,10 +9,10 @@ @RequiredArgsConstructor public enum AuthSuccessCode implements SuccessCode { - GENERATE_TOKEN(HttpStatus.OK, "JWT token 발급에 성공하였습니다."), - TOKEN_REFRESH(HttpStatus.CREATED, "JWT access token 재발급에 성공하였습니다."), + GENERATE_TOKEN(HttpStatus.OK.value(), "JWT token 발급에 성공하였습니다."), + TOKEN_REFRESH(HttpStatus.CREATED.value(), "JWT access token 재발급에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/common/exception/CommonErrorCode.java b/src/main/java/com/petlog/common/exception/CommonErrorCode.java index b298255..a3b850b 100644 --- a/src/main/java/com/petlog/common/exception/CommonErrorCode.java +++ b/src/main/java/com/petlog/common/exception/CommonErrorCode.java @@ -9,8 +9,8 @@ @RequiredArgsConstructor(access = AccessLevel.PACKAGE) @Getter public enum CommonErrorCode implements ErrorCode { - INTERNAL_SERVER_APPLICATION(HttpStatus.INTERNAL_SERVER_ERROR), + INTERNAL_SERVER_APPLICATION(HttpStatus.INTERNAL_SERVER_ERROR.value()), ; - private final HttpStatus value; + private final int value; } diff --git a/src/main/java/com/petlog/common/response/ApiResponse.java b/src/main/java/com/petlog/common/response/ApiResponse.java index 39cdaf3..d29619e 100644 --- a/src/main/java/com/petlog/common/response/ApiResponse.java +++ b/src/main/java/com/petlog/common/response/ApiResponse.java @@ -2,12 +2,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; -import org.springframework.http.HttpStatus; @Getter public class ApiResponse { - private final HttpStatus code; + private final int code; private final String message; @@ -27,7 +26,7 @@ public static ApiResponse fail(final ErrorCode errorCode, final String mes } private ApiResponse( - final HttpStatus code, + final int code, final String message, final T data ) { diff --git a/src/main/java/com/petlog/common/response/ErrorCode.java b/src/main/java/com/petlog/common/response/ErrorCode.java index c6dfebe..d12124e 100644 --- a/src/main/java/com/petlog/common/response/ErrorCode.java +++ b/src/main/java/com/petlog/common/response/ErrorCode.java @@ -1,7 +1,5 @@ package com.petlog.common.response; -import org.springframework.http.HttpStatus; - public interface ErrorCode { - HttpStatus getValue(); + int getValue(); } diff --git a/src/main/java/com/petlog/common/response/SuccessCode.java b/src/main/java/com/petlog/common/response/SuccessCode.java index 71d68a3..13a0762 100644 --- a/src/main/java/com/petlog/common/response/SuccessCode.java +++ b/src/main/java/com/petlog/common/response/SuccessCode.java @@ -1,8 +1,6 @@ package com.petlog.common.response; -import org.springframework.http.HttpStatus; - public interface SuccessCode { - HttpStatus getValue(); + int getValue(); String getMessage(); } diff --git a/src/main/java/com/petlog/diary/controller/DiarySuccessCode.java b/src/main/java/com/petlog/diary/controller/DiarySuccessCode.java index 3ad0a0d..78fee09 100644 --- a/src/main/java/com/petlog/diary/controller/DiarySuccessCode.java +++ b/src/main/java/com/petlog/diary/controller/DiarySuccessCode.java @@ -9,13 +9,13 @@ @RequiredArgsConstructor public enum DiarySuccessCode implements SuccessCode { - CREATE_DIARY(HttpStatus.CREATED, "일기 생성에 성공하였습니다."), - GET_ALL_DIARY(HttpStatus.OK, "일기 전체 조회에 성공하였습니다."), - GET_DIARY(HttpStatus.OK, "일기 상세 조회에 성공하였습니다."), - UPDATE_DIARY(HttpStatus.OK, "일기 상세 내용 수정에 성공하였습니다."), - DELETE_DIARY(HttpStatus.OK, "일기 삭제가 성공하였습니다."), + CREATE_DIARY(HttpStatus.CREATED.value(), "일기 생성에 성공하였습니다."), + GET_ALL_DIARY(HttpStatus.OK.value(), "일기 전체 조회에 성공하였습니다."), + GET_DIARY(HttpStatus.OK.value(), "일기 상세 조회에 성공하였습니다."), + UPDATE_DIARY(HttpStatus.OK.value(), "일기 상세 내용 수정에 성공하였습니다."), + DELETE_DIARY(HttpStatus.OK.value(), "일기 삭제가 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/member/controller/MemberSuccessCode.java b/src/main/java/com/petlog/member/controller/MemberSuccessCode.java index 0633a69..766f816 100644 --- a/src/main/java/com/petlog/member/controller/MemberSuccessCode.java +++ b/src/main/java/com/petlog/member/controller/MemberSuccessCode.java @@ -9,11 +9,11 @@ @RequiredArgsConstructor public enum MemberSuccessCode implements SuccessCode { - GET_IS_NOTIFICATION_ENABLED(HttpStatus.OK, "알림 수신 여부 조회에 성공하였습니다."), - UPDATE_IS_NOTIFICATION_ENABLED(HttpStatus.OK, "알림 수신 여부 설정에 성공하였습니다."), - WITHDRAW(HttpStatus.OK, "회원 탈퇴에 성공하였습니다."), + GET_IS_NOTIFICATION_ENABLED(HttpStatus.OK.value(), "알림 수신 여부 조회에 성공하였습니다."), + UPDATE_IS_NOTIFICATION_ENABLED(HttpStatus.OK.value(), "알림 수신 여부 설정에 성공하였습니다."), + WITHDRAW(HttpStatus.OK.value(), "회원 탈퇴에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/pet/controller/PetSuccessCode.java b/src/main/java/com/petlog/pet/controller/PetSuccessCode.java index b15556e..57fc518 100644 --- a/src/main/java/com/petlog/pet/controller/PetSuccessCode.java +++ b/src/main/java/com/petlog/pet/controller/PetSuccessCode.java @@ -9,10 +9,10 @@ @RequiredArgsConstructor public enum PetSuccessCode implements SuccessCode { - GET_PET_INFO(HttpStatus.OK, "반려동물 정보 조회에 성공하였습니다."), - UPDATE_PET_PROFILE(HttpStatus.OK, "반려동물 정보 수정에 성공하였습니다."), + GET_PET_INFO(HttpStatus.OK.value(), "반려동물 정보 조회에 성공하였습니다."), + UPDATE_PET_PROFILE(HttpStatus.OK.value(), "반려동물 정보 수정에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/petgroup/controller/PetGroupSuccessCode.java b/src/main/java/com/petlog/petgroup/controller/PetGroupSuccessCode.java index d4c7165..4f92ed1 100644 --- a/src/main/java/com/petlog/petgroup/controller/PetGroupSuccessCode.java +++ b/src/main/java/com/petlog/petgroup/controller/PetGroupSuccessCode.java @@ -9,15 +9,15 @@ @RequiredArgsConstructor public enum PetGroupSuccessCode implements SuccessCode { - CREATE_PET_GROUP(HttpStatus.CREATED, "그룹 생성에 성공하였습니다."), - JOIN_PET_GROUP(HttpStatus.OK, "그룹 참여에 성공하였습니다."), - GET_JOINING_PET_GROUP(HttpStatus.OK, "현재 참여중인 그룹 조회에 성공했습니다."), - LEAVE_PET_GROUP(HttpStatus.OK, "그룹 탈퇴에 성공하였습니다."), - GET_JOIN_CODE(HttpStatus.OK, "초대코드 조회에 성공하였습니다."), - GET_NOTE(HttpStatus.OK, "참고사항 조회에 성공하였습니다."), - UPDATE_NOTE(HttpStatus.OK, "참고사항 수정에 성공하였습니다."), + CREATE_PET_GROUP(HttpStatus.CREATED.value(), "그룹 생성에 성공하였습니다."), + JOIN_PET_GROUP(HttpStatus.OK.value(), "그룹 참여에 성공하였습니다."), + GET_JOINING_PET_GROUP(HttpStatus.OK.value(), "현재 참여중인 그룹 조회에 성공했습니다."), + LEAVE_PET_GROUP(HttpStatus.OK.value(), "그룹 탈퇴에 성공하였습니다."), + GET_JOIN_CODE(HttpStatus.OK.value(), "초대코드 조회에 성공하였습니다."), + GET_NOTE(HttpStatus.OK.value(), "참고사항 조회에 성공하였습니다."), + UPDATE_NOTE(HttpStatus.OK.value(), "참고사항 수정에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/s3/controller/S3SuccessCode.java b/src/main/java/com/petlog/s3/controller/S3SuccessCode.java index 68123e5..ddc95f5 100644 --- a/src/main/java/com/petlog/s3/controller/S3SuccessCode.java +++ b/src/main/java/com/petlog/s3/controller/S3SuccessCode.java @@ -9,9 +9,9 @@ @RequiredArgsConstructor public enum S3SuccessCode implements SuccessCode { - GENERATE_S3_PRESIGNED_URLS(HttpStatus.CREATED, "S3 presigned URL 생성에 성공하였습니다."), + GENERATE_S3_PRESIGNED_URLS(HttpStatus.CREATED.value(), "S3 presigned URL 생성에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; } diff --git a/src/main/java/com/petlog/schedule/controller/ScheduleSuccessCode.java b/src/main/java/com/petlog/schedule/controller/ScheduleSuccessCode.java index fc01614..505e804 100644 --- a/src/main/java/com/petlog/schedule/controller/ScheduleSuccessCode.java +++ b/src/main/java/com/petlog/schedule/controller/ScheduleSuccessCode.java @@ -9,12 +9,12 @@ @RequiredArgsConstructor public enum ScheduleSuccessCode implements SuccessCode { - CREATE_SCHEDULE(HttpStatus.CREATED, "일정 생성에 성공하였습니다."), - GET_ALL_SCHEDULE(HttpStatus.OK, "월별 일정 전체 조회에 성공하였습니다."), - UPDATE_SCHEDULE(HttpStatus.OK, "일정 상세 내용 수정에 성공하였습니다."), - DELETE_SCHEDULE(HttpStatus.OK, "일정 삭제에 성공하였습니다."), + CREATE_SCHEDULE(HttpStatus.CREATED.value(), "일정 생성에 성공하였습니다."), + GET_ALL_SCHEDULE(HttpStatus.OK.value(), "월별 일정 전체 조회에 성공하였습니다."), + UPDATE_SCHEDULE(HttpStatus.OK.value(), "일정 상세 내용 수정에 성공하였습니다."), + DELETE_SCHEDULE(HttpStatus.OK.value(), "일정 삭제에 성공하였습니다."), ; - private final HttpStatus value; + private final int value; private final String message; }