Bugfix: APathToXPathConverter always put assignment before literals #594
Conversation
This file contains 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
…would get an assignment before the literal, even if the assignment would be in the provided query. Also add tests for APathToXPathConverter.java with fixed scenarios.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #594 +/- ##
============================================
+ Coverage 71.76% 71.79% +0.03%
- Complexity 6948 6953 +5
============================================
Files 663 663
Lines 22691 22691
Branches 3674 3675 +1
============================================
+ Hits 16284 16292 +8
+ Misses 4670 4666 -4
+ Partials 1737 1733 -4 ☔ View full report in Codecov by Sentry. |
MattijsK
approved these changes
Apr 22, 2024
| public class APathToXPathConverterTest { | ||
|
|
||
| @Test | ||
| public void rootPath() throws Exception { |
There was a problem hiding this comment.
Suggested change
| public void rootPath() throws Exception { | |
| public void rootPath() { |
| @@ -113,52 +107,50 @@ public static String convertWithAntlr(String query) { | |||
| */ | |||
| private static void writeTree(StringBuilder output, ParseTree tree, boolean inPredicate) { | |||
|
|
|||
|
|
|||
| for(int i = 0; i < tree.getChildCount(); i++) { | |||
| for (int i = 0; i < tree.getChildCount(); i++) { | |||
There was a problem hiding this comment.
This is inconsistent with the rest of the file currently, so reformat on the full file please :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When converting a query path to a
XPath, inAPathToXPathConverter.writeTreethe output would always get an assignment before a literal, independent if it would already be provided in the query itself.For example, when query:
items[id5], this would becomeitems[\@archetype_node_id = 'id5']butitems[\@archetype_node_id='id5'] would becomeitems[@archetype_node_id = @archetype_node_id = 'id5']Fixed this by setting theinPredicateboolean to false whenever encountering aEqualExprContext` with more than 3 children (being an indication it has format with predefined assignment).