From 45112d7c26e687b9eb84da6bdf280d8a346cab33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 09:19:20 +0000 Subject: [PATCH 1/2] Upgrade: [dependabot] - bump fhir.version from 7.4.5 to 7.6.0 Bumps `fhir.version` from 7.4.5 to 7.6.0. Updates `ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4` from 7.4.5 to 7.6.0 Updates `ca.uhn.hapi.fhir:hapi-fhir-structures-r4` from 7.4.5 to 7.6.0 Updates `ca.uhn.hapi.fhir:hapi-fhir-validation` from 7.4.5 to 7.6.0 Updates `ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine` from 7.4.5 to 7.6.0 Updates `ca.uhn.hapi.fhir:hapi-fhir-base` from 7.4.5 to 7.6.0 --- updated-dependencies: - dependency-name: ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: ca.uhn.hapi.fhir:hapi-fhir-structures-r4 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: ca.uhn.hapi.fhir:hapi-fhir-validation dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: ca.uhn.hapi.fhir:hapi-fhir-base dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0b2eab4..0f720935 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 21 21 UTF-8 - 7.4.5 + 7.6.0 2.24.2 2.18.1 nhsdigital From b5a170b104b1c05df54e7d6b241122f02a225dc0 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:49:36 +0000 Subject: [PATCH 2/2] fix tests --- src/test/resources/results/invalidBundle.json | 4 +- src/test/resources/results/searchSet.json | 72 +++++++++++++++++++ src/test/resources/results/validBundle.json | 8 +-- 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/src/test/resources/results/invalidBundle.json b/src/test/resources/results/invalidBundle.json index c76f8453..84810782 100644 --- a/src/test/resources/results/invalidBundle.json +++ b/src/test/resources/results/invalidBundle.json @@ -216,7 +216,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [ @@ -247,7 +247,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [ diff --git a/src/test/resources/results/searchSet.json b/src/test/resources/results/searchSet.json index b6f6c59f..2e53ede9 100644 --- a/src/test/resources/results/searchSet.json +++ b/src/test/resources/results/searchSet.json @@ -153,10 +153,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 499 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", @@ -501,10 +513,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 1598 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[1].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[1].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", @@ -849,10 +873,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 2710 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[2].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[2].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", @@ -1197,10 +1233,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 3810 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[3].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[3].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", @@ -1621,10 +1669,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 495 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", @@ -2048,10 +2108,22 @@ { "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col", "valueInteger": 499 + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id", + "valueString": "This_element_does_not_match_any_known_slice_" } ], "severity": "information", "code": "processing", + "details": { + "coding": [ + { + "system": "http://hl7.org/fhir/java-core-messageId", + "code": "This_element_does_not_match_any_known_slice_" + } + ] + }, "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))", "location": [ "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]", diff --git a/src/test/resources/results/validBundle.json b/src/test/resources/results/validBundle.json index 2ea8c06c..d16c7f91 100644 --- a/src/test/resources/results/validBundle.json +++ b/src/test/resources/results/validBundle.json @@ -135,7 +135,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [ @@ -266,7 +266,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [ @@ -397,7 +397,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [ @@ -528,7 +528,7 @@ "valueString": "Terminology_PassThrough_TX_Message" } ], - "severity": "information", + "severity": "warning", "code": "processing", "details": { "coding": [