From 07d81e3a5bf3166ffba460265a953aa34dd70cc0 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 25 Jan 2024 06:47:49 +1100 Subject: [PATCH 1/7] Fix additional bindings html generation issue (#1551) * Fix additional bindings html generation issue * Use new test cases snapshot --------- Co-authored-by: dotasek --- .../org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java | 3 ++- .../src/test/resources/txCache/org.hl7.fhir.r5/version.ctl | 2 +- .../test/resources/txCache/org.hl7.fhir.r5/vs-externals.json | 4 +++- pom.xml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java index 0082d4578..ee08c40aa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java @@ -259,7 +259,8 @@ public class AdditionalBindingsRenderer { if (binding.compare!=null && binding.valueSet.equals(binding.compare.valueSet)) valueset.style(STYLE_UNCHANGED); if (br.url != null) { - XhtmlNode a = valueset.ah(determineUrl(br.url), br.uri).tx(br.display); + XhtmlNode a = valueset.ah(determineUrl(br.url), br.uri); + a.tx(br.display); if (br.external) { a.tx(" "); a.img("external.png", null); diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl index e440e5c84..bf0d87ab1 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json index d01076756..524134a31 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json @@ -2,5 +2,7 @@ "http://somewhere/something-else" : null, "http://loinc.org/vs/LL715-4" : null, "http://hl7.org/fhir/us/vrdr/ValueSet/vrdr-PlaceOfDeath" : null, - "http://somewhere/something" : null + "http://somewhere/something" : null, + "https://fhir.infoway-inforoute.ca/ValueSet/issuetype|20190415" : null, + "https://fhir.infoway-inforoute.ca/ValueSet/issueseverity|20190415" : null } diff --git a/pom.xml b/pom.xml index 0dd17f120..4c6a68499 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 32.0.1-jre 6.4.1 - 1.4.26 + 1.4.27-SNAPSHOT 2.16.0 5.9.2 1.8.2 From 971633f79550a3a579a084964874bee4560aaa36 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 24 Jan 2024 16:07:32 -0500 Subject: [PATCH 2/7] Fix NullPointer exception when params are null (#1552) * Handle case of null params * Use new test cases * Release notes --- RELEASE_NOTES.md | 3 ++- .../hl7/fhir/dstu3/utils/client/FHIRToolingClient.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..7567cbc9d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,4 +4,5 @@ ## Other code changes -* no changes \ No newline at end of file +* Fix null pointer on explicitly null params in DSTU3 terminology requests +* Fix text creation on wrong xhtml node type \ No newline at end of file diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java index 36ddba865..cd9d665f6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java @@ -482,9 +482,13 @@ public class FHIRToolingClient extends FHIRBaseToolingClient { recordUse(); Parameters p = expParams == null ? new Parameters() : expParams.copy(); p.addParameter().setName("valueSet").setResource(source); - for (String n : params.keySet()) { - p.addParameter().setName(n).setValue(new StringType(params.get(n))); + if (params == null) { + params = new HashMap<>(); } + for (String n : params.keySet()) { + p.addParameter().setName(n).setValue(new StringType(params.get(n))); + } + org.hl7.fhir.dstu3.utils.client.network.ResourceRequest result = null; try { From 7ba2cfa153f7a15719e877348d824ef57fbe27f5 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 24 Jan 2024 16:46:06 -0500 Subject: [PATCH 3/7] Use released test cases --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c6a68499..fbfedc974 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 32.0.1-jre 6.4.1 - 1.4.27-SNAPSHOT + 1.4.27 2.16.0 5.9.2 1.8.2 From d409e75a787e63ee84840142e594b423bd66a026 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 25 Jan 2024 09:09:37 -0500 Subject: [PATCH 4/7] Revert commit (back to the drawing board) --- .../hl7/fhir/dstu3/utils/client/FHIRToolingClient.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java index cd9d665f6..36ddba865 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java @@ -482,13 +482,9 @@ public class FHIRToolingClient extends FHIRBaseToolingClient { recordUse(); Parameters p = expParams == null ? new Parameters() : expParams.copy(); p.addParameter().setName("valueSet").setResource(source); - if (params == null) { - params = new HashMap<>(); + for (String n : params.keySet()) { + p.addParameter().setName(n).setValue(new StringType(params.get(n))); } - for (String n : params.keySet()) { - p.addParameter().setName(n).setValue(new StringType(params.get(n))); - } - org.hl7.fhir.dstu3.utils.client.network.ResourceRequest result = null; try { From 0178bf751ac9473323bee51afe81cd5e02e1ce6f Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 25 Jan 2024 09:11:04 -0500 Subject: [PATCH 5/7] Remove reverted change from release notes ***NO_CI*** --- RELEASE_NOTES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7567cbc9d..e976e2151 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,5 +4,4 @@ ## Other code changes -* Fix null pointer on explicitly null params in DSTU3 terminology requests * Fix text creation on wrong xhtml node type \ No newline at end of file From 485bb2a9a74e66806af38fcc30062664346c2720 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Thu, 25 Jan 2024 16:34:27 +0000 Subject: [PATCH 6/7] Release: v6.2.14 ## Validator Changes * no changes ## Other code changes * Fix text creation on wrong xhtml node type ***NO_CI*** --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 709d30cb3..793189a21 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index a1f0bd629..bd76aa52a 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index cd9004bc7..d953d7aa3 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index b750ea8c9..07e98ab03 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 3cd4f7870..f8680d0d5 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 93272d655..09367b82b 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 0c80a7a86..242bb6f98 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index ecb53a8fc..40119e53a 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index cf41d0b15..b8f905771 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 2b5c71af0..1abebc479 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 049ac38c4..788669b71 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 ../pom.xml diff --git a/pom.xml b/pom.xml index fbfedc974..f9689a273 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.14 pom From f492c2114aacfa635d1bb29c02ef5ae2e46cfd32 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Thu, 25 Jan 2024 17:19:04 +0000 Subject: [PATCH 7/7] Updating version to: 6.2.15-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 2 +- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e976e2151..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,4 +4,4 @@ ## Other code changes -* Fix text creation on wrong xhtml node type \ No newline at end of file +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 793189a21..4e25e8866 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index bd76aa52a..ca5c080f4 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index d953d7aa3..6fc801c00 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 07e98ab03..cdec8e7ac 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index f8680d0d5..d0500fb3c 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 09367b82b..18a98caea 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 242bb6f98..75e868e4c 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 40119e53a..626fcdb1b 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index b8f905771..066a41e45 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 1abebc479..616f8e45b 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 788669b71..babf330e5 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index f9689a273..22c45d355 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 6.2.14 + 6.2.15-SNAPSHOT pom