honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor FHIRPath to report error locations for run time errors

This commit is contained in:
Grahame Grieve 2020-09-30 12:10:59 +10:00
parent 6407f65353
commit 46d1987cd0
9 changed files with 684 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ExpressionNode.java
View File

@ -34,6 +34,7 @@ package org.hl7.fhir.r4.model;
import java.util.ArrayList;
import java.util.List;
import org.hl7.fhir.utilities.SourceLocation;
import org.hl7.fhir.utilities.Utilities;
public class ExpressionNode {
@ -41,31 +42,6 @@ public class ExpressionNode {
public enum Kind {
Name, Function, Constant, Group, Unary
}
public static class SourceLocation {
private int line;
private int column;
public SourceLocation(int line, int column) {
super();
this.line = line;
this.column = column;
}
public int getLine() {
return line;
}
public int getColumn() {
return column;
}
public void setLine(int line) {
this.line = line;
}
public void setColumn(int column) {
this.column = column;
}
public String toString() {
return Integer.toString(line)+", "+Integer.toString(column);
}
}
public enum Function {
Custom,

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRLexer.java
View File

@ -34,7 +34,7 @@ import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.ExpressionNode;
import org.hl7.fhir.r4.model.ExpressionNode.SourceLocation;
import org.hl7.fhir.utilities.SourceLocation;
import org.hl7.fhir.utilities.Utilities;
// shared lexer for concrete syntaxes

493
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java
View File

File diff suppressed because it is too large Load Diff

25
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java
View File

@ -34,6 +34,7 @@ package org.hl7.fhir.r5.model;
import java.util.ArrayList;
import java.util.List;
import org.hl7.fhir.utilities.SourceLocation;
import org.hl7.fhir.utilities.Utilities;
public class ExpressionNode {
@ -41,31 +42,7 @@ public class ExpressionNode {
public enum Kind {
Name, Function, Constant, Group, Unary
}
public static class SourceLocation {
private int line;
private int column;
public SourceLocation(int line, int column) {
super();
this.line = line;
this.column = column;
}
public int getLine() {
return line;
}
public int getColumn() {
return column;
}
public void setLine(int line) {
this.line = line;
}
public void setColumn(int column) {
this.column = column;
}
public String toString() {
return Integer.toString(line)+", "+Integer.toString(column);
}
}
public enum Function {
Custom,

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRLexer.java
View File

@ -34,7 +34,7 @@ import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.ExpressionNode;
import org.hl7.fhir.r5.model.ExpressionNode.SourceLocation;
import org.hl7.fhir.utilities.SourceLocation;
import org.hl7.fhir.utilities.Utilities;
// shared lexer for concrete syntaxes

696
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

File diff suppressed because it is too large Load Diff

3
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java
View File

@ -176,6 +176,7 @@ public class FHIRPathTests {
node = fp.parse(expression);
Assertions.assertTrue(fail != TestResultType.SYNTAX, String.format("Expected exception didn't occur parsing %s", expression));
} catch (Exception e) {
System.out.println("Parsing Error: "+e.getMessage());
Assertions.assertTrue(fail == TestResultType.SYNTAX, String.format("Unexpected exception parsing %s: " + e.getMessage(), expression));
}
@ -193,6 +194,7 @@ public class FHIRPathTests {
}
Assertions.assertTrue(fail != TestResultType.SEMANTICS, String.format("Expected exception didn't occur checking %s", expression));
} catch (Exception e) {
System.out.println("Checking Error: "+e.getMessage());
Assertions.assertTrue(fail == TestResultType.SEMANTICS, String.format("Unexpected exception checking %s: " + e.getMessage(), expression));
node = null;
}
@ -203,6 +205,7 @@ public class FHIRPathTests {
outcome = fp.evaluate(res, node);
Assertions.assertTrue(fail == TestResultType.OK, String.format("Expected exception didn't occur executing %s", expression));
} catch (Exception e) {
System.out.println("Execution Error: "+e.getMessage());
Assertions.assertTrue(fail == TestResultType.EXECUTION, String.format("Unexpected exception executing %s: " + e.getMessage(), expression));
node = null;
}

59
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/exceptions/PathEngineException.java
View File

@ -1,5 +1,8 @@
package org.hl7.fhir.exceptions;
import org.hl7.fhir.utilities.SourceLocation;
import org.hl7.fhir.utilities.Utilities;
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@ -33,20 +36,62 @@ package org.hl7.fhir.exceptions;
public class PathEngineException extends FHIRException {
private static final long serialVersionUID = 31969342112856390L;
private SourceLocation location;
private String expression;
public PathEngineException() {
super();
}
public PathEngineException(String message, Throwable cause) {
super(message, cause);
}
public PathEngineException(String message, Throwable cause) {
super(message, cause);
}
public PathEngineException(String message) {
super(message);
}
public PathEngineException(String message) {
super(message);
}
public PathEngineException(Throwable cause) {
public PathEngineException(String message, SourceLocation location, String expression, Throwable cause) {
super(message+rep(location, expression), cause);
}
public PathEngineException(String message, SourceLocation location, String expression) {
super(message+rep(location, expression));
}
private static String rep(SourceLocation loc, String expr) {
if (loc != null) {
if (loc.getLine() == 1) {
return " (@char "+loc.getColumn()+")";
} else {
return " (@line "+loc.getLine()+" char "+loc.getColumn()+")";
}
} else if (Utilities.noString(expr)) { // can happen in some contexts...
return " (@~"+expr+")";
} else {
return "";
}
}
public PathEngineException(Throwable cause) {
super(cause);
}
public String getExpression() {
return expression;
}
public void setExpression(String expression) {
this.expression = expression;
}
public SourceLocation getLocation() {
return location;
}
public void setLocation(SourceLocation location) {
this.location = location;
}
}

27
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SourceLocation.java Normal file
View File

@ -0,0 +1,27 @@
package org.hl7.fhir.utilities;
public class SourceLocation {
private int line;
private int column;
public SourceLocation(int line, int column) {
super();
this.line = line;
this.column = column;
}
public int getLine() {
return line;
}
public int getColumn() {
return column;
}
public void setLine(int line) {
this.line = line;
}
public void setColumn(int column) {
this.column = column;
}
public String toString() {
return Integer.toString(line)+", "+Integer.toString(column);
}
}