Integrate with CQL changes to split errors and warnings.

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/common/CompositeEvaluationResultsPerMeasure.java

@@ -24,6 +24,8 @@ public class CompositeEvaluationResultsPerMeasure {
     private final Map<IIdType, Map<String, EvaluationResult>> resultsPerMeasure;
     // We may get several errors for a given measure
     private final Map<IIdType, List<String>> errorsPerMeasure;
+    // We may get several warnings for a given measure
+    private final Map<IIdType, List<String>> warningsPerMeasure;
 
     private CompositeEvaluationResultsPerMeasure(Builder builder) {
 
@@ -34,6 +36,10 @@ private CompositeEvaluationResultsPerMeasure(Builder builder) {
         var errorsBuilder = ImmutableMap.<IIdType, List<String>>builder();
         builder.errorsPerMeasure.forEach((key, value) -> errorsBuilder.put(key, List.copyOf(value)));
         errorsPerMeasure = errorsBuilder.build();
+
+        var warningsBuilder = ImmutableMap.<IIdType, List<String>>builder();
+        builder.warningsPerMeasure.forEach((key, value) -> warningsBuilder.put(key, List.copyOf(value)));
+        warningsPerMeasure = warningsBuilder.build();
     }
 
     /**
@@ -83,6 +89,7 @@ public static Builder builder() {
     public static class Builder {
         private final Map<IIdType, Map<String, EvaluationResult>> resultsPerMeasure = new HashMap<>();
         private final Map<IIdType, List<String>> errorsPerMeasure = new HashMap<>();
+        private final Map<IIdType, List<String>> warningsPerMeasure = new HashMap<>();
 
         public CompositeEvaluationResultsPerMeasure build() {
             return new CompositeEvaluationResultsPerMeasure(this);
@@ -116,7 +123,17 @@ public void addErrors(List<? extends IIdType> measureIds, String error) {
             }
         }
 
-        public void addError(IIdType measureId, String error) {
+        public void addWarnings(List<? extends IIdType> measureIds, String warning) {
+            if (warning == null || warning.isEmpty()) {
+                return;
+            }
+
+            for (IIdType measureId : measureIds) {
+                addWarning(measureId, warning);
+            }
+        }
+
+        private void addError(IIdType measureId, String error) {
             if (error == null || error.isBlank()) {
                 return;
             }
@@ -125,5 +142,15 @@ public void addError(IIdType measureId, String error) {
                     .computeIfAbsent(measureId.toUnqualifiedVersionless(), k -> new ArrayList<>())
                     .add(error);
         }
+
+        private void addWarning(IIdType measureId, String warning) {
+            if (warning == null || warning.isBlank()) {
+                return;
+            }
+
+            warningsPerMeasure
+                .computeIfAbsent(measureId.toUnqualifiedVersionless(), k -> new ArrayList<>())
+                .add(warning);
+        }
     }
 }

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/common/MeasureProcessorUtils.java

@@ -403,6 +403,14 @@ public CompositeEvaluationResultsPerMeasure getEvaluationResults(
                                 resultsBuilder.addErrors(measureIds, error);
                                 logger.error(error, exception);
                             });
+
+                    Optional.ofNullable(evaluationResultsForMultiLib.getWarningFor(libraryVersionedIdentifier))
+                        .ifPresent(warning -> {
+                            var warningMessage = EXCEPTION_FOR_SUBJECT_ID_MESSAGE_TEMPLATE.formatted(
+                                subjectId, warning.getMessage());
+                            resultsBuilder.addWarnings(measureIds, warningMessage);
+                            logger.warn(warningMessage, warning);
+                        });
                 }
 
             } catch (Exception e) {

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/common/CompositeEvaluationResultsPerMeasureTest.java

@@ -27,8 +27,8 @@ void gettersContainExpectedData() {
 
         CompositeEvaluationResultsPerMeasure.Builder builder = CompositeEvaluationResultsPerMeasure.builder();
         builder.addResult(m1, "subject-123", er);
-        builder.addError(m1, "oops-1");
-        builder.addError(m2, "oops-2");
+        builder.addErrors(List.of(m1), "oops-1");
+        builder.addErrors(List.of(m2), "oops-2");
 
         CompositeEvaluationResultsPerMeasure composite = builder.build();
 

pom.xml

@@ -22,7 +22,7 @@
 
         <junit.version>5.10.2</junit.version>
         <slf4j.version>2.0.4</slf4j.version>
-        <cql.version>3.29.0</cql.version>
+        <cql.version>3.30.0-SNAPSHOT</cql.version>
         <jmh.version>1.36</jmh.version>
         <spring.version>6.1.20</spring.version>
         <hapi.version>8.4.0</hapi.version>