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

Try to fix injection errors.

Browse Source
This commit is contained in:
Luke deGruchy
2025-03-07 14:48:41 -05:00
committed by Brenin Rhodes
parent 8147c4ea4b
commit 49f47db115
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ import org.opencds.cqf.fhir.cr.hapi.cdshooks.CdsCrSettings;
import org.opencds.cqf.fhir.cr.hapi.cdshooks.ICdsCrServiceRegistry; 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.CrCdsConfig; import org.opencds.cqf.fhir.cr.hapi.config.CrCdsHooksConfig;
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,8 +22,9 @@ import org.springframework.context.annotation.Import;
@Configuration @Configuration
@Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class}) @Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class})
//@Import({CdsHooksConfig.class, CrCommonConfig.class}) // LUKETODO: Config missing ICdsServiceRegistry
@Import({CrCdsConfig.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 // @Bean

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

@@ -20,7 +20,7 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.opencds.cqf.fhir.cr.hapi.config.CrCdsConfig; 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.RepositoryConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
Application.class, Application.class,
NicknameServiceConfig.class, NicknameServiceConfig.class,
RepositoryConfig.class, RepositoryConfig.class,
CrCdsConfig.class, CrCdsHooksConfig.class,
StarterCdsHooksConfig.class StarterCdsHooksConfig.class
}, properties = { }, properties = {
"spring.profiles.include=storageSettingsTest", "spring.profiles.include=storageSettingsTest",
@@ -116,7 +116,7 @@ class CdsHooksServletIT implements IServerSupport {
} }
@Test @Test
void testCdsHooks() throws IOException, InterruptedException { void testCdsHooks() throws IOException {
loadBundle("r4/HelloWorld-Bundle.json", ourCtx, ourClient); loadBundle("r4/HelloWorld-Bundle.json", ourCtx, ourClient);
await().atMost(10000, TimeUnit.MILLISECONDS).until(() -> hasCdsServices()); await().atMost(10000, TimeUnit.MILLISECONDS).until(() -> hasCdsServices());
var cdsRequest = "{\n" + var cdsRequest = "{\n" +