Merge pull request #837 from hapifhir/cr-3-22-0

Update CR to release 3.22.0

Author: dotasek

pom.xml

@@ -6,7 +6,7 @@
     <properties>
         <java.version>17</java.version>
         <hapi.fhir.jpa.server.starter.revision>1</hapi.fhir.jpa.server.starter.revision>
-        <clinical-reasoning.version>3.21.0</clinical-reasoning.version>
+        <clinical-reasoning.version>3.22.0</clinical-reasoning.version>
     </properties>
 
     <!-- one-liner to take you to the cloud with settings form the application.yaml file: -->

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java

@@ -1,12 +1,11 @@
 package ca.uhn.fhir.jpa.starter.cdshooks;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.repository.IRepository;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.cdshooks.CdsServiceRequestJson;
-import ca.uhn.hapi.fhir.cdshooks.api.ICdsConfigService;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
-import org.opencds.cqf.fhir.api.Repository;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.CdsCrService;
 import org.opencds.cqf.fhir.utility.adapter.IAdapterFactory;
 
@@ -15,9 +14,8 @@
 public class UpdatedCdsCrService extends CdsCrService {
 	private final IAdapterFactory adapterFactory;
 
-	public UpdatedCdsCrService(
-			RequestDetails theRequestDetails, Repository theRepository, ICdsConfigService theCdsConfigService) {
-		super(theRequestDetails, theRepository, theCdsConfigService);
+	public UpdatedCdsCrService(RequestDetails theRequestDetails, IRepository theRepository) {
+		super(theRequestDetails, theRepository);
 		adapterFactory = IAdapterFactory.forFhirContext(theRepository.fhirContext());
 	}
 

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java

@@ -1,11 +1,11 @@
 package ca.uhn.fhir.jpa.starter.cdshooks;
 
+import ca.uhn.fhir.repository.IRepository;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.opencds.cqf.fhir.api.Repository;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CrDiscoveryService;
 
 public class UpdatedCrDiscoveryService extends CrDiscoveryService {
-	public UpdatedCrDiscoveryService(IIdType thePlanDefinitionId, Repository theRepository) {
+	public UpdatedCrDiscoveryService(IIdType thePlanDefinitionId, IRepository theRepository) {
 		super(thePlanDefinitionId, theRepository);
 		maxUriLength = 6000;
 	}