From 40c3745ad2776e113d00b00bcb131d3871caad7d Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Thu, 13 Mar 2025 10:48:54 -0600 Subject: [PATCH] update to new service class --- .../fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java | 4 ++-- ...pdatedCdsCrServiceR4.java => UpdatedCdsCrService.java} | 8 ++++---- ...overyServiceR4.java => UpdatedCrDiscoveryService.java} | 6 +++--- src/main/resources/application.yaml | 2 +- src/main/resources/cds.application.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/{UpdatedCdsCrServiceR4.java => UpdatedCdsCrService.java} (81%) rename src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/{UpdatedCrDiscoveryServiceR4.java => UpdatedCrDiscoveryService.java} (60%) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java index 845900b..5da4dae 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java @@ -31,7 +31,7 @@ public class StarterCdsHooksConfig { public ICdsCrDiscoveryServiceRegistry cdsCrDiscoveryServiceRegistry() { CdsCrDiscoveryServiceRegistry registry = new CdsCrDiscoveryServiceRegistry(); registry.unregister(FhirVersionEnum.R4); - registry.register(FhirVersionEnum.R4, UpdatedCrDiscoveryServiceR4.class); + registry.register(FhirVersionEnum.R4, UpdatedCrDiscoveryService.class); return registry; } @@ -39,7 +39,7 @@ public class StarterCdsHooksConfig { public ICdsCrServiceRegistry cdsCrServiceRegistry() { CdsCrServiceRegistry registry = new CdsCrServiceRegistry(); registry.unregister(FhirVersionEnum.R4); - registry.register(FhirVersionEnum.R4, UpdatedCdsCrServiceR4.class); + registry.register(FhirVersionEnum.R4, UpdatedCdsCrService.class); return registry; } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrServiceR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java similarity index 81% rename from src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrServiceR4.java rename to src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java index e821ce9..e81fcfb 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrServiceR4.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java @@ -6,20 +6,20 @@ import ca.uhn.hapi.fhir.cdshooks.api.ICdsConfigService; import org.hl7.fhir.r4.model.BooleanType; import org.hl7.fhir.r4.model.Parameters; import org.opencds.cqf.fhir.api.Repository; -import org.opencds.cqf.fhir.cr.hapi.cdshooks.CdsCrServiceR4; +import org.opencds.cqf.fhir.cr.hapi.cdshooks.CdsCrService; import static org.opencds.cqf.fhir.utility.Constants.APPLY_PARAMETER_DATA; import static org.opencds.cqf.fhir.utility.r4.Parameters.part; -public class UpdatedCdsCrServiceR4 extends CdsCrServiceR4 { - public UpdatedCdsCrServiceR4( +public class UpdatedCdsCrService extends CdsCrService { + public UpdatedCdsCrService( RequestDetails theRequestDetails, Repository theRepository, ICdsConfigService theCdsConfigService) { super(theRequestDetails, theRepository, theCdsConfigService); } @Override public Parameters encodeParams(CdsServiceRequestJson theJson) { - Parameters parameters = super.encodeParams(theJson); + var parameters = (Parameters) super.encodeParams(theJson); if (parameters.hasParameter(APPLY_PARAMETER_DATA)) { parameters.addParameter(part("useServerData", new BooleanType(false))); } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryServiceR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java similarity index 60% rename from src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryServiceR4.java rename to src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java index 50676fa..f01873e 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryServiceR4.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java @@ -2,10 +2,10 @@ package ca.uhn.fhir.jpa.starter.cdshooks; import org.hl7.fhir.instance.model.api.IIdType; import org.opencds.cqf.fhir.api.Repository; -import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CrDiscoveryServiceR4; +import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CrDiscoveryService; -public class UpdatedCrDiscoveryServiceR4 extends CrDiscoveryServiceR4 { - public UpdatedCrDiscoveryServiceR4(IIdType thePlanDefinitionId, Repository theRepository) { +public class UpdatedCrDiscoveryService extends CrDiscoveryService { + public UpdatedCrDiscoveryService(IIdType thePlanDefinitionId, Repository theRepository) { super(thePlanDefinitionId, theRepository); maxUriLength = 6000; } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 30953c6..a0756d6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -123,7 +123,7 @@ hapi: data: search_parameter_mode: USE_SEARCH_PARAMETERS # AUTO, USE_SEARCH_PARAMETERS, FILTER_IN_MEMORY terminology_parameter_mode: FILTER_IN_MEMORY # AUTO, USE_VALUE_SET_URL, USE_INLINE_CODES, FILTER_IN_MEMORY - profile_mode: OFF # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF + profile_mode: DECLARED # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF cdshooks: enabled: false diff --git a/src/main/resources/cds.application.yaml b/src/main/resources/cds.application.yaml index caa1e4b..8a734ae 100644 --- a/src/main/resources/cds.application.yaml +++ b/src/main/resources/cds.application.yaml @@ -124,7 +124,7 @@ hapi: data: search_parameter_mode: USE_SEARCH_PARAMETERS # AUTO, USE_SEARCH_PARAMETERS, FILTER_IN_MEMORY terminology_parameter_mode: FILTER_IN_MEMORY # AUTO, USE_VALUE_SET_URL, USE_INLINE_CODES, FILTER_IN_MEMORY - profile_mode: OFF # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF + profile_mode: DECLARED # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF cdshooks: enabled: true