Browse Source

Refactor controller exceptions handling

pull/6235/head
Viacheslav Klimov 4 years ago
parent
commit
472edc8409
  1. 8
      application/src/main/java/org/thingsboard/server/controller/BaseController.java
  2. 1
      dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java

8
application/src/main/java/org/thingsboard/server/controller/BaseController.java

@ -285,7 +285,13 @@ public abstract class BaseController {
@ExceptionHandler(Exception.class)
public void handleControllerException(Exception e, HttpServletResponse response) {
ThingsboardException thingsboardException = handleException(e);
handleThingsboardException(thingsboardException, response);
if (thingsboardException.getErrorCode() == ThingsboardErrorCode.GENERAL && thingsboardException.getCause() instanceof Exception
&& StringUtils.equals(thingsboardException.getCause().getMessage(), thingsboardException.getMessage())) {
e = (Exception) thingsboardException.getCause();
} else {
e = thingsboardException;
}
errorResponseHandler.handle(e, response);
}
@ExceptionHandler(ThingsboardException.class)

1
dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java

@ -25,7 +25,6 @@ import org.thingsboard.server.dao.exception.DataValidationException;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.ValidationException;
import javax.validation.Validator;
import java.util.List;
import java.util.Set;

Loading…
Cancel
Save