Upgrade HAPI FHIR to fix CVEs (#605)

* Upgrade HAPI FHIR to fix CVEs

This should resolve 1 Critical, and 1 High severity CVE

* Remove RegExp annotation

Our use of the intellij annotation here was reliant on a transient dependency.

Since upgrading HAPI FHIR we no longer have access to that annotation.

It seemed more sensible to just remove the annotation, given it's only
used in one location.

Author: Adrian Clay

service/build.gradle

@@ -62,7 +62,7 @@ dependencies {
 	implementation 'org.apache.tika:tika-core:1.28.4'
 
 	// Fhir
-	implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:5.4.0'
+	implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:6.6.2'
 
 	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterComponentsMapper.java

@@ -31,7 +31,6 @@
 import org.hl7.fhir.dstu3.model.Resource;
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.intellij.lang.annotations.RegExp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -65,9 +64,7 @@ public class EncounterComponentsMapper {
         + "-RelatedProblemHeader-1";
     private static final String RELATED_PROBLEM_TARGET = "target";
     private static final String COMPLETE_CODE = "COMPLETE";
-    @RegExp
     private static final String LIST_REFERENCE_PATTERN = "^List/[\\da-zA-z-]+$";
-    @RegExp
     private static final String CONTAINED_RESOURCE_REFERENCE_PATTERN = "^List/([\\da-zA-Z-]+)(#[\\da-zA-Z-]+)$";
 
     private final MessageContext messageContext;