Merge pull request #89 from hapifhir/rel_5_0_0

Start 5.0.0 release branch

Author: jamesagnew

.travis.yml

@@ -29,7 +29,7 @@ before_script:
   - sudo chown -R travis:travis "$HOME/.m2/repository";
 
 script:
-  - mvn -U install
+  - mvn -B install
 
 
 

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>4.2.0</version>
+        <version>5.0.0</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>

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

@@ -1,28 +1,40 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
+import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig;
+import ca.uhn.fhir.jpa.subscription.match.config.WebsocketDispatcherConfig;
+import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 public class ApplicationContext extends AnnotationConfigWebApplicationContext {
 
-    public ApplicationContext() {
-        FhirVersionEnum fhirVersion = HapiProperties.getFhirVersion();
-        if (fhirVersion == FhirVersionEnum.DSTU2) {
-            register(FhirServerConfigDstu2.class, FhirServerConfigCommon.class);
-        } else if (fhirVersion == FhirVersionEnum.DSTU3) {
-            register(FhirServerConfigDstu3.class, FhirServerConfigCommon.class);
-        } else if (fhirVersion == FhirVersionEnum.R4) {
-            register(FhirServerConfigR4.class, FhirServerConfigCommon.class);
-        } else if (fhirVersion == FhirVersionEnum.R5) {
-            register(FhirServerConfigR5.class, FhirServerConfigCommon.class);
-        } else {
-            throw new IllegalStateException();
-        }
+  public ApplicationContext() {
+    FhirVersionEnum fhirVersion = HapiProperties.getFhirVersion();
+    if (fhirVersion == FhirVersionEnum.DSTU2) {
+      register(FhirServerConfigDstu2.class, FhirServerConfigCommon.class);
+    } else if (fhirVersion == FhirVersionEnum.DSTU3) {
+      register(FhirServerConfigDstu3.class, FhirServerConfigCommon.class);
+    } else if (fhirVersion == FhirVersionEnum.R4) {
+      register(FhirServerConfigR4.class, FhirServerConfigCommon.class);
+    } else if (fhirVersion == FhirVersionEnum.R5) {
+      register(FhirServerConfigR5.class, FhirServerConfigCommon.class);
+    } else {
+      throw new IllegalStateException();
+    }
 
-        if (HapiProperties.getSubscriptionWebsocketEnabled()) {
-            register(ca.uhn.fhir.jpa.config.WebsocketDispatcherConfig.class);
-        }
+    if (HapiProperties.getSubscriptionWebsocketEnabled()) {
+      register(WebsocketDispatcherConfig.class);
+    }
 
+    if (HapiProperties.getSubscriptionEmailEnabled()
+    || HapiProperties.getSubscriptionRestHookEnabled()
+    || HapiProperties.getSubscriptionWebsocketEnabled()) {
+      register(SubscriptionSubmitterConfig.class);
+      register(SubscriptionProcessorConfig.class);
+      register(SubscriptionChannelConfig.class);
     }
 
+  }
+
 }

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

@@ -1,14 +1,16 @@
 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.dao.DaoConfig;
+import ca.uhn.fhir.jpa.model.config.PartitionSettings;
 import ca.uhn.fhir.jpa.model.entity.ModelConfig;
-import ca.uhn.fhir.jpa.subscription.module.channel.SubscriptionDeliveryHandlerFactory;
-import ca.uhn.fhir.jpa.subscription.module.subscriber.email.IEmailSender;
-import ca.uhn.fhir.jpa.subscription.module.subscriber.email.JavaMailEmailSender;
+import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory;
+import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender;
+import ca.uhn.fhir.jpa.subscription.match.deliver.email.JavaMailEmailSender;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.hl7.fhir.dstu2.model.Subscription;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -50,9 +52,8 @@ public class FhirServerConfigCommon {
   private Boolean emailStartTlsEnable = HapiProperties.getEmailStartTlsEnable();
   private Boolean emailStartTlsRequired = HapiProperties.getEmailStartTlsRequired();
   private Boolean emailQuitWait = HapiProperties.getEmailQuitWait();
-
   @Autowired
-  private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory;
+  private ApplicationContext myAppCtx;
 
   public FhirServerConfigCommon() {
     ourLog.info("Server configured to " + (this.allowContainsSearches ? "allow" : "deny") + " contains searches");
@@ -116,22 +117,28 @@ public DaoConfig daoConfig() {
     // Subscriptions are enabled by channel type
     if (HapiProperties.getSubscriptionRestHookEnabled()) {
       ourLog.info("Enabling REST-hook subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.RESTHOOK);
     }
     if (HapiProperties.getSubscriptionEmailEnabled()) {
       ourLog.info("Enabling email subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.EMAIL);
     }
     if (HapiProperties.getSubscriptionWebsocketEnabled()) {
       ourLog.info("Enabling websocket subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.WEBSOCKET);
     }
 
     retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled());
 
     return retVal;
   }
 
+  @Bean
+  public PartitionSettings partitionSettings() {
+    return new PartitionSettings();
+  }
+
+
   @Bean
   public ModelConfig modelConfig() {
     ModelConfig modelConfig = new ModelConfig();
@@ -197,8 +204,9 @@ public IEmailSender emailSender() {
 //      retVal.setStartTlsRequired(this.emailStartTlsRequired);
 //      retVal.setQuitWait(this.emailQuitWait);
 
-      Validate.notNull(mySubscriptionDeliveryHandlerFactory, "No subscription delivery handler");
-      mySubscriptionDeliveryHandlerFactory.setEmailSender(retVal);
+      SubscriptionDeliveryHandlerFactory subscriptionDeliveryHandlerFactory = myAppCtx.getBean(SubscriptionDeliveryHandlerFactory.class);
+      Validate.notNull(subscriptionDeliveryHandlerFactory, "No subscription delivery handler");
+      subscriptionDeliveryHandlerFactory.setEmailSender(retVal);
 
 
       return retVal;

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

@@ -485,5 +485,9 @@ private static <T extends Enum> T getPropertyEnum(String thePropertyName, Class<
   public static boolean getBulkExportEnabled() {
     return HapiProperties.getBooleanProperty(BULK_EXPORT_ENABLED, true);
   }
+
+  public static boolean isFhirPathFilterInterceptorEnabled() {
+    return HapiProperties.getBooleanProperty("fhirpath_interceptor.enabled", false);
+  }
 }