From 1e8e64d26594321e88880558665b7632407ac296 Mon Sep 17 00:00:00 2001
From: Ken Stevens <khstevens@gmail.com>
Date: Mon, 27 Apr 2020 13:21:01 -0400
Subject: [PATCH] confirmed empi works

---
 .../fhir/jpa/starter/FhirServerConfigCommon.java  | 15 ++++++++++++++-
 .../ca/uhn/fhir/jpa/starter/JpaRestfulServer.java |  4 ++++
 src/main/resources/hapi.properties                |  5 +++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
index 5647d03..c36c668 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -3,10 +3,14 @@ package ca.uhn.fhir.jpa.starter;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
 import ca.uhn.fhir.jpa.binstore.DatabaseBlobBinaryStorageSvcImpl;
 import ca.uhn.fhir.jpa.binstore.IBinaryStorageSvc;
+import ca.uhn.fhir.jpa.model.config.PartitionSettings;
 import ca.uhn.fhir.jpa.model.entity.ModelConfig;
+import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
 import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory;
+import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig;
 import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender;
 import ca.uhn.fhir.jpa.subscription.match.deliver.email.JavaMailEmailSender;
+import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.hl7.fhir.dstu2.model.Subscription;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +29,11 @@ import java.sql.Driver;
  */
 @Configuration
 @EnableTransactionManagement
-@Import(EmpiConfig.class)
+@Import({EmpiConfig.class,
+  SubscriptionSubmitterConfig.class,
+  SubscriptionProcessorConfig.class,
+  SubscriptionChannelConfig.class
+})
 public class FhirServerConfigCommon {
 
   private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirServerConfigCommon.class);
@@ -208,4 +216,9 @@ public class FhirServerConfigCommon {
 
     return null;
   }
+
+  @Bean
+  public PartitionSettings partitionSettings() {
+    return new PartitionSettings();
+  }
 }
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
index e32148e..62fc7be 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
@@ -288,6 +288,8 @@ public class JpaRestfulServer extends RestfulServer {
 
     // Validation
     IValidatorModule validatorModule;
+    // FIXME KHS
+    /*
     switch (fhirVersion) {
             case DSTU2:
                 validatorModule = appCtx.getBean("myInstanceValidatorDstu2", IValidatorModule.class);
@@ -308,6 +310,8 @@ public class JpaRestfulServer extends RestfulServer {
         validatorModule = null;
         break;
     }
+    */
+    validatorModule = appCtx.getBean(IValidatorModule.class);
     if (validatorModule != null) {
       if (HapiProperties.getValidateRequestsEnabled()) {
         RequestValidatingInterceptor interceptor = new RequestValidatingInterceptor();
diff --git a/src/main/resources/hapi.properties b/src/main/resources/hapi.properties
index 991bd28..5abe2b1 100644
--- a/src/main/resources/hapi.properties
+++ b/src/main/resources/hapi.properties
@@ -147,3 +147,8 @@ email.password=
 
 # Enable Websocket Subscription Channel
 subscription.websocket.enabled=false
+
+########
+# EMPI
+########
+empi.enabled=false