Upgrade hapi fhir version (#457)

* CQL issue with connection pool exhaustion

* Upgrades of HAPI FHIR version and removal of deprecated DSTU2 supports

Author: marianbuenosayres

a2d2-api/pom.xml

@@ -310,7 +310,7 @@
 		<dependency>
 			<groupId>io.elimu.a2d2</groupId>
 			<artifactId>generic-helpers</artifactId>
-			<version>0.0.22</version>
+			<version>0.1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- web development, including Tomcat and spring-webmvc -->

cdshooks-wih/pom.xml

@@ -61,7 +61,7 @@
     	<groupId>io.elimu.a2d2</groupId>
     	<artifactId>fhir-parse-util</artifactId>
     </dependency>
-    <dependency>
+    <!--dependency>
     	<groupId>ca.uhn.hapi.fhir</groupId>
     	<artifactId>hapi-fhir-structures-dstu2</artifactId>
     	<scope>test</scope>
@@ -71,7 +71,7 @@
     			<artifactId>commons-text</artifactId>
     		</exclusion>
     	</exclusions>
-    </dependency>
+    </dependency-->
     <dependency>
 	    <groupId>org.apache.commons</groupId>
 	    <artifactId>commons-text</artifactId>

cdshooks-wih/src/main/java/io/elimu/a2d2/cdshookswih/DeserializeCDSHooksRequestDelegate.java

@@ -151,9 +151,9 @@ private FormatType findFormatType(String fhirVersion) {
 			return FormatType.FHIR3;
 		if ("R4".equalsIgnoreCase(fhirVersion))
 			return FormatType.FHIR4;
-		FormatType type = FormatType.FHIR2;
-		if (!"DSTU2".equalsIgnoreCase(fhirVersion))
-			log.warn("Missing supported fhirVersion, parse as FHIR2");
+		FormatType type = FormatType.FHIR4;
+		if (!"R4".equalsIgnoreCase(fhirVersion))
+			log.warn("Missing supported fhirVersion, parse as FHIR4");
 		return type;
 	}
 

cdshooks-wih/src/test/java/io/elimu/a2d2/cdshooks_wih/DeserializeCDSHooksRequestDelegateTest.java

@@ -39,7 +39,7 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
 			<exclusions>
@@ -52,7 +52,7 @@
 					<artifactId>commons-text</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>
+		</dependency-->
 		<dependency>
 		    <groupId>org.apache.commons</groupId>
 		    <artifactId>commons-text</artifactId>