From ae97eabdfcbfa8edfb8904690c65baeec9b15da4 Mon Sep 17 00:00:00 2001
From: jvi <jvi@trifork.com>
Date: Wed, 9 Sep 2020 11:49:54 +0200
Subject: [PATCH] Added beans to complete the required graph

---
 .../java/ca/uhn/fhir/jpa/empi/EmpiConfig.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java b/src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java
index fd6e5c8..3fb9152 100644
--- a/src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java
+++ b/src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java
@@ -1,13 +1,18 @@
 package ca.uhn.fhir.jpa.empi;
 
+import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.empi.api.IEmpiSettings;
 import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
 import ca.uhn.fhir.empi.rules.config.EmpiSettings;
+import ca.uhn.fhir.jpa.empi.svc.EmpiSearchParamSvc;
 import ca.uhn.fhir.jpa.starter.AppProperties;
+import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -23,6 +28,17 @@ import java.io.IOException;
 @Conditional(EmpiConfigCondition.class)
 public class EmpiConfig {
 
+  @Bean
+  EmpiRuleValidator empiRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
+    return new EmpiRuleValidator(theFhirContext, theSearchParamRetriever);
+  }
+
+  @Bean
+  EmpiSearchParamSvc empiSearchParamSvc() {
+    return new EmpiSearchParamSvc();
+  }
+
+
   @Bean
   IEmpiSettings empiSettings(@Autowired EmpiRuleValidator theEmpiRuleValidator, AppProperties appProperties) throws IOException {
     DefaultResourceLoader resourceLoader = new DefaultResourceLoader();