AJ-1157: Spring Boot 3.2.1 #440
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package org.databiosphere.workspacedataservice.controller; | ||
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import java.util.ArrayList; | ||
| import java.util.Date; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.springframework.http.HttpHeaders; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.HttpStatusCode; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.http.ProblemDetail; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.ControllerAdvice; | ||
| import org.springframework.web.bind.annotation.ExceptionHandler; | ||
| import org.springframework.web.context.request.ServletWebRequest; | ||
| import org.springframework.web.context.request.WebRequest; | ||
| import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; | ||
| import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; | ||
|
|
||
| @ControllerAdvice | ||
| public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { | ||
|
There was a problem hiding this comment. This looks like a lot of new/novel code -- was this logic handled somehow for us automatically by something that got removed in the upgrade to SpringBoot 3 or did I miss a move in the red parts of the diff? There was a problem hiding this comment. I'm also confused what this is all about. Did you hand write this code? There was a problem hiding this comment. apologies, I meant to document this in the PR! Spring Boot 3 / Spring Framework 6 enables, by default, the RFC 7807 "Problem Details for HTTP APIs" standard for structuring its error responses. In WDS today on Spring Boot 2.7, Spring uses the If we blindly accepted the change to use Problem Details responses, we'd break anyone using the Java or Python clients to handle error messages, and potentially (probably?) break Terra UI when it tries to parse error messages from WDS. So, in this PR, I have set You can see this in practice if you run this branch locally by turning off the global exception handler (comment out the @calypsomatic yes, this is hand-written code. |
||
|
|
||
| private final String ERROR = "error"; | ||
| private final String MESSAGE = "message"; | ||
| private final String PATH = "path"; | ||
| private final String STATUS = "status"; | ||
| private final String TIMESTAMP = "timestamp"; | ||
|
|
||
| /** | ||
| * Override to explicitly translate Problem Details structures back to {@link | ||
| * org.databiosphere.workspacedata.model.ErrorResponse} structures. This ensures backwards | ||
| * compatibility for clients. | ||
| * | ||
| * <p>Even though {@code }spring.mvc.problemdetails.enabled} is set to false in config, many | ||
| * exception classes extend {@link org.springframework.web.server.ResponseStatusException}, and | ||
| * that exception serializes to a problem detail in the response. | ||
| * | ||
| * @param body the body to use for the response | ||
| * @param headers the headers to use for the response | ||
| * @param statusCode the status code to use for the response | ||
| * @param request the current request | ||
| * @return the {@code ResponseEntity} instance to use | ||
| */ | ||
| @NotNull | ||
| @Override | ||
| protected ResponseEntity<Object> createResponseEntity( | ||
| Object body, | ||
| @NotNull HttpHeaders headers, | ||
| @NotNull HttpStatusCode statusCode, | ||
| @NotNull WebRequest request) { | ||
| if (body instanceof ProblemDetail problemDetail) { | ||
| Map<String, Object> errorBody = new LinkedHashMap<>(); | ||
| errorBody.put(ERROR, problemDetail.getTitle()); | ||
| errorBody.put(MESSAGE, problemDetail.getDetail()); | ||
| errorBody.put(STATUS, problemDetail.getStatus()); | ||
| errorBody.put(TIMESTAMP, new Date()); | ||
|
|
||
| if (request instanceof ServletWebRequest servletWebRequest) { | ||
| errorBody.put(PATH, servletWebRequest.getRequest().getRequestURI()); | ||
| } | ||
| return new ResponseEntity<>(errorBody, headers, statusCode); | ||
| } | ||
|
|
||
| return super.createResponseEntity(body, headers, statusCode, request); | ||
| } | ||
|
|
||
| /** | ||
| * Handler for MethodArgumentTypeMismatchException. This exception contains the real message we | ||
| * want to display inside the nested cause. This handler ditches the top-level message in favor of | ||
| * that nested one. | ||
| * | ||
| * @param ex the exception in question | ||
| * @param servletRequest the request | ||
| * @return the desired response | ||
| */ | ||
| @ExceptionHandler({MethodArgumentTypeMismatchException.class}) | ||
| public ResponseEntity<Map<String, Object>> handleAllExceptions( | ||
| Exception ex, HttpServletRequest servletRequest) { | ||
| Map<String, Object> errorBody = new LinkedHashMap<>(); | ||
| errorBody.put(ERROR, HttpStatus.BAD_REQUEST.getReasonPhrase()); | ||
| errorBody.put(PATH, servletRequest.getRequestURI()); | ||
| errorBody.put(STATUS, HttpStatus.BAD_REQUEST.value()); | ||
| errorBody.put(TIMESTAMP, new Date()); | ||
|
|
||
| // MethodArgumentTypeMismatchException nested exceptions contains | ||
| // the real message we want to display. Gather all the nested messages and display the last one. | ||
| List<String> errorMessages = gatherNestedErrorMessages(ex, new ArrayList<>()); | ||
| if (!errorMessages.isEmpty()) { | ||
| errorBody.put(MESSAGE, errorMessages.get(errorMessages.size() - 1)); | ||
| } else { | ||
| errorBody.put(MESSAGE, "Unexpected error: " + ex.getClass().getName()); | ||
| } | ||
|
|
||
| return ResponseEntity.badRequest().contentType(MediaType.APPLICATION_JSON).body(errorBody); | ||
| } | ||
|
There was a problem hiding this comment. In these methods, I wanted to use the |
||
|
|
||
| @VisibleForTesting | ||
| List<String> gatherNestedErrorMessages(@NotNull Throwable t, @NotNull List<String> accumulator) { | ||
| if (StringUtils.isNotBlank(t.getMessage())) { | ||
| accumulator.add(t.getMessage()); | ||
| } | ||
| if (t.getCause() == null) { | ||
| return accumulator; | ||
| } | ||
| return gatherNestedErrorMessages(t.getCause(), accumulator); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the ehcache version is managed by Spring Dependency Management, so ideally we'd leave the version number off here. However, it requires the
jakartaclassifier, and we can't specify a classifier without also specifying a version using this syntax, so I left the version in.would work, but results in IntelliJ complaining about the missing version.