Merge remote-tracking branch 'origin/master' into connecthaton-18-res…

…ults * origin/master: Bumped engine dependency Added jar back into build process Bumped project version for publishing #48 - Added -measure-with-source operation and test #48 - Added a STU3 data provider that serves up resources from a Bundle of source data
cqframework · May 28, 2018 · 0589818 · 0589818
2 parents e11b9c3 + 0892b5c
commit 0589818
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.opencds.cqf</groupId>
     <artifactId>cqf-ruler</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.2-SNAPSHOT</version>
 
     <properties>
         <p.type>war</p.type>
@@ -31,13 +31,13 @@
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>cql-engine</artifactId>
-            <version>1.2.39-SNAPSHOT</version>
+            <version>1.2.41-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>cql-engine-fhir</artifactId>
-            <version>1.2.39-SNAPSHOT</version>
+            <version>1.2.41-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -394,6 +394,22 @@
                 </configuration>
             </plugin>
 
+            <!-- Use when publishing -->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-jar-plugin</artifactId>-->
+                <!--<version>3.1.0</version>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>make-a-jar</id>-->
+                        <!--<phase>compile</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>test-jar</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -480,19 +496,20 @@
                 </configuration>
             </plugin>
 
+            <!-- Use when publishing -->
             <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-gpg-plugin</artifactId>-->
-            <!--<version>1.6</version>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<id>sign-artifacts</id>-->
-            <!--<phase>verify</phase>-->
-            <!--<goals>-->
-            <!--<goal>sign</goal>-->
-            <!--</goals>-->
-            <!--</execution>-->
-            <!--</executions>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-gpg-plugin</artifactId>-->
+                <!--<version>1.6</version>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>sign-artifacts</id>-->
+                        <!--<phase>verify</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>sign</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
             <!--</plugin>-->
 
             <plugin>

diff --git a/src/test/java/org/opencds/cqf/MeasureEvaluationTests.java b/src/test/java/org/opencds/cqf/MeasureEvaluationTests.java
@@ -2,6 +2,7 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.primitive.IdDt;
+import org.hl7.fhir.ContentType;
 import org.hl7.fhir.dstu3.model.*;
 import org.junit.Assert;
 

diff --git a/src/test/java/org/opencds/cqf/RulerHelperTests.java b/src/test/java/org/opencds/cqf/RulerHelperTests.java
@@ -107,6 +107,7 @@ public void XlsxToValueSetTest() throws IOException {
 //    @Test
 //    public void validationTest() {
 //        Condition condition = new Condition();
+//        condition.setId("condition-1");
 //        condition.setCode(
 //                new CodeableConcept().addCoding(
 //                        new Coding().setSystem("ICD-9-CM").setCode("428.21")
@@ -117,9 +118,20 @@ public void XlsxToValueSetTest() throws IOException {
 //                .setSubject(new Reference().setReference("Patient/pneumo-true-2"))
 //                .setOnset(new DateTimeType().setValue(new Date()));
 //
+//        Bundle bundle = new Bundle();
+//        bundle.setType(Bundle.BundleType.TRANSACTION);
+//        bundle.addEntry(
+//                new Bundle.BundleEntryComponent().setResource(condition)
+//                        .setRequest(new Bundle.BundleEntryRequestComponent()
+//                                .setMethod(Bundle.HTTPVerb.PUT)
+//                                .setUrl("Condition/condition-1"))
+//        );
+//
 //        FhirContext ctx = FhirContext.forDstu3();
 //        FhirValidator validator = ctx.newValidator();
-//        ValidationResult result = validator.validateWithResult(condition);
+//        IValidatorModule module1 = new SchemaBaseValidator(ctx);
+//        validator.registerValidatorModule(module1);
+//        ValidationResult result = validator.validateWithResult(bundle);
 //
 //        if (result.isSuccessful()) {
 //            System.out.println("Validation Successful");