From 96a5d50eb7927c276c7538a981085654708232de Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 13 Feb 2025 21:15:40 +0100
Subject: [PATCH] Fixed
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../at/tuwien/handlers/ApiExceptionHandler.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index 5ac4c3e3ac..44e35f3a29 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -21,7 +21,14 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
@ResponseStatus(code = HttpStatus.UNAUTHORIZED)
@ExceptionHandler(TokenExpiredException.class)
public ResponseEntity<ApiErrorDto> handle(TokenExpiredException e) {
- return generic_handle(e.getClass(), e.getLocalizedMessage(), "error.token.expired");
+ final HttpHeaders headers = new HttpHeaders();
+ headers.set("Content-Type", "application/problem+json");
+ final ApiErrorDto response = ApiErrorDto.builder()
+ .status(HttpStatus.UNAUTHORIZED)
+ .message(e.getLocalizedMessage())
+ .code("error.token.expired")
+ .build();
+ return new ResponseEntity<>(response, headers, response.getStatus());
}
@Hidden
@@ -473,17 +480,13 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
}
private ResponseEntity<ApiErrorDto> generic_handle(Class<?> exceptionClass, String message) {
- return generic_handle(exceptionClass, message, exceptionClass.getAnnotation(ResponseStatus.class).reason());
- }
-
- private ResponseEntity<ApiErrorDto> generic_handle(Class<?> exceptionClass, String message, String code) {
final HttpHeaders headers = new HttpHeaders();
headers.set("Content-Type", "application/problem+json");
final ResponseStatus annotation = exceptionClass.getAnnotation(ResponseStatus.class);
final ApiErrorDto response = ApiErrorDto.builder()
.status(annotation.code())
.message(message)
- .code(code)
+ .code(exceptionClass.getAnnotation(ResponseStatus.class).reason())
.build();
return new ResponseEntity<>(response, headers, response.getStatus());
}
--
GitLab