From b3cc460ccd99a010d2b1cc8c45a88a34bac7ecaa Mon Sep 17 00:00:00 2001 From: Oliver Egger Date: Tue, 22 Nov 2022 16:02:06 +0100 Subject: [PATCH 1/3] fix nullpointer exceptions --- .../src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java | 2 +- .../hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java index 2b9beaac2..9e8065afc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java @@ -227,7 +227,7 @@ public abstract class ParserBase { if (!"id".equals(e.getName())) { return true; } - if (path.contains(".")) { + if (path!=null && path.contains(".")) { return idPolicy.forInner(); } else { return idPolicy.forRoot(); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java index 0933e93e0..bd4dc274c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java @@ -1680,7 +1680,7 @@ public class StructureMapUtilities { case EVALUATE: ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION); if (expr == null) { - expr = fpe.parse(getParamStringNoNull(vars, tgt.getParameter().get(1), tgt.toString())); + expr = fpe.parse(getParamStringNoNull(vars, tgt.getParameter().get(tgt.getParameter().size() - 1), tgt.toString())); tgt.setUserData(MAP_EXPRESSION, expr); } List v = fpe.evaluate(vars, null, null, tgt.getParameter().size() == 2 ? getParam(vars, tgt.getParameter().get(0)) : new BooleanType(false), expr); From 9099f11ba6f78e861ba967674af782613127abb5 Mon Sep 17 00:00:00 2001 From: dotasek Date: Sat, 26 Nov 2022 14:13:44 -0500 Subject: [PATCH 2/3] Retry release, update RELEASE_NOTES.md ***NO_CI*** --- RELEASE_NOTES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..d008f1ede 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,9 @@ ## Validator Changes -* no changes +* Improved Loading speed (20% reduction) +* Fix issue handling path on content references on deeply nested content ## Other code changes -* no changes \ No newline at end of file +* Fix rendering issue when reference.reference missing +* Add rule date to validation messages so new rules can be highlighted From f7cae7f2b94318b66965ec15ff4bb790fbe85ce6 Mon Sep 17 00:00:00 2001 From: dotasek Date: Sat, 26 Nov 2022 14:15:58 -0500 Subject: [PATCH 3/3] Ignore previous commit. Release was fine. ***NO_CI*** --- RELEASE_NOTES.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d008f1ede..3b263f099 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,9 +1,7 @@ ## Validator Changes -* Improved Loading speed (20% reduction) -* Fix issue handling path on content references on deeply nested content +* no changes ## Other code changes -* Fix rendering issue when reference.reference missing -* Add rule date to validation messages so new rules can be highlighted +* no changes