Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Solidify-Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Solidify
Solidify-Backend
Commits
a203842a
Commit
a203842a
authored
1 year ago
by
Homada.Boumedane
Committed by
Hugues.Cazeaux
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
feat: improve controller advice to support 'ResponseStatusException'
parent
2ce79a0d
No related branches found
No related tags found
1 merge request
!418
feat: improve controller advice to support 'ResponseStatusException'
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
solidify-controller/src/main/java/ch/unige/solidify/controller/SolidifyControllerAdvice.java
+15
-3
15 additions, 3 deletions
...h/unige/solidify/controller/SolidifyControllerAdvice.java
with
15 additions
and
3 deletions
solidify-controller/src/main/java/ch/unige/solidify/controller/SolidifyControllerAdvice.java
+
15
−
3
View file @
a203842a
...
...
@@ -28,9 +28,6 @@ import static ch.unige.solidify.controller.SolidifyControllerAdvice.StackTraceDi
import
java.util.NoSuchElementException
;
import
jakarta.servlet.ServletException
;
import
jakarta.servlet.http.HttpServletRequest
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.boot.web.servlet.error.ErrorAttributes
;
...
...
@@ -55,11 +52,14 @@ import org.springframework.web.client.HttpClientErrorException;
import
org.springframework.web.method.annotation.MethodArgumentTypeMismatchException
;
import
org.springframework.web.multipart.MultipartException
;
import
org.springframework.web.multipart.support.MissingServletRequestPartException
;
import
org.springframework.web.server.ResponseStatusException
;
import
org.springframework.web.servlet.resource.NoResourceFoundException
;
import
com.fasterxml.jackson.core.JsonParseException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
jakarta.servlet.ServletException
;
import
jakarta.servlet.http.HttpServletRequest
;
import
ch.unige.solidify.config.SolidifyProperties
;
import
ch.unige.solidify.exception.SolidifyBulkActionException
;
...
...
@@ -284,6 +284,18 @@ public class SolidifyControllerAdvice {
return
this
.
buildResponse
(
exception
,
request
,
"MFA needed"
,
HttpStatus
.
UNAUTHORIZED
,
WITHOUT_STACK_TRACE
);
}
/**
* Use to catch ResponseStatusException and build response based on it's params
*
* @param ex
* @param request
* @return
*/
@ExceptionHandler
(
ResponseStatusException
.
class
)
public
ResponseEntity
<
SolidifyError
>
handleResponseStatusException
(
ResponseStatusException
ex
,
HttpServletRequest
request
)
{
return
this
.
buildResponse
(
ex
,
request
,
ex
.
getReason
(),
ex
.
getStatusCode
(),
WITHOUT_STACK_TRACE
);
}
protected
ResponseEntity
<
SolidifyError
>
buildBadRequestResponse
(
Exception
exception
,
HttpServletRequest
request
,
SolidifyError
solidifyError
)
{
this
.
logException
(
exception
,
request
,
this
.
badRequestStacktrace
);
this
.
logErrorAsJson
(
solidifyError
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment