diff --git a/src/main/java/co/jp/springp0421/dogdemo/common/ApiResponse.java b/src/main/java/co/jp/springp0421/dogdemo/common/ApiResponse.java index 5ff5dd4..5a21452 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/common/ApiResponse.java +++ b/src/main/java/co/jp/springp0421/dogdemo/common/ApiResponse.java @@ -22,7 +22,7 @@ public class ApiResponse { return new ApiResponse<>(true, ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); } - public static ApiResponse success() { // 通常也会有一个不带数据的成功响应 + public static ApiResponse success() { return new ApiResponse<>(true, ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), null); } diff --git a/src/main/java/co/jp/springp0421/dogdemo/config/security/filter/JwtAuthenticationFilter.java b/src/main/java/co/jp/springp0421/dogdemo/config/security/filter/JwtAuthenticationFilter.java index e9994ea..b986c0b 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/config/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/co/jp/springp0421/dogdemo/config/security/filter/JwtAuthenticationFilter.java @@ -45,7 +45,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { jwt = authHeader.substring(7); username = jwtService.extractUsername(jwt); - //如果username为空且认证为空 + //如果username不为空且认证为空 if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { UserDetails userDetails = this.userDetailsService.loadUserByUsername(username); if (jwtService.isTokenValid(jwt, userDetails)) { diff --git a/src/main/java/co/jp/springp0421/dogdemo/dto/LoginDto.java b/src/main/java/co/jp/springp0421/dogdemo/dto/LoginDto.java index 960fb65..e17aca9 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/dto/LoginDto.java +++ b/src/main/java/co/jp/springp0421/dogdemo/dto/LoginDto.java @@ -4,6 +4,11 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter public class LoginDto { @NotBlank(message = "邮箱不能为空") @@ -13,20 +18,4 @@ public class LoginDto { @NotBlank(message = "密码不能为空") @Size(min = 6, max = 30, message = "密码长度必须在6到30位之间") private String password; - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } } diff --git a/src/main/java/co/jp/springp0421/dogdemo/dto/RegistrationDto.java b/src/main/java/co/jp/springp0421/dogdemo/dto/RegistrationDto.java index 62d0851..f62b9c1 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/dto/RegistrationDto.java +++ b/src/main/java/co/jp/springp0421/dogdemo/dto/RegistrationDto.java @@ -5,6 +5,11 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter public class RegistrationDto { //注：username可以为空 @@ -22,28 +27,4 @@ public class RegistrationDto { @NotBlank(message = "密码不能为空") @Size(min = 6, max = 30, message = "密码长度必须在6到30位之间") private String password; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } } diff --git a/src/main/java/co/jp/springp0421/dogdemo/dto/UserDto.java b/src/main/java/co/jp/springp0421/dogdemo/dto/UserDto.java index 919875d..ae82ea3 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/dto/UserDto.java +++ b/src/main/java/co/jp/springp0421/dogdemo/dto/UserDto.java @@ -1,24 +1,13 @@ package co.jp.springp0421.dogdemo.dto; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter public class UserDto { private String email; private String name; - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/src/main/java/co/jp/springp0421/dogdemo/exception/BusinessException.java b/src/main/java/co/jp/springp0421/dogdemo/exception/BusinessException.java index 12cd552..9ffeaa7 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/exception/BusinessException.java +++ b/src/main/java/co/jp/springp0421/dogdemo/exception/BusinessException.java @@ -1,7 +1,9 @@ package co.jp.springp0421.dogdemo.exception; import co.jp.springp0421.dogdemo.common.ResultCode; +import lombok.Getter; +@Getter public class BusinessException extends RuntimeException { private final ResultCode resultCode; @@ -26,13 +28,4 @@ public class BusinessException extends RuntimeException { this.resultCode = resultCode; this.detailMessage = null; } - - public ResultCode getResultCode() { - return resultCode; - } - - public String getDetailMessage() { - return detailMessage; - } - } \ No newline at end of file diff --git a/src/main/java/co/jp/springp0421/dogdemo/exception/GlobalExceptionHandler.java b/src/main/java/co/jp/springp0421/dogdemo/exception/GlobalExceptionHandler.java index a66d215..d385412 100644 --- a/src/main/java/co/jp/springp0421/dogdemo/exception/GlobalExceptionHandler.java +++ b/src/main/java/co/jp/springp0421/dogdemo/exception/GlobalExceptionHandler.java @@ -92,33 +92,21 @@ public class GlobalExceptionHandler { private HttpStatus determineHttpStatusFromResultCode(ResultCode resultCode) { if (resultCode == null) return HttpStatus.INTERNAL_SERVER_ERROR; - switch (resultCode) { - case SUCCESS: - return HttpStatus.OK; - case UNAUTHORIZED: - case USER_INVALID_CREDENTIALS: - case USER_TOKEN_INVALID: - case USER_TOKEN_EXPIRED: - return HttpStatus.UNAUTHORIZED; - case FORBIDDEN: - return HttpStatus.FORBIDDEN; - case NOT_FOUND: - case USER_ACCOUNT_NOT_FOUND: - case USER_PROFILE_NOT_FOUND: - return HttpStatus.NOT_FOUND; - case CONFLICT: - case USER_EMAIL_ALREADY_EXISTS: - return HttpStatus.CONFLICT; - case BAD_REQUEST: - case VALIDATION_ERROR: - case USER_PASSWORD_TOO_SHORT: - return HttpStatus.BAD_REQUEST; - default: + return switch (resultCode) { + case SUCCESS -> HttpStatus.OK; + case UNAUTHORIZED, USER_INVALID_CREDENTIALS, USER_TOKEN_INVALID, USER_TOKEN_EXPIRED -> + HttpStatus.UNAUTHORIZED; + case FORBIDDEN -> HttpStatus.FORBIDDEN; + case NOT_FOUND, USER_ACCOUNT_NOT_FOUND, USER_PROFILE_NOT_FOUND -> HttpStatus.NOT_FOUND; + case CONFLICT, USER_EMAIL_ALREADY_EXISTS -> HttpStatus.CONFLICT; + case BAD_REQUEST, VALIDATION_ERROR, USER_PASSWORD_TOO_SHORT -> HttpStatus.BAD_REQUEST; + default -> { if (resultCode.getCode() >= 2000 && resultCode.getCode() < 3000) { - return HttpStatus.INTERNAL_SERVER_ERROR; + yield HttpStatus.INTERNAL_SERVER_ERROR; } - return HttpStatus.BAD_REQUEST; - } + yield HttpStatus.BAD_REQUEST; + } + }; } } \ No newline at end of file