Refactor error message formatting in BadJpqlGrammarErrorListener #4026
+71
−37
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request refactors the error message formatting logic in
BadJpqlGrammarErrorListener
to improve readability, maintainability, and robustness. The main changes involve switching from string concatenation to using aStringBuilder
, introducing a helper method for line extraction, and refining how error messages are constructed for different types of exceptions.Error message formatting improvements:
formatMessage
method to use aStringBuilder
instead of string concatenation, making the code more efficient and easier to read.NoViableAltException
by extracting the relevant line from the query and inserting a marker at the offending character position, using the newgetLineAt
helper method.getLineAt
method to safely retrieve the appropriate line from the query string, handling edge cases where the line number may be out of bounds.InputMismatchException
by clarifying the expected tokens in the output.