Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix config

Browse Source
This commit is contained in:
Brenin Rhodes
2025-03-09 13:24:28 -06:00
committed by Brenin Rhodes
parent bbb5ab0d37
commit f64f1beba6
5 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java
View File

@@ -13,6 +13,8 @@ import org.opencds.cqf.fhir.cr.hapi.cdshooks.ICdsCrServiceRegistry;
import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CdsCrDiscoveryServiceRegistry; import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CdsCrDiscoveryServiceRegistry;
import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.ICdsCrDiscoveryServiceRegistry; import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.ICdsCrDiscoveryServiceRegistry;
import org.opencds.cqf.fhir.cr.hapi.config.CrCdsHooksConfig; import org.opencds.cqf.fhir.cr.hapi.config.CrCdsHooksConfig;
import org.opencds.cqf.fhir.cr.hapi.config.RepositoryConfig;
import org.opencds.cqf.fhir.cr.hapi.config.test.TestCdsHooksConfig;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -22,24 +24,9 @@ import org.springframework.context.annotation.Import;
@Configuration @Configuration
@Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class}) @Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class})
// LUKETODO: Config missing ICdsServiceRegistry @Import({RepositoryConfig.class, TestCdsHooksConfig.class, CrCdsHooksConfig.class, CrCommonConfig.class})
// LUKETODO: HAPI-1653: Provider not supported for the current FHIR version
@Import({CrCdsHooksConfig.class, CrCommonConfig.class})
public class StarterCdsHooksConfig { public class StarterCdsHooksConfig {
// @Bean
// CdsPrefetchSvc cdsPrefetchSvc(
// CdsResolutionStrategySvc theCdsResolutionStrategySvc,
// CdsPrefetchDaoSvc theResourcePrefetchDao,
// CdsPrefetchFhirClientSvc theResourcePrefetchFhirClient,
// ICdsHooksDaoAuthorizationSvc theCdsHooksDaoAuthorizationSvc) {
// return new ModuleConfigurationPrefetchSvc(
// theCdsResolutionStrategySvc,
// theResourcePrefetchDao,
// theResourcePrefetchFhirClient,
// theCdsHooksDaoAuthorizationSvc);
// }
@Bean @Bean
public ICdsCrDiscoveryServiceRegistry cdsCrDiscoveryServiceRegistry() { public ICdsCrDiscoveryServiceRegistry cdsCrDiscoveryServiceRegistry() {
CdsCrDiscoveryServiceRegistry registry = new CdsCrDiscoveryServiceRegistry(); CdsCrDiscoveryServiceRegistry registry = new CdsCrDiscoveryServiceRegistry();

2
src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
View File

@@ -5,7 +5,7 @@ import org.opencds.cqf.fhir.cr.hapi.config.dstu3.CrDstu3Config;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.DataRequirementsOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.dstu3.DataRequirementsOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.EvaluateOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.dstu3.EvaluateOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.PackageOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.dstu3.PackageOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.r4.ApplyOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.dstu3.ApplyOperationConfig;
import org.springframework.context.annotation.*; import org.springframework.context.annotation.*;
@Configuration @Configuration

6
src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
View File

@@ -1,9 +1,9 @@
package ca.uhn.fhir.jpa.starter.cr; package ca.uhn.fhir.jpa.starter.cr;
import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition; import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.DataRequirementsOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.r4.DataRequirementsOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.EvaluateOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.r4.EvaluateOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.dstu3.PackageOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.r4.PackageOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.r4.ApplyOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.r4.ApplyOperationConfig;
import org.opencds.cqf.fhir.cr.hapi.config.r4.CrR4Config; import org.opencds.cqf.fhir.cr.hapi.config.r4.CrR4Config;
import org.opencds.cqf.fhir.cr.hapi.config.r4.ExtractOperationConfig; import org.opencds.cqf.fhir.cr.hapi.config.r4.ExtractOperationConfig;

2
src/main/resources/application.yaml
View File

@@ -123,7 +123,7 @@ hapi:
data: data:
search_parameter_mode: USE_SEARCH_PARAMETERS # AUTO, USE_SEARCH_PARAMETERS, FILTER_IN_MEMORY 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 terminology_parameter_mode: FILTER_IN_MEMORY # AUTO, USE_VALUE_SET_URL, USE_INLINE_CODES, FILTER_IN_MEMORY
profile_mode: DECLARED # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF profile_mode: OFF # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF
cdshooks: cdshooks:
enabled: false enabled: false

2
src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
View File

@@ -40,8 +40,8 @@ import static org.junit.jupiter.api.Assertions.fail;
Application.class, Application.class,
NicknameServiceConfig.class, NicknameServiceConfig.class,
RepositoryConfig.class, RepositoryConfig.class,
CrCdsHooksConfig.class,
TestCdsHooksConfig.class, TestCdsHooksConfig.class,
CrCdsHooksConfig.class,
StarterCdsHooksConfig.class StarterCdsHooksConfig.class
}, properties = { }, properties = {
"spring.profiles.include=storageSettingsTest", "spring.profiles.include=storageSettingsTest",