Fix #122 - EMPI error on startup when EMPI not enabled

src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java

@@ -1,15 +1,11 @@
-package ca.uhn.fhir.jpa.starter;
+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.subscription.channel.subscription.IChannelNamer;
-import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
+import ca.uhn.fhir.jpa.starter.HapiProperties;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -17,6 +13,10 @@ import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 
+/**
+ * TODO: Move this to package "ca.uhn.fhir.jpa.starter" in HAPI FHIR 5.2.0+. The lousy component scan
+ * in 5.1.0 picks this up even if EMPI is disabled currently.
+ */
 @Configuration
 public class EmpiConfig {
 

src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java

@@ -1,6 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.jpa.empi.EmpiConfig;
 import ca.uhn.fhir.jpa.empi.config.EmpiConsumerConfig;
 import ca.uhn.fhir.jpa.empi.config.EmpiSubmitterConfig;
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;

src/main/resources/empi-rules.json

@@ -1,4 +1,5 @@
 {
+  "version": "1",
   "candidateSearchParams": [
     {
       "resourceType": "Patient",