honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-12 15:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

r4 compile fixes

Browse Source
This commit is contained in:
Grahame Grieve 2024-12-08 18:10:38 +03:00
parent 5385c313dc
commit 6fc6a4805d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2904,7 +2904,7 @@ public class StructureMapUtilities {
expr = fpe.parse(getParamString(vars, tgt.getParameter().get(tgt.getParameter().size() - 1)));
tgt.setUserData(MAP_WHERE_EXPRESSION, expr);
}
return fpe.check(vars, null, expr);
return fpe.check(vars, "Resource", null, expr);
////case TRUNCATE :
//// String src = getParamString(vars, tgt.getParameter().get(0));

8
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/sql/Validator.java
View File

@ -289,7 +289,7 @@ public class Validator {
try {
node = fpe.parse(expr);
column.setUserData("path", node);
td = fpe.checkOnTypes(vd, resourceName, t, node, warnings);
td = fpe.checkOnTypes(vd, "Resource", resourceName, t, node, warnings);
} catch (Exception e) {
error(path, expression, e.getMessage(), IssueType.INVALID);
}
@ -471,7 +471,7 @@ public class Validator {
try {
ExpressionNode n = fpe.parse(expr);
focus.setUserData("forEach", n);
td = fpe.checkOnTypes(vd, resourceName, t, n, warnings);
td = fpe.checkOnTypes(vd, "Resource", resourceName, t, n, warnings);
} catch (Exception e) {
error(path, expression, e.getMessage(), IssueType.INVALID);
}
@ -496,7 +496,7 @@ public class Validator {
try {
ExpressionNode n = fpe.parse(expr);
focus.setUserData("forEachOrNull", n);
td = fpe.checkOnTypes(vd, resourceName, t, n, warnings);
td = fpe.checkOnTypes(vd, "Resource", resourceName, t, n, warnings);
} catch (Exception e) {
error(path, expression, e.getMessage(), IssueType.INVALID);
}
@ -607,7 +607,7 @@ public class Validator {
try {
ExpressionNode n = fpe.parse(expr);
where.setUserData("path", n);
td = fpe.checkOnTypes(vd, resourceName, types, n, warnings);
td = fpe.checkOnTypes(vd, "Resource", resourceName, types, n, warnings);
} catch (Exception e) {
error(path, where.get("path"), e.getMessage(), IssueType.INVALID);
}

4
org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/FHIRPathTests.java
View File

@ -224,9 +224,9 @@ public class FHIRPathTests {
try {
if (Utilities.noString(input)) {
fp.check(null, null, node);
fp.check(null, null, null, node);
} else {
fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node);
fp.check(res, "Resource", res.getResourceType().toString(), res.getResourceType().toString(), node);
}
Assertions.assertTrue(fail != TestResultType.SEMANTICS,
String.format("Expected exception didn't occur checking %s", expression));