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

update R4 and R4B FHIRPath implementations for changes picked up in R5 usage

This commit is contained in:
Grahame Grieve 2023-07-21 14:09:11 +10:00
parent d8e2e020af
commit 8cf086b203
12 changed files with 293 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java
View File

@ -325,6 +325,40 @@ public class Element extends Base {
}
}
@Override
public Base copy() {
Element element = new Element(this);
this.copyValues(element);
return element;
}
@Override
public void copyValues(Base dst) {
super.copyValues(dst);
Element dest = (Element) dst;
if (comments != null) {
dest.comments = new ArrayList<>();
dest.comments.addAll(comments);
} else {
dest.comments = null;
}
dest.value = value;
if (children != null) {
dest.children = new ArrayList<>();
for (Element child : children) {
dest.children.add((Element) child.copy());
}
} else {
dest.children = null;
}
dest.line = line;
dest.col = col;
dest.xhtml = xhtml;
dest.explicitType = explicitType;
}
@Override
public Base setProperty(int hash, String name, Base value) throws FHIRException {
if ("xhtml".equals(getType()) && (hash == "value".hashCode())) {

7
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Base.java
View File

@ -1032,4 +1032,11 @@ private Map<String, Object> userData;
return null;
}
public abstract Base copy();
public void copyValues(Base dst) {
}
}

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

@ -55,7 +55,7 @@ public class ExpressionNode {
Encode, Decode, Escape, Unescape, Trim, Split, Join, LowBoundary, HighBoundary, Precision,
// Local extensions to FHIRPath
HtmlChecks1, HtmlChecks2, AliasAs, Alias;
HtmlChecks1, HtmlChecks2, AliasAs, Alias, Comparable;
public static Function fromCode(String name) {
if (name.equals("empty")) return Function.Empty;
@ -117,6 +117,7 @@ public class ExpressionNode {
if (name.equals("htmlChecks")) return Function.HtmlChecks1;
if (name.equals("htmlchecks")) return Function.HtmlChecks1; // support change of care from R3
if (name.equals("htmlChecks2")) return Function.HtmlChecks2;
if (name.equals("comparable")) return Function.Comparable;
if (name.equals("encode")) return Function.Encode;
if (name.equals("decode")) return Function.Decode;
if (name.equals("escape")) return Function.Escape;
@ -225,6 +226,7 @@ public class ExpressionNode {
case Join : return "join";
case HtmlChecks1 : return "htmlChecks";
case HtmlChecks2 : return "htmlChecks2";
case Comparable : return "comparable";
case OfType : return "ofType";
case Type : return "type";
case ToInteger : return "toInteger";

6
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Tuple.java
View File

@ -80,5 +80,11 @@ public class Tuple extends Base {
return getProperty(name.hashCode(), name, checkValid);
}
@Override
public Base copy() {
Tuple tuple = new Tuple();
copyValues(tuple);
return tuple;
}
}

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

@ -145,6 +145,12 @@ public class FHIRPathEngine {
public String primitiveValue() {
return value;
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
private class ClassTypeInfo extends Base {
@ -203,6 +209,12 @@ public class FHIRPathEngine {
return instance.fhirType();
}
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
public static class TypedElementDefinition {
@ -1404,6 +1416,7 @@ public class FHIRPathEngine {
case Join: return checkParamCount(lexer, location, exp, 1);
case HtmlChecks1: return checkParamCount(lexer, location, exp, 0);
case HtmlChecks2: return checkParamCount(lexer, location, exp, 0);
case Comparable: return checkParamCount(lexer, location, exp, 1);
case ToInteger: return checkParamCount(lexer, location, exp, 0);
case ToDecimal: return checkParamCount(lexer, location, exp, 0);
case ToString: return checkParamCount(lexer, location, exp, 0);
@ -3336,6 +3349,8 @@ public class FHIRPathEngine {
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case HtmlChecks2 :
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case Comparable :
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case Alias :
checkParamTypes(exp, exp.getFunction().toCode(), paramTypes, new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_String));
return anything(CollectionStatus.SINGLETON);
@ -3552,7 +3567,7 @@ public class FHIRPathEngine {
}
private void checkContextContinuous(TypeDetails focus, String name, ExpressionNode expr) throws PathEngineException {
if (!focus.hasNoTypes() && !focus.hasType("decimal") && !focus.hasType("date") && !focus.hasType("dateTime") && !focus.hasType("time")) {
if (!focus.hasNoTypes() && !focus.hasType("decimal") && !focus.hasType("date") && !focus.hasType("dateTime") && !focus.hasType("time") && !focus.hasType("Quantity")) {
throw makeException(expr, I18nConstants.FHIRPATH_CONTINUOUS_ONLY, name, focus.describe());
}
}
@ -3642,6 +3657,7 @@ public class FHIRPathEngine {
case Alias : return funcAlias(context, focus, exp);
case HtmlChecks1 : return funcHtmlChecks1(context, focus, exp);
case HtmlChecks2 : return funcHtmlChecks2(context, focus, exp);
case Comparable : return funcComparable(context, focus, exp);
case ToInteger : return funcToInteger(context, focus, exp);
case ToDecimal : return funcToDecimal(context, focus, exp);
case ToString : return funcToString(context, focus, exp);
@ -3879,9 +3895,12 @@ public class FHIRPathEngine {
}
return result;
}
private List<Base> funcLowBoundary(ExecutionContext context, List<Base> focus, ExpressionNode expr) {
if (focus.size() != 1) {
if (focus.size() == 0) {
return makeNull();
}
if (focus.size() > 1) {
throw makeExceptionPlural(focus.size(), expr, I18nConstants.FHIRPATH_FOCUS, "lowBoundary", focus.size());
}
int precision = 0;
@ -3904,6 +3923,11 @@ public class FHIRPathEngine {
result.add(new DateTimeType(Utilities.lowBoundaryForDate(base.primitiveValue(), precision == 0 ? 17 : precision)));
} else if (base.hasType("time")) {
result.add(new TimeType(Utilities.lowBoundaryForTime(base.primitiveValue(), precision == 0 ? 9 : precision)));
} else if (base.hasType("Quantity")) {
String value = getNamedValue(base, "value");
Base v = base.copy();
v.setProperty("value", new DecimalType(Utilities.lowBoundaryForDecimal(value, precision == 0 ? 8 : precision)));
result.add(v);
} else {
makeException(expr, I18nConstants.FHIRPATH_WRONG_PARAM_TYPE, "sqrt", "(focus)", base.fhirType(), "decimal or date");
}
@ -3911,7 +3935,10 @@ public class FHIRPathEngine {
}
private List<Base> funcHighBoundary(ExecutionContext context, List<Base> focus, ExpressionNode expr) {
if (focus.size() != 1) {
if (focus.size() == 0) {
return makeNull();
}
if (focus.size() > 1) {
throw makeExceptionPlural(focus.size(), expr, I18nConstants.FHIRPATH_FOCUS, "highBoundary", focus.size());
}
int precision = 0;
@ -3934,6 +3961,11 @@ public class FHIRPathEngine {
result.add(new DateTimeType(Utilities.highBoundaryForDate(base.primitiveValue(), precision == 0 ? 17 : precision)));
} else if (base.hasType("time")) {
result.add(new TimeType(Utilities.highBoundaryForTime(base.primitiveValue(), precision == 0 ? 9 : precision)));
} else if (base.hasType("Quantity")) {
String value = getNamedValue(base, "value");
Base v = base.copy();
v.setProperty("value", new DecimalType(Utilities.highBoundaryForDecimal(value, precision == 0 ? 8 : precision)));
result.add(v);
} else {
makeException(expr, I18nConstants.FHIRPATH_WRONG_PARAM_TYPE, "sqrt", "(focus)", base.fhirType(), "decimal or date");
}
@ -4094,7 +4126,8 @@ public class FHIRPathEngine {
List<Base> result = new ArrayList<Base>();
if (focus.size() == 1) {
String cnt = focus.get(0).primitiveValue();
for (String s : cnt.split(param)) {
String[] sl = Pattern.compile(param, Pattern.LITERAL).split(cnt);
for (String s : sl) {
result.add(new StringType(s));
}
}
@ -4104,9 +4137,14 @@ public class FHIRPathEngine {
private List<Base> funcJoin(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
List<Base> nl = execute(context, focus, exp.getParameters().get(0), true);
String param = nl.get(0).primitiveValue();
String param2 = param;
if (exp.getParameters().size() == 2) {
nl = execute(context, focus, exp.getParameters().get(1), true);
param2 = nl.get(0).primitiveValue();
}
List<Base> result = new ArrayList<Base>();
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(param);
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(param, param2);
for (Base i : focus) {
b.append(i.primitiveValue());
}
@ -4168,6 +4206,47 @@ public class FHIRPathEngine {
return false;
}
private List<Base> funcComparable(ExecutionContext context, List<Base> focus, ExpressionNode exp) throws FHIRException {
if (focus.size() != 1 || !(focus.get(0).fhirType().equals("Quantity"))) {
return makeBoolean(false);
}
List<Base> nl = execute(context, focus, exp.getParameters().get(0), true);
if (nl.size() != 1 || !(nl.get(0).fhirType().equals("Quantity"))) {
return makeBoolean(false);
}
String s1 = getNamedValue(focus.get(0), "system");
String u1 = getNamedValue(focus.get(0), "code");
String s2 = getNamedValue(nl.get(0), "system");
String u2 = getNamedValue(nl.get(0), "code");
if (s1 == null || s2 == null || !s1.equals(s2)) {
return makeBoolean(false);
}
if (u1 == null || u2 == null) {
return makeBoolean(false);
}
if (u1.equals(u2)) {
return makeBoolean(true);
}
if (s1.equals("http://unitsofmeasure.org") && worker.getUcumService() != null) {
try {
return makeBoolean(worker.getUcumService().isComparable(u1, u2));
} catch (UcumException e) {
return makeBoolean(false);
}
} else {
return makeBoolean(false);
}
}
private String getNamedValue(Base base, String name) {
Property p = base.getChildByName(name);
if (p.hasValues() && p.getValues().size() == 1) {
return p.getValues().get(0).primitiveValue();
}
return null;
}
private boolean checkHtmlNames(XhtmlNode node) {
if (node.getNodeType() == NodeType.Comment) {

11
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/GraphQLEngine.java
View File

@ -746,6 +746,12 @@ public class GraphQLEngine implements IGraphQLEngine {
return super.getNamedProperty(_hash, _name, _checkValid);
}
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
public static class SearchWrapper extends Base {
@ -844,6 +850,11 @@ public class GraphQLEngine implements IGraphQLEngine {
return null;
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}

39
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Element.java
View File

@ -343,6 +343,45 @@ public class Element extends Base {
}
}
@Override
public Base copy() {
Element element = new Element(this);
this.copyValues(element);
return element;
}
@Override
public void copyValues(Base dst) {
super.copyValues(dst);
Element dest = (Element) dst;
if (comments != null) {
dest.comments = new ArrayList<>();
dest.comments.addAll(comments);
} else {
dest.comments = null;
}
dest.value = value;
if (children != null) {
dest.children = new ArrayList<>();
for (Element child : children) {
dest.children.add((Element) child.copy());
}
} else {
dest.children = null;
}
dest.line = line;
dest.col = col;
dest.xhtml = xhtml;
dest.explicitType = explicitType;
dest.hasParentForValidator = false;
dest.path = path;
dest.messages = null;
dest.prohibited = prohibited;
dest.required = required;
}
@Override
public Base setProperty(int hash, String name, Base value) throws FHIRException {
if ("xhtml".equals(getType()) && (hash == "value".hashCode())) {

2
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Base.java
View File

@ -339,6 +339,8 @@ private Map<String, Object> userData;
return null;
}
public abstract Base copy();
public void copyValues(Base dst) {
}

4
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExpressionNode.java
View File

@ -56,7 +56,7 @@ public class ExpressionNode {
Encode, Decode, Escape, Unescape, Trim, Split, Join, LowBoundary, HighBoundary, Precision,
// Local extensions to FHIRPath
HtmlChecks1, HtmlChecks2, AliasAs, Alias;
HtmlChecks1, HtmlChecks2, AliasAs, Alias, Comparable;
public static Function fromCode(String name) {
if (name.equals("empty")) return Function.Empty;
@ -118,6 +118,7 @@ public class ExpressionNode {
if (name.equals("htmlChecks")) return Function.HtmlChecks1;
if (name.equals("htmlchecks")) return Function.HtmlChecks1; // support change of care from R3
if (name.equals("htmlChecks2")) return Function.HtmlChecks2;
if (name.equals("comparable")) return Function.Comparable;
if (name.equals("encode")) return Function.Encode;
if (name.equals("decode")) return Function.Decode;
if (name.equals("escape")) return Function.Escape;
@ -226,6 +227,7 @@ public class ExpressionNode {
case Join : return "join";
case HtmlChecks1 : return "htmlChecks";
case HtmlChecks2 : return "htmlChecks2";
case Comparable : return "comparable";
case OfType : return "ofType";
case Type : return "type";
case ToInteger : return "toInteger";

6
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Tuple.java
View File

@ -98,5 +98,11 @@ public class Tuple extends Base {
return getProperty(name.hashCode(), name, checkValid);
}
@Override
public Base copy() {
Tuple tuple = new Tuple();
copyValues(tuple);
return tuple;
}
}

89
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/FHIRPathEngine.java
View File

@ -146,6 +146,11 @@ public class FHIRPathEngine {
public String primitiveValue() {
return value;
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
private class ClassTypeInfo extends Base {
@ -204,6 +209,12 @@ public class FHIRPathEngine {
return instance.fhirType();
}
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
public static class TypedElementDefinition {
@ -1400,6 +1411,7 @@ public class FHIRPathEngine {
case Join: return checkParamCount(lexer, location, exp, 1);
case HtmlChecks1: return checkParamCount(lexer, location, exp, 0);
case HtmlChecks2: return checkParamCount(lexer, location, exp, 0);
case Comparable: return checkParamCount(lexer, location, exp, 1);
case ToInteger: return checkParamCount(lexer, location, exp, 0);
case ToDecimal: return checkParamCount(lexer, location, exp, 0);
case ToString: return checkParamCount(lexer, location, exp, 0);
@ -3332,6 +3344,8 @@ public class FHIRPathEngine {
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case HtmlChecks2 :
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case Comparable :
return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Boolean);
case Alias :
checkParamTypes(exp, exp.getFunction().toCode(), paramTypes, new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_String));
return anything(CollectionStatus.SINGLETON);
@ -3548,7 +3562,7 @@ public class FHIRPathEngine {
}
private void checkContextContinuous(TypeDetails focus, String name, ExpressionNode expr) throws PathEngineException {
if (!focus.hasNoTypes() && !focus.hasType("decimal") && !focus.hasType("date") && !focus.hasType("dateTime") && !focus.hasType("time")) {
if (!focus.hasNoTypes() && !focus.hasType("decimal") && !focus.hasType("date") && !focus.hasType("dateTime") && !focus.hasType("time") && !focus.hasType("Quantity")) {
throw makeException(expr, I18nConstants.FHIRPATH_CONTINUOUS_ONLY, name, focus.describe());
}
}
@ -3638,6 +3652,7 @@ public class FHIRPathEngine {
case Alias : return funcAlias(context, focus, exp);
case HtmlChecks1 : return funcHtmlChecks1(context, focus, exp);
case HtmlChecks2 : return funcHtmlChecks2(context, focus, exp);
case Comparable : return funcComparable(context, focus, exp);
case ToInteger : return funcToInteger(context, focus, exp);
case ToDecimal : return funcToDecimal(context, focus, exp);
case ToString : return funcToString(context, focus, exp);
@ -3876,8 +3891,19 @@ public class FHIRPathEngine {
return result;
}
private String getNamedValue(Base base, String name) {
Property p = base.getChildByName(name);
if (p.hasValues() && p.getValues().size() == 1) {
return p.getValues().get(0).primitiveValue();
}
return null;
}
private List<Base> funcLowBoundary(ExecutionContext context, List<Base> focus, ExpressionNode expr) {
if (focus.size() != 1) {
if (focus.size() == 0) {
return makeNull();
}
if (focus.size() > 1) {
throw makeExceptionPlural(focus.size(), expr, I18nConstants.FHIRPATH_FOCUS, "lowBoundary", focus.size());
}
int precision = 0;
@ -3900,6 +3926,11 @@ public class FHIRPathEngine {
result.add(new DateTimeType(Utilities.lowBoundaryForDate(base.primitiveValue(), precision == 0 ? 17 : precision)));
} else if (base.hasType("time")) {
result.add(new TimeType(Utilities.lowBoundaryForTime(base.primitiveValue(), precision == 0 ? 9 : precision)));
} else if (base.hasType("Quantity")) {
String value = getNamedValue(base, "value");
Base v = base.copy();
v.setProperty("value", new DecimalType(Utilities.lowBoundaryForDecimal(value, precision == 0 ? 8 : precision)));
result.add(v);
} else {
makeException(expr, I18nConstants.FHIRPATH_WRONG_PARAM_TYPE, "sqrt", "(focus)", base.fhirType(), "decimal or date");
}
@ -3907,7 +3938,10 @@ public class FHIRPathEngine {
}
private List<Base> funcHighBoundary(ExecutionContext context, List<Base> focus, ExpressionNode expr) {
if (focus.size() != 1) {
if (focus.size() == 0) {
return makeNull();
}
if (focus.size() > 1) {
throw makeExceptionPlural(focus.size(), expr, I18nConstants.FHIRPATH_FOCUS, "highBoundary", focus.size());
}
int precision = 0;
@ -3930,6 +3964,11 @@ public class FHIRPathEngine {
result.add(new DateTimeType(Utilities.highBoundaryForDate(base.primitiveValue(), precision == 0 ? 17 : precision)));
} else if (base.hasType("time")) {
result.add(new TimeType(Utilities.highBoundaryForTime(base.primitiveValue(), precision == 0 ? 9 : precision)));
} else if (base.hasType("Quantity")) {
String value = getNamedValue(base, "value");
Base v = base.copy();
v.setProperty("value", new DecimalType(Utilities.highBoundaryForDecimal(value, precision == 0 ? 8 : precision)));
result.add(v);
} else {
makeException(expr, I18nConstants.FHIRPATH_WRONG_PARAM_TYPE, "sqrt", "(focus)", base.fhirType(), "decimal or date");
}
@ -4090,7 +4129,8 @@ public class FHIRPathEngine {
List<Base> result = new ArrayList<Base>();
if (focus.size() == 1) {
String cnt = focus.get(0).primitiveValue();
for (String s : cnt.split(param)) {
String[] sl = Pattern.compile(param, Pattern.LITERAL).split(cnt);
for (String s : sl) {
result.add(new StringType(s));
}
}
@ -4100,9 +4140,14 @@ public class FHIRPathEngine {
private List<Base> funcJoin(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
List<Base> nl = execute(context, focus, exp.getParameters().get(0), true);
String param = nl.get(0).primitiveValue();
String param2 = param;
if (exp.getParameters().size() == 2) {
nl = execute(context, focus, exp.getParameters().get(1), true);
param2 = nl.get(0).primitiveValue();
}
List<Base> result = new ArrayList<Base>();
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(param);
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(param, param2);
for (Base i : focus) {
b.append(i.primitiveValue());
}
@ -4164,6 +4209,38 @@ public class FHIRPathEngine {
return false;
}
private List<Base> funcComparable(ExecutionContext context, List<Base> focus, ExpressionNode exp) throws FHIRException {
if (focus.size() != 1 || !(focus.get(0).fhirType().equals("Quantity"))) {
return makeBoolean(false);
}
List<Base> nl = execute(context, focus, exp.getParameters().get(0), true);
if (nl.size() != 1 || !(nl.get(0).fhirType().equals("Quantity"))) {
return makeBoolean(false);
}
String s1 = getNamedValue(focus.get(0), "system");
String u1 = getNamedValue(focus.get(0), "code");
String s2 = getNamedValue(nl.get(0), "system");
String u2 = getNamedValue(nl.get(0), "code");
if (s1 == null || s2 == null || !s1.equals(s2)) {
return makeBoolean(false);
}
if (u1 == null || u2 == null) {
return makeBoolean(false);
}
if (u1.equals(u2)) {
return makeBoolean(true);
}
if (s1.equals("http://unitsofmeasure.org") && worker.getUcumService() != null) {
try {
return makeBoolean(worker.getUcumService().isComparable(u1, u2));
} catch (UcumException e) {
return makeBoolean(false);
}
} else {
return makeBoolean(false);
}
}
private boolean checkHtmlNames(XhtmlNode node) {
if (node.getNodeType() == NodeType.Comment) {

13
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/GraphQLEngine.java
View File

@ -119,6 +119,13 @@ public class GraphQLEngine implements IGraphQLEngine {
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
public static class SearchWrapper extends Base {
@ -208,6 +215,12 @@ public class GraphQLEngine implements IGraphQLEngine {
return null;
}
@Override
public Base copy() {
throw new Error("Not Implemented");
}
}
private IWorkerContext context;