Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: APathToXPathConverter always put assignment before literals #594

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Bugfix: APathToXPathConverter always put assignment before literals #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc810ed
Fix bug where any equalityExpr with more than 2 children in XPath.g4 …
EBrader Apr 19, 2024
47ff7fb
Minor fixes
EBrader Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 22 additions & 73 deletions tools/src/main/java/com/nedap/archie/query/APathToXPathConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
import com.google.common.collect.ImmutableSet;
import com.nedap.archie.adlparser.antlr.XPathLexer;
import com.nedap.archie.adlparser.antlr.XPathParser;
import com.nedap.archie.adlparser.antlr.XPathParser.AndExprContext;
import com.nedap.archie.adlparser.antlr.XPathParser.FilterExprContext;
import com.nedap.archie.adlparser.antlr.XPathParser.MainContext;
import com.nedap.archie.adlparser.antlr.XPathParser.PredicateContext;
import com.nedap.archie.adlparser.antlr.XPathParser.RelativeLocationPathContext;
import com.nedap.archie.adlparser.antlr.XPathParser.*;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.tree.ParseTree;
Expand All @@ -19,7 +15,7 @@

/**
* Converts an APath to an XPath-query
*
* <p>
* Created by pieter.bos on 11/05/16.
*/
public class APathToXPathConverter {
Expand All @@ -33,11 +29,11 @@ public class APathToXPathConverter {

public static String convertQueryToXPath(String query, String firstNodeName) {
String convertedQuery = convertWithAntlr(query);
if(convertedQuery.equals("/")) {
if (convertedQuery.equals("/")) {
return "/" + firstNodeName;
} else if(query.startsWith("//")) {
} else if (query.startsWith("//")) {
return convertedQuery;
} else if(query.startsWith("/")) {
} else if (query.startsWith("/")) {
return "/" + firstNodeName + convertedQuery;
} else {
return convertedQuery;
Expand All @@ -47,8 +43,6 @@ public static String convertQueryToXPath(String query, String firstNodeName) {


public static String convertWithAntlr(String query) {


XPathLexer lexer = new XPathLexer(CharStreams.fromString(query));
XPathParser parser = new XPathParser(new CommonTokenStream(lexer));
MainContext mainCtx = parser.main();
Expand All @@ -58,107 +52,62 @@ public static String convertWithAntlr(String query) {

}

// public static void handleOrExpression(StringBuilder output, OrExprContext orExprContext) {
// boolean firstAndExpr= true;
// for(AndExprContext andExprContext:orExprContext.andExpr()) {
// if(!firstAndExpr) {
// output.append(" or ");
// }
// handleAndExpression(output, andExprContext);
// firstAndExpr = false;
// }
// }
//
// public static void handleAndExpression(StringBuilder output, AndExprContext andExprContext) {
// boolean firstEqualityExpr = true;
// for(EqualityExprContext equalityExprContext:andExprContext.equalityExpr()) {
// if(!firstEqualityExpr) {
// output.append(" and ");
// }
// handleEqualityExpression(output, equalityExprContext);
// firstEqualityExpr = false;
// }
// }
//
// private static void handleEqualityExpression(StringBuilder output, EqualityExprContext equalityExprContext) {
// for(int i = 0; i < equalityExprContext.getChildCount(); i++) {
// ParseTree child = equalityExprContext.getChild(i);
// if(child instanceof RelationalExprContext) {
// handleRelationalExpression(output, (RelationalExprContext) child);
// } else {
// output.append(child.getText());
// }
// }
// }
//
// private static void handleRelationalExpression(StringBuilder output, RelationalExprContext relationalExpContext) {
// for(int i = 0; i < relationalExpContext.getChildCount(); i++) {
// ParseTree child = relationalExpContext.getChild(i);
// if(child instanceof AdditiveExprContext) {
// //handleAdditiveExprContext(output, (AdditiveExprContext) child);
// } else {
// output.append(child.getText());
// }
// }
// }

/**
* Converts and ANTLR ParseTree of the XPath grammar to APath String output
* Adds the output to the given StringBuilder.
*
* <p>
* Simple approach that writes every element, adding some whitespace where needed, and converting just a few elements
* @param output the output to write to
* @param tree the parse tree
*
* @param output the output to write to
* @param tree the parse tree
* @param inPredicate whether we are inside or outside a predicate
*/
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++) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is inconsistent with the rest of the file currently, so reformat on the full file please :)

ParseTree child = tree.getChild(i);
if(child instanceof TerminalNode) {
if (child instanceof TerminalNode) {
boolean shouldAppendSpace = literalsThatShouldHaveSpacing.contains(child.getText().toLowerCase());
if(shouldAppendSpace) {
if (shouldAppendSpace) {
output.append(" ");
}
output.append(child.getText());
if(shouldAppendSpace) {
if (shouldAppendSpace) {
output.append(" ");
}
} else if (child instanceof AndExprContext) {
for(int j = 0; j < child.getChildCount(); j++) {
for (int j = 0; j < child.getChildCount(); j++) {
ParseTree andChild = child.getChild(j);
if(andChild instanceof TerminalNode) {
if (andChild instanceof TerminalNode) {
output.append(" and "); //this rewrites the "," syntax that is equivalent to 'and'
} else {
writeTree(output, andChild, inPredicate);
writeTree(output, andChild, andChild.getChildCount() < 3);
}
}

} else if (child instanceof PredicateContext) {
writeTree(output, child, true);
} else if(inPredicate && child instanceof RelativeLocationPathContext) {
} else if (inPredicate && child instanceof RelativeLocationPathContext) {
Matcher idCodeMatcher = idCodePattern.matcher(child.getText());

if (idCodeMatcher.matches()) {
output.append("@archetype_node_id = '");
output.append(child.getText());
output.append("'");
} else {
writeTree(output, child, inPredicate);
writeTree(output, child, true);
}
} else if(inPredicate && child instanceof FilterExprContext) {
} else if (inPredicate && child instanceof FilterExprContext) {
FilterExprContext filterExprContext = (FilterExprContext) child;
//not sure if we should support [id5, 1]. This is not standard xpath!
Matcher numberMatcher = numberPattern.matcher(child.getText());
if(numberMatcher.matches()) {
if (numberMatcher.matches()) {
output.append("position() = ");
output.append(child.getText());
} else if(filterExprContext.primaryExpr().Literal() != null) {
} else if (filterExprContext.primaryExpr().Literal() != null) {
output.append("name/value = ");
output.append(child.getText());
} else {
writeTree(output, child, inPredicate);
writeTree(output, child, true);
}
} else {
writeTree(output, child, inPredicate);
Expand Down
39 changes: 39 additions & 0 deletions tools/src/test/java/com/nedap/archie/query/APathToXPathConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.nedap.archie.query;

import org.junit.Test;

import static org.junit.Assert.assertEquals;

public class APathToXPathConverterTest {

@Test
public void rootPath() {
assertConvertedQuery("/composition", "/");
assertConvertedQuery("//", "//");
}

@Test
public void relativePath() {
assertConvertedQuery(
"/composition/content/data[@archetype_node_id = 'id2']/events[@archetype_node_id = 'id3' and name/value = 'literal']" +
"/items[@archetype_node_id = 'id4' or @archetype_node_id = 'id5' and name/value = 'literal' and name/value = 'other']",
"/content/data[id2]/events[id3, 'literal']/items[id4 or id5, 'literal' and 'other']");
}

@Test
public void absolutePath() {
assertConvertedQuery("/composition/content/data[@archetype_node_id=id2]/events[@archetype_node_id = 'id3' and items/value/value='literal']" +
"/items[@name='id4' or @archetype_node_id = 'id5' and name/value = 'literal' and name/value='other']",
"/content/data[@archetype_node_id=id2]/events[id3, items/value/value='literal']/items[@name='id4' or id5, 'literal' and name/value='other']");
}

@Test
public void indexedPath() {
assertConvertedQuery("/composition/content/data[@archetype_node_id = 'id5.1' and position() = 1]/items[@archetype_node_id='id6.0.1' and position() = 42]",
"/content/data[id5.1,1]/items[@archetype_node_id='id6.0.1', 42]");
}

private void assertConvertedQuery(String expected, String query) {
assertEquals(expected, APathToXPathConverter.convertQueryToXPath(query, "composition"));
}
}