|
|
@ -17,7 +17,6 @@ import ru.ulstu.user.error.UserIdExistsException;
|
|
|
|
import ru.ulstu.user.error.UserIsUndeadException;
|
|
|
|
import ru.ulstu.user.error.UserIsUndeadException;
|
|
|
|
import ru.ulstu.user.error.UserLoginExistsException;
|
|
|
|
import ru.ulstu.user.error.UserLoginExistsException;
|
|
|
|
import ru.ulstu.user.error.UserNotActivatedException;
|
|
|
|
import ru.ulstu.user.error.UserNotActivatedException;
|
|
|
|
import ru.ulstu.user.error.UserNotFoundException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
|
|
|
|
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
|
|
|
|
import ru.ulstu.user.error.UserResetKeyError;
|
|
|
|
import ru.ulstu.user.error.UserResetKeyError;
|
|
|
|
import ru.ulstu.user.error.UserSendingMailException;
|
|
|
|
import ru.ulstu.user.error.UserSendingMailException;
|
|
|
@ -94,10 +93,10 @@ public class AdviceController {
|
|
|
|
return handleException(ErrorConstants.USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH);
|
|
|
|
return handleException(ErrorConstants.USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ExceptionHandler(UserNotFoundException.class)
|
|
|
|
// @ExceptionHandler(UserNotFoundException.class)
|
|
|
|
public ResponseExtended<String> handleUserNotFoundException(Throwable e) {
|
|
|
|
// public ResponseExtended<String> handleUserNotFoundException(Throwable e) {
|
|
|
|
return handleException(ErrorConstants.USER_NOT_FOUND, e.getMessage());
|
|
|
|
// return handleException(ErrorConstants.USER_NOT_FOUND, e.getMessage());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
@ExceptionHandler(UserNotActivatedException.class)
|
|
|
|
@ExceptionHandler(UserNotActivatedException.class)
|
|
|
|
public Response<Void> handleUserNotActivatedException(Throwable e) {
|
|
|
|
public Response<Void> handleUserNotActivatedException(Throwable e) {
|
|
|
|