-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
37 changed files
with
355 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
...c/main/java/org/databiosphere/workspacedataservice/controller/GlobalExceptionHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 { | ||
|
|
||
| private static final String ERROR = "error"; | ||
| private static final String MESSAGE = "message"; | ||
| private static final String PATH = "path"; | ||
| private static final String STATUS = "status"; | ||
| private static 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); | ||
| } | ||
|
|
||
| @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); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
service/src/main/java/org/databiosphere/workspacedataservice/generated/CapabilitiesApi.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...c/main/java/org/databiosphere/workspacedataservice/generated/CapabilitiesServerModel.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...ain/java/org/databiosphere/workspacedataservice/generated/GenericJobAllOfServerModel.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...src/main/java/org/databiosphere/workspacedataservice/generated/GenericJobServerModel.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
service/src/main/java/org/databiosphere/workspacedataservice/generated/ImportApi.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
.../main/java/org/databiosphere/workspacedataservice/generated/ImportRequestServerModel.java
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.