| Chunk |
|---|
| Conflicting content |
|---|
return new ErrorResponse(ErrorCode.UNKNOWN_ERROR);
}
<<<<<<< HEAD
@ExceptionHandler(TypeMismatchException.class)
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
protected ErrorResponse handleTypeMismatchException(TypeMismatchException ex) {
return new ErrorResponse(ErrorCode.INVALID_ARGUMENTS);
}
=======
>>>>>>> 8f196667d561350e13d97b44fa2cf63e568a33c9
@ExceptionHandler(IllegalArgumentException.class)
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
protected ErrorResponse handleInvalidArgumentEx(IllegalArgumentException ex) { |
| Solution content |
|---|
return new ErrorResponse(ErrorCode.UNKNOWN_ERROR);
}
@ExceptionHandler(TypeMismatchException.class)
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
protected ErrorResponse handleTypeMismatchException(TypeMismatchException ex) {
return new ErrorResponse(ErrorCode.INVALID_ARGUMENTS);
}
@ExceptionHandler(IllegalArgumentException.class)
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
protected ErrorResponse handleInvalidArgumentEx(IllegalArgumentException ex) {
return new ErrorResponse(ErrorCode.INVALID_ARGUMENTS);
}
@ExceptionHandler(IllegalArgumentException.class)
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
protected ErrorResponse handleInvalidArgumentEx(IllegalArgumentException ex) { |
| File |
|---|
| BaseCtrl.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |