Merge pull request #750 from MeasureAuthoringTool/feature/mat-7926-ad…

…d-qicore6-export-support

MAT-7926: Add support for exporting versioned QI-Core 6 measures, includes model validation and packaging.

pom.xml

@@ -166,7 +166,7 @@
     <dependency>
       <groupId>gov.cms.madie.packaging</groupId>
       <artifactId>packaging-utility</artifactId>
-      <version>0.2.2</version>
+      <version>0.2.5</version>
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>

src/main/java/cms/gov/madie/measure/services/QiCore6ModelValidator.java

@@ -0,0 +1,10 @@
+package cms.gov.madie.measure.services;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service(ServiceConstants.QICORE_6_VALIDATOR)
+public class QiCore6ModelValidator extends QiCoreModelValidator {
+  // Intentionally empty class. QI-Core 6 validation is the same as QI-Core 4.1.1.
+}

src/main/java/cms/gov/madie/measure/services/Qicore6PackageService.java

@@ -0,0 +1,11 @@
+package cms.gov.madie.measure.services;
+
+import org.springframework.stereotype.Service;
+
+/** Intentionally empty class. QI-Core 6 packaging is the same as QI-Core 4.1.1. */
+@Service
+public class Qicore6PackageService extends QicorePackageService {
+  public Qicore6PackageService(BundleService bundleService) {
+    super(bundleService);
+  }
+}

src/main/java/cms/gov/madie/measure/services/ServiceConstants.java

@@ -3,6 +3,7 @@
 public final class ServiceConstants {
   public static final String QDM_VALIDATOR = "qdmModelValidator";
   public static final String QICORE_VALIDATOR = "qicoreModelValidator";
+  public static final String QICORE_6_VALIDATOR = "qicore6ModelValidator";
 
   private ServiceConstants() {}
 }

src/test/java/cms/gov/madie/measure/services/BundleServiceTest.java

@@ -213,7 +213,7 @@ void testExportBundleMeasureForVersionedMeasure() throws IOException {
     ZipInputStream z = new ZipInputStream(new ByteArrayInputStream(output.getExportPackage()));
     ZipEntry entry = z.getNextEntry();
     String fileName = entry.getName();
-    assertEquals(fileName, "resources/TestCreateNewLibrary-1.0.000.xml");
+    assertEquals("resources/measure-TestCreateNewLibrary-1.0.000.json", fileName);
   }
 
   @Test