From 0690d803c6c0890241dad2c101397604bea8605c Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Wed, 18 Jun 2025 18:22:19 -0600 Subject: [PATCH 1/2] bump cr to 3-22-0 --- pom.xml | 2 +- .../uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java | 7 +++---- .../jpa/starter/cdshooks/UpdatedCrDiscoveryService.java | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 356ab2c..e7c4f12 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 17 1 - 3.21.0 + 3.22.0 diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java index 414993c..9a256af 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java +++ b/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; @@ -16,8 +15,8 @@ public class UpdatedCdsCrService extends CdsCrService { private final IAdapterFactory adapterFactory; public UpdatedCdsCrService( - RequestDetails theRequestDetails, Repository theRepository, ICdsConfigService theCdsConfigService) { - super(theRequestDetails, theRepository, theCdsConfigService); + RequestDetails theRequestDetails, IRepository theRepository) { + super(theRequestDetails, theRepository); adapterFactory = IAdapterFactory.forFhirContext(theRepository.fhirContext()); } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java index f01873e..2bc82f0 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java +++ b/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; } From 4f9a84db9710f328d34ab0a554bb99c01f0fdc18 Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Wed, 18 Jun 2025 18:25:36 -0600 Subject: [PATCH 2/2] spotless --- .../ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java index 9a256af..4319fa8 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java @@ -14,8 +14,7 @@ import static org.opencds.cqf.fhir.utility.Constants.APPLY_PARAMETER_DATA; public class UpdatedCdsCrService extends CdsCrService { private final IAdapterFactory adapterFactory; - public UpdatedCdsCrService( - RequestDetails theRequestDetails, IRepository theRepository) { + public UpdatedCdsCrService(RequestDetails theRequestDetails, IRepository theRepository) { super(theRequestDetails, theRepository); adapterFactory = IAdapterFactory.forFhirContext(theRepository.fhirContext()); }