From 150d78af630b83d677f16514618af17bc8c858e1 Mon Sep 17 00:00:00 2001 From: "dotasek.dev" Date: Mon, 26 Feb 2024 09:59:25 -0500 Subject: [PATCH] Update for changing API --- .../fhir/r5/hapi/ctx/HapiWorkerContext.java | 5 +++ .../VersionSpecificWorkerContextWrapper.java | 32 +++++++++++-------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java index b399a75bfc6..47e6fbc6b85 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java @@ -635,4 +635,9 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext public T findTxResource(Class class_, String canonical, String version) { throw new UnsupportedOperationException(Msg.code(2493)); } + + @Override + public Boolean subsumes(ValidationOptions optionsArg, Coding parent, Coding child) { + throw new UnsupportedOperationException(Msg.code(2488)); + } } diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java index 5c0896efda0..efc3b24fe92 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java @@ -767,18 +767,19 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo org.hl7.fhir.r5.model.CodeableConcept code, org.hl7.fhir.r5.model.ValueSet theVs) { - List validationResultsOk = new ArrayList<>(); for (Coding next : code.getCoding()) { if (!next.hasSystem()) { - String message = "Coding has no system. A code with no system has no defined meaning, and it cannot be validated. A system should be provided"; - OperationOutcome.OperationOutcomeIssueComponent issue = new OperationOutcome.OperationOutcomeIssueComponent() - .setSeverity(OperationOutcome.IssueSeverity.WARNING) - .setCode(OperationOutcome.IssueType.INVALID) - .setDiagnostics(message).setDetails(new CodeableConcept().setText(message)); + String message = + "Coding has no system. A code with no system has no defined meaning, and it cannot be validated. A system should be provided"; + OperationOutcome.OperationOutcomeIssueComponent issue = + new OperationOutcome.OperationOutcomeIssueComponent() + .setSeverity(OperationOutcome.IssueSeverity.WARNING) + .setCode(OperationOutcome.IssueType.INVALID) + .setDiagnostics(message) + .setDetails(new CodeableConcept().setText(message)); return new ValidationResult(ValidationMessage.IssueSeverity.ERROR, null, List.of(issue)); - } ValidationResult retVal = validateCode(theOptions, next, theVs); if (retVal.isOk()) { @@ -795,13 +796,13 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo return validationResultsOk.get(0); } - - - String message = "Unknown code (for '" + code.getCodingFirstRep().getSystem() + "#" + code.getCodingFirstRep().getCode() + "')"; + String message = "Unknown code (for '" + code.getCodingFirstRep().getSystem() + "#" + + code.getCodingFirstRep().getCode() + "')"; OperationOutcome.OperationOutcomeIssueComponent issue = new OperationOutcome.OperationOutcomeIssueComponent() - .setSeverity(OperationOutcome.IssueSeverity.ERROR) - .setCode(OperationOutcome.IssueType.NOTFOUND) - .setDiagnostics(message).setDetails(new CodeableConcept().setText(message)); + .setSeverity(OperationOutcome.IssueSeverity.ERROR) + .setCode(OperationOutcome.IssueType.NOTFOUND) + .setDiagnostics(message) + .setDetails(new CodeableConcept().setText(message)); return new ValidationResult(ValidationMessage.IssueSeverity.ERROR, null, List.of(issue)); } @@ -916,4 +917,9 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo return myHashCode; } } + + @Override + public Boolean subsumes(ValidationOptions optionsArg, Coding parent, Coding child) { + throw new UnsupportedOperationException(Msg.code(2489)); + } }