Rev to 3.11.0

cqframework · Sep 6, 2024 · dd0a1c2 · dd0a1c2
1 parent 82bf9b7
commit dd0a1c2
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 62 deletions.
diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml
@@ -5,14 +5,14 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-api</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <name>FHIR Clinical Reasoning (APIs)</name>
   <description>FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencies>

diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml
@@ -5,26 +5,26 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-benchmark</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
     <name>FHIR Clinical Reasoning (Benchmarks)</name>
     <description>Tests validating performance of FHIR Clinical Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -34,14 +34,14 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
             <!--TODO: test-jars don't seem to work very well. Need to investigate some alternatives -->
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>

diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
@@ -5,60 +5,60 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-bom</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Bill Of Materials)</name>
   <description>This bom can be used to simplify dependency management when using this project</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-api</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-utility</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cql</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jackson</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jaxb</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr-cli</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml
@@ -5,26 +5,26 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cql</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <name>FHIR Clinical Reasoning (CQL)</name>
   <description>Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -62,13 +62,13 @@
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>

diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml
@@ -6,36 +6,36 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-cli</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
     <name>FHIR Clinical Reasoning (CLI)</name>
     <description>CLI for running FHIR Clincial Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-api</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-utility</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cql</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java b/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java
@@ -124,6 +124,7 @@ static class ParameterParameter {
         }
     }
 
+    @SuppressWarnings("removal")
     private static class Logger implements ILoggingService {
 
         private final org.slf4j.Logger log = LoggerFactory.getLogger(Logger.class);

diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml
@@ -7,21 +7,21 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-spring</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
     <name>FHIR Clinical Reasoning (Spring)</name>
     <description>Spring configurations for FHIR Clinical Reasoning</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.11.0-SNAPSHOT</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml
@@ -5,45 +5,45 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cr</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <name>FHIR Clinical Reasoning (Operations)</name>
   <description>Implementations of clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-cql</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
     </dependency>
 
     <!-- test dependencies-->
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.11.0-SNAPSHOT</version>
+      <version>3.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
@@ -6,7 +6,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.cqframework.cql.cql2elm.CqlIncludeException;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
@@ -180,7 +179,9 @@ private Map<String, Object> resolveParameterMap(Parameters parameters) {
             }
             if (parameterMap.containsKey(param.getName())) {
                 if (parameterMap.get(param.getName()) instanceof List) {
-                    CollectionUtils.addIgnoreNull((List<?>) parameterMap.get(param.getName()), value);
+                    if (value != null) {
+                        ((List) parameterMap.get(param.getName())).add(value);
+                    }
                 } else {
                     parameterMap.put(param.getName(), Arrays.asList(parameterMap.get(param.getName()), value));
                 }

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
@@ -8,7 +8,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.cqframework.cql.cql2elm.CqlIncludeException;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
@@ -221,7 +220,9 @@ private Map<String, Object> resolveParameterMap(Parameters parameters) {
             }
             if (parameterMap.containsKey(param.getName())) {
                 if (parameterMap.get(param.getName()) instanceof List) {
-                    CollectionUtils.addIgnoreNull((List<?>) parameterMap.get(param.getName()), value);
+                    if (value != null) {
+                        ((List) parameterMap.get(param.getName())).add(value);
+                    }
                 } else {
                     parameterMap.put(param.getName(), Arrays.asList(parameterMap.get(param.getName()), value));
                 }

diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml
@@ -5,15 +5,15 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jackson</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Jackson)</name>
   <description>Aggregator module for Jackson dependencies</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencies>

diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml
@@ -5,15 +5,15 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jaxb</artifactId>
-  <version>3.11.0-SNAPSHOT</version>
+  <version>3.11.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (JAXB)</name>
   <description>Aggregator module for JAXB dependencies</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.0</version>
   </parent>
 
   <dependencies>