From 37de6ab3e2432afc6a349b4a11eb07a4ad50172f Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Thu, 12 Oct 2023 16:25:05 -0400
Subject: [PATCH] MAT-6240: Upgrading cqframework

---
 pom.xml                                           |  2 +-
 .../resources/TestCaseBundleController.java       |  2 +-
 .../services/TestCaseBundleService.java           |  3 ---
 .../utils/FhirResourceHelpers.java                | 15 ++++++++-------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 51eb2fd1..81c0e70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<springfox.version>3.0.0</springfox.version>
-		<cqframework.version>2.11.0</cqframework.version>
+		<cqframework.version>3.2.0</cqframework.version>
 		<hapi.fhir.r4.version>6.6.2</hapi.fhir.r4.version>
 	</properties>
 
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/resources/TestCaseBundleController.java b/src/main/java/gov/cms/madie/madiefhirservice/resources/TestCaseBundleController.java
index cca75885..7d499d78 100644
--- a/src/main/java/gov/cms/madie/madiefhirservice/resources/TestCaseBundleController.java
+++ b/src/main/java/gov/cms/madie/madiefhirservice/resources/TestCaseBundleController.java
@@ -50,7 +50,7 @@ public ResponseEntity<byte[]> getTestCaseExportBundle(
     if (testCaseId == null || testCaseId.isEmpty()) {
       throw new ResourceNotFoundException("test cases", "measure", measure.getId());
     }
-    //MAT-6204 Here we're modifying the bundle based on export choice, 
+    // MAT-6204 Here we're modifying the bundle based on export choice,
     // but we don't want to modify it permanently
     testCaseBundleService.setExportBundleType(exportDTO, measure);
 
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
index acc0159a..021a49bc 100644
--- a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
+++ b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
@@ -24,8 +24,6 @@
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.hl7.fhir.r4.model.BooleanType;
 import org.hl7.fhir.r4.model.Bundle;
-
-import org.hl7.fhir.r4.model.Bundle.HTTPVerb;
 import org.hl7.fhir.r4.model.Extension;
 import org.hl7.fhir.r4.model.MarkdownType;
 import org.hl7.fhir.r4.model.MeasureReport;
@@ -130,7 +128,6 @@ public void updateEntry(TestCase testCase, BundleType bundleType) {
                 entry -> {
                   if (bundleType == BundleType.TRANSACTION) {
 
-                    
                     FhirResourceHelpers.setResourceEntry(entry.getResource(), entry);
                     return entry;
                   } else if (bundleType == BundleType.COLLECTION) {
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/utils/FhirResourceHelpers.java b/src/main/java/gov/cms/madie/madiefhirservice/utils/FhirResourceHelpers.java
index 244dfb11..9d8ef12a 100644
--- a/src/main/java/gov/cms/madie/madiefhirservice/utils/FhirResourceHelpers.java
+++ b/src/main/java/gov/cms/madie/madiefhirservice/utils/FhirResourceHelpers.java
@@ -34,13 +34,14 @@ public static Bundle.BundleEntryComponent getBundleEntryComponent(
     return entryComponent;
   }
 
-public static void setResourceEntry(Resource resource, Bundle.BundleEntryComponent entryComponent) {
-	Bundle.BundleEntryRequestComponent requestComponent =
-          new Bundle.BundleEntryRequestComponent()
-              .setMethod(Bundle.HTTPVerb.POST)
-              .setUrl(resource.getResourceType() + "/" + resource.getIdPart());
-      entryComponent.setRequest(requestComponent);
-}
+  public static void setResourceEntry(
+      Resource resource, Bundle.BundleEntryComponent entryComponent) {
+    Bundle.BundleEntryRequestComponent requestComponent =
+        new Bundle.BundleEntryRequestComponent()
+            .setMethod(Bundle.HTTPVerb.POST)
+            .setUrl(resource.getResourceType() + "/" + resource.getIdPart());
+    entryComponent.setRequest(requestComponent);
+  }
 
   public static Period getPeriodFromDates(Date startDate, Date endDate) {
     return new Period()