From 49f47db115ceedd199756b9ac043a1203a558869 Mon Sep 17 00:00:00 2001
From: Luke deGruchy <luke.degruchy@smiledigitalhealth.com>
Date: Fri, 7 Mar 2025 14:48:41 -0500
Subject: [PATCH] Try to fix injection errors.

---
 .../fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java   | 7 ++++---
 .../java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

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 2d3535a..77f234e 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
@@ -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.discovery.CdsCrDiscoveryServiceRegistry;
 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.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -22,8 +22,9 @@ import org.springframework.context.annotation.Import;
 
 @Configuration
 @Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class})
-//@Import({CdsHooksConfig.class, CrCommonConfig.class})
-@Import({CrCdsConfig.class, CrCommonConfig.class})
+// LUKETODO:  Config missing ICdsServiceRegistry
+// LUKETODO:  HAPI-1653: Provider not supported for the current FHIR version
+@Import({CrCdsHooksConfig.class, CrCommonConfig.class})
 public class StarterCdsHooksConfig {
 
 	//	@Bean
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java b/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
index 112a88e..8ce9ff9 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
@@ -20,7 +20,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.junit.jupiter.api.BeforeEach;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 		Application.class,
 		NicknameServiceConfig.class,
 		RepositoryConfig.class,
-		CrCdsConfig.class,
+		CrCdsHooksConfig.class,
 		StarterCdsHooksConfig.class
 	}, properties = {
 	"spring.profiles.include=storageSettingsTest",
@@ -116,7 +116,7 @@ class CdsHooksServletIT implements IServerSupport {
 	}
 
 	@Test
-	void testCdsHooks() throws IOException, InterruptedException {
+	void testCdsHooks() throws IOException {
 		loadBundle("r4/HelloWorld-Bundle.json", ourCtx, ourClient);
 		await().atMost(10000, TimeUnit.MILLISECONDS).until(() -> hasCdsServices());
 		var cdsRequest = "{\n" +