Skip to content

Commit 45cb730

Browse files
author
Anton Hrytsenko
committed
Resolve maintenance issues.
1 parent dc8d9fe commit 45cb730

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main/java/com/github/hrytsenko/jsondata/springboot/error/ExceptionAdvice.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,48 +34,48 @@ class ExceptionAdvice {
3434
CorrelationSource correlationSource;
3535

3636
@ExceptionHandler(Exception.class)
37-
ResponseEntity<?> onUnexpectedError(Exception exception) {
37+
ResponseEntity<JsonBean> onUnexpectedError(Exception exception) {
3838
log.error("Unexpected error", exception);
3939
return errorResponse(HttpStatus.INTERNAL_SERVER_ERROR, "INTERNAL_ERROR");
4040
}
4141

4242
@ExceptionHandler(ServiceException.BadRequest.class)
43-
ResponseEntity<?> onBadRequest(ServiceException.BadRequest exception) {
43+
ResponseEntity<JsonBean> onBadRequest(ServiceException.BadRequest exception) {
4444
log.error("Bad request", exception);
4545
return errorResponse(HttpStatus.BAD_REQUEST, exception.getCode());
4646
}
4747

4848
@ExceptionHandler(ServiceException.Unauthorized.class)
49-
ResponseEntity<?> onUnauthorized(ServiceException.Unauthorized exception) {
49+
ResponseEntity<JsonBean> onUnauthorized(ServiceException.Unauthorized exception) {
5050
log.error("Unauthorized", exception);
5151
return errorResponse(HttpStatus.UNAUTHORIZED, exception.getCode());
5252
}
5353

5454
@ExceptionHandler(ServiceException.Forbidden.class)
55-
ResponseEntity<?> onForbidden(ServiceException.Forbidden exception) {
55+
ResponseEntity<JsonBean> onForbidden(ServiceException.Forbidden exception) {
5656
log.error("Forbidden", exception);
5757
return errorResponse(HttpStatus.FORBIDDEN, exception.getCode());
5858
}
5959

6060
@ExceptionHandler(ServiceException.NotFound.class)
61-
ResponseEntity<?> onNotFound(ServiceException.NotFound exception) {
61+
ResponseEntity<JsonBean> onNotFound(ServiceException.NotFound exception) {
6262
log.error("Not found", exception);
6363
return errorResponse(HttpStatus.NOT_FOUND, exception.getCode());
6464
}
6565

6666
@ExceptionHandler(ServiceException.InternalError.class)
67-
ResponseEntity<?> onInternalError(ServiceException.InternalError exception) {
67+
ResponseEntity<JsonBean> onInternalError(ServiceException.InternalError exception) {
6868
log.error("Internal error", exception);
6969
return errorResponse(HttpStatus.INTERNAL_SERVER_ERROR, exception.getCode());
7070
}
7171

7272
@ExceptionHandler(ServiceException.ServiceUnavailable.class)
73-
ResponseEntity<?> onServiceUnavailable(ServiceException.ServiceUnavailable exception) {
73+
ResponseEntity<JsonBean> onServiceUnavailable(ServiceException.ServiceUnavailable exception) {
7474
log.error("Service unavailable", exception);
7575
return errorResponse(HttpStatus.SERVICE_UNAVAILABLE, exception.getCode());
7676
}
7777

78-
private ResponseEntity<?> errorResponse(HttpStatus status, String code) {
78+
private ResponseEntity<JsonBean> errorResponse(HttpStatus status, String code) {
7979
return ResponseEntity.status(status)
8080
.contentType(MediaType.APPLICATION_JSON)
8181
.body(new JsonBean()

0 commit comments

Comments
 (0)