Merge pull request #31 from MeasureAuthoringTool/develop

Release 0.2.5

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.cms.madie.packaging</groupId>
 	<artifactId>packaging-utility</artifactId>
-	<version>0.2.4</version>
+	<version>0.2.5</version>
 
 	<name>packaging-utility</name>
 	<description>A simple packaging-utility.</description>

src/main/java/gov/cms/madie/packaging/utils/PackagingUtilityFactory.java

@@ -18,6 +18,7 @@ public static PackagingUtility getInstance(String model)
         new HashMap<>() {
           {
             put("QI-Core v4.1.1", "qicore411");
+            put("QI-Core v6.0.0", "qicore6");
           }
         };
 

src/main/java/gov/cms/madie/packaging/utils/qicore411/ResourceUtils.java → src/main/java/gov/cms/madie/packaging/utils/qicore/ResourceUtils.java

@@ -1,4 +1,4 @@
-package gov.cms.madie.packaging.utils.qicore411;
+package gov.cms.madie.packaging.utils.qicore;
 
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.r4.model.Bundle;

src/main/java/gov/cms/madie/packaging/utils/qicore411/PackagingUtilityImpl.java

@@ -20,6 +20,7 @@
 import gov.cms.madie.packaging.exceptions.InternalServerException;
 import gov.cms.madie.packaging.utils.PackagingUtility;
 import gov.cms.madie.packaging.utils.ZipUtility;
+import gov.cms.madie.packaging.utils.qicore.ResourceUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.hl7.fhir.r4.model.Measure;
 

src/main/java/gov/cms/madie/packaging/utils/qicore6/PackagingUtilityImpl.java

@@ -0,0 +1,7 @@
+package gov.cms.madie.packaging.utils.qicore6;
+
+/**
+ * QI-Core 6.0.0 matches packaging requirements of QICore v4.1.1
+ */
+public class PackagingUtilityImpl
+    extends gov.cms.madie.packaging.utils.qicore411.PackagingUtilityImpl {}

src/test/java/gov/cms/madie/packaging/utils/ResourceUtilityFactoryTest.java

@@ -12,7 +12,7 @@ class ResourceUtilityFactoryTest {
   void testGetInstance_fails() {
     try {
       PackagingUtility utility = PackagingUtilityFactory.getInstance("QI-Core");
-      fail("Should not be set " + utility.toString());
+      fail("Should not be set " + utility);
 
     } catch (InstantiationException
         | IllegalAccessException
@@ -26,7 +26,7 @@ void testGetInstance_fails() {
   }
 
   @Test
-  void testGetInstance() {
+  void testGetQiCore411Instance() {
     try {
       PackagingUtility utility = PackagingUtilityFactory.getInstance("QI-Core v4.1.1");
       assertNotNull(utility);
@@ -41,4 +41,21 @@ void testGetInstance() {
       fail(e);
     }
   }
+
+  @Test
+  void testGetQiCore6Instance() {
+    try {
+      PackagingUtility utility = PackagingUtilityFactory.getInstance("QI-Core v6.0.0");
+      assertNotNull(utility);
+
+    } catch (InstantiationException
+        | IllegalAccessException
+        | IllegalArgumentException
+        | InvocationTargetException
+        | NoSuchMethodException
+        | SecurityException
+        | ClassNotFoundException e) {
+      fail(e);
+    }
+  }
 }