Remove all traces of EMPI since it has been replaced in master with MDM.

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

@@ -1,45 +0,0 @@
-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.config.EmpiConsumerConfig;
-import ca.uhn.fhir.jpa.empi.config.EmpiSubmitterConfig;
-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.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.io.DefaultResourceLoader;
-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
-@Conditional(EmpiConfigCondition.class)
-@Import({EmpiConsumerConfig.class, EmpiSubmitterConfig.class})
-public class EmpiConfig {
-
-  @Bean
-  EmpiRuleValidator empiRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
-    return new EmpiRuleValidator(theFhirContext, theSearchParamRetriever);
-  }
-
-  @Bean
-  IEmpiSettings empiSettings(@Autowired EmpiRuleValidator theEmpiRuleValidator, AppProperties appProperties) throws IOException {
-    DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
-    Resource resource = resourceLoader.getResource("empi-rules.json");
-    String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
-    return new EmpiSettings(theEmpiRuleValidator).setEnabled(appProperties.getEmpi_enabled()).setScriptText(json);
-  }
-
-}

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

@@ -1,13 +0,0 @@
-package ca.uhn.fhir.jpa.empi;
-
-import org.springframework.context.annotation.Condition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-public class EmpiConfigCondition implements Condition {
-  @Override
-  public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata metadata) {
-    String property = conditionContext.getEnvironment().getProperty("hapi.fhir.empi_enabled");
-    return Boolean.parseBoolean(property);
-  }
-}

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

@@ -17,14 +17,12 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-
 @ConfigurationProperties(prefix = "hapi.fhir")
 @Configuration
 @EnableConfigurationProperties
 public class AppProperties {
 
   private Boolean cql_enabled = false;
-  private Boolean empi_enabled = false;
   private Boolean allow_cascading_deletes = false;
   private Boolean allow_contains_searches = true;
   private Boolean allow_external_references = false;
@@ -99,14 +97,6 @@ public class AppProperties {
     this.cql_enabled = cql_enabled;
   }
 
-  public Boolean getEmpi_enabled() {
-    return empi_enabled;
-  }
-
-  public void setEmpi_enabled(Boolean empi_enabled) {
-    this.empi_enabled = empi_enabled;
-  }
-
   public Cors getCors() {
     return cors;
   }

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

@@ -1,6 +1,5 @@
 package ca.uhn.fhir.jpa.starter;
 
-import ca.uhn.fhir.jpa.empi.EmpiConfig;
 import ca.uhn.fhir.jpa.starter.annotations.OnEitherVersion;
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
 import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig;
@@ -24,7 +23,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 @ServletComponentScan(basePackageClasses = {
   JpaRestfulServer.class})
 @SpringBootApplication(exclude = {ElasticsearchRestClientAutoConfiguration.class})
-@Import({SubscriptionSubmitterConfig.class, SubscriptionProcessorConfig.class, SubscriptionChannelConfig.class, WebsocketDispatcherConfig.class, EmpiConfig.class})
+@Import({SubscriptionSubmitterConfig.class, SubscriptionProcessorConfig.class, SubscriptionChannelConfig.class, WebsocketDispatcherConfig.class})
 public class Application extends SpringBootServletInitializer {
 
   public static void main(String[] args) {

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

@@ -3,7 +3,6 @@ package ca.uhn.fhir.jpa.starter;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.cql.common.provider.CqlProviderLoader;
-import ca.uhn.fhir.empi.provider.EmpiProviderLoader;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
@@ -100,10 +99,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
 
   // These are set only if the features are enabled
   private CqlProviderLoader cqlProviderLoader;
-  private EmpiProviderLoader empiProviderLoader;
 
   public BaseJpaRestfulServer() {
-
   }
 
   private static final long serialVersionUID = 1L;

src/main/resources/application.yaml

@@ -55,7 +55,6 @@ hapi:
 #    allow_placeholder_references: true
 #    auto_create_placeholder_reference_targets: false
 #    cql_enabled: true
-#    empi_enabled: false
 #    default_encoding: JSON
 #    default_pretty_print: true
 #    default_page_size: 20