From f1c8211f7af1b01a42a4cb75937436ab19a39221 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Mon, 13 Nov 2023 10:15:11 +0200 Subject: [PATCH] stick to one error response class --- .../config/JwtAuthenticationFilter.java | 4 ++-- .../controller/auth/ErrorResponse.java | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/com/faf223/expensetrackerfaf/controller/auth/ErrorResponse.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java b/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java index 043f61f..a8c3870 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java +++ b/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java @@ -1,6 +1,6 @@ package com.faf223.expensetrackerfaf.config; -import com.faf223.expensetrackerfaf.controller.auth.ErrorResponse; +import com.faf223.expensetrackerfaf.util.errors.ErrorResponse; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.ExpiredJwtException; import jakarta.servlet.FilterChain; @@ -61,7 +61,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); response.setContentType("application/json"); - ErrorResponse errorResponse = new ErrorResponse("TokenExpired", "Your session has expired. Please log in again."); + ErrorResponse errorResponse = new ErrorResponse("Your session has expired. Please log in again."); ObjectMapper objectMapper = new ObjectMapper(); // You may need to import ObjectMapper response.getWriter().write(objectMapper.writeValueAsString(errorResponse)); diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/auth/ErrorResponse.java b/src/main/java/com/faf223/expensetrackerfaf/controller/auth/ErrorResponse.java deleted file mode 100644 index 54db638..0000000 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/auth/ErrorResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.faf223.expensetrackerfaf.controller.auth; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class ErrorResponse { - private String error; - private String message; - - public ErrorResponse(String error, String message) { - this.error = error; - this.message = message; - } -}