From 6439a2a7328ac26547993bfb51b4187424aae0f8 Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 7 Oct 2024 17:16:21 -0400 Subject: [PATCH] Fix misc warnings flagged by builds (#1772) --- .../src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java | 1 + .../src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java | 1 + .../src/main/java/org/hl7/fhir/validation/BaseValidator.java | 4 ++-- .../main/java/org/hl7/fhir/validation/ValidationEngine.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java index b37397775..639ee8af7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExpressionNode.java @@ -13,6 +13,7 @@ import java.util.List; Due to a circular dependency, they cannot be updated without a release of HAPI, which requires backwards compatibility with core version 6.1.2.2 **/ +@Deprecated public class ExpressionNode extends org.hl7.fhir.r5.fhirpath.ExpressionNode{ private final org.hl7.fhir.r5.fhirpath.ExpressionNode wrappedExpressionNode; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java index 3d6633604..a7e654b46 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java @@ -13,6 +13,7 @@ import java.util.List; Due to a circular dependency, they cannot be updated without a release of HAPI, which requires backwards compatibility with core version 6.1.2.2 **/ +@Deprecated public class FHIRPathEngine extends org.hl7.fhir.r5.fhirpath.FHIRPathEngine { public interface IEvaluationContext extends org.hl7.fhir.r5.fhirpath.FHIRPathEngine.IEvaluationContext{ } diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java index abd405760..ab76c2d1f 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java @@ -587,8 +587,8 @@ public class BaseValidator implements IValidationContextResourceLoader, IMessagi */ protected boolean ruleHtml(List errors, String ruleDate, IssueType type, String path, boolean thePass, String msg, String html) { if (!thePass && doingErrors()) { - msg = context.formatMessage(msg, null); - html = context.formatMessage(html, null); + msg = context.formatMessage(msg); + html = context.formatMessage(html); addValidationMessage(errors, ruleDate, type, path, msg, html, IssueSeverity.ERROR, null); } return thePass; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java index 13cd9c10f..72808e09c 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java @@ -208,7 +208,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP @Getter @Setter private String version; @Getter @Setter private String language; @Setter private FilesystemPackageCacheManager pcm; - @Getter @Setter private PrintWriter mapLog; + @Getter private PrintWriter mapLog; @Getter @Setter private boolean debug = false; @Getter @Setter private IValidatorResourceFetcher fetcher; @Getter @Setter private IValidationPolicyAdvisor policyAdvisor;