SQL: Fix merging error in test class #68776
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The upstream master merge applied a few Arrays.asList to onen class, RestSqlTestCase; the method has been statically imported in previous PR in the branch (and class Arrays import removed), since `asList` is used up to four times on a line, in some tests. This adjusts the merged in code.
bpintea
added
:Analytics/SQL
Collaborator
|
Pinging @elastic/es-ql (Team:QL) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The upstream master merge applied a few
Arrays#asListto one test class,RestSqlTestCase; the method has been statically imported in previous PRin the branch (and Arrays class import removed), since
asListis usedup to four times on one line, in some tests.
This adjusts the automatically merged in code, changing it to use the static
import.