Made the overload with the list of subjectIds public (#170)

cqframework · Oct 12, 2022 · a81fcc1 · a81fcc1
1 parent 5be3e12
commit a81fcc1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/evaluator.fhir/pom.xml b/evaluator.fhir/pom.xml
@@ -69,31 +69,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <!-- <plugin>
-                <groupId>org.fugerit.java</groupId>
-                <artifactId>freemarker-maven-plugin</artifactId>
-                <configuration>
-                    <freeMarkerVersion>2.3.29</freeMarkerVersion>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>freemarker-generator</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
-            <!-- <plugin>
-                <groupId>com.googlecode.fmpp-maven-plugin</groupId>
-                <artifactId>fmpp-maven-plugin</artifactId>
-                <configuration>
-                    <cfgFile>src/main/resources/freemarker/config.fmpp</cfgFile>
-                    <outputDirectory>target/generated-sources/freemarker/</outputDirectory>
-                    <templateDirectory>src/main/resources/freemarker/template</templateDirectory>
-                </configuration>
-            </plugin> -->
         </plugins>
     </build>
 </project>
diff --git a/...asure-hapi/src/main/java/org/opencds/cqf/cql/evaluator/measure/r4/R4MeasureProcessor.java b/...asure-hapi/src/main/java/org/opencds/cqf/cql/evaluator/measure/r4/R4MeasureProcessor.java
@@ -214,7 +214,7 @@ public List<String> getSubjects(MeasureEvalType measureEvalType, String subjectI
 
     }
 
-    protected MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType,
+   public MeasureReport evaluateMeasure(Measure measure, String periodStart, String periodEnd, String reportType,
             List<String> subjectIds, FhirDal fhirDal, Endpoint contentEndpoint, Endpoint terminologyEndpoint,
             Endpoint dataEndpoint, Bundle additionalData) {
         if (this.measureEvaluationOptions.isThreadedEnabled()

diff --git a/pom.xml b/pom.xml
@@ -354,7 +354,7 @@
                 <version>1.5.1</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <!-- Library mapper code gen-->
             <dependency>
                 <groupId>org.mapstruct</groupId>
@@ -576,6 +576,27 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-maven-plugin</artifactId>
+                    <version>1.22</version>
+                    <configuration>
+                        <signature>
+                            <groupId>net.sf.androidscents.signature</groupId>
+                            <artifactId>android-api-level-26</artifactId>
+                            <version>8.0.0_r2</version>
+                        </signature>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>check-android-26-compliance</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>