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 5e35b3e..b8ae9d2 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -26,168 +26,178 @@ import java.sql.Driver;
@EnableTransactionManagement()
public class FhirServerConfigCommon {
- private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirServerConfigCommon.class);
+ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirServerConfigCommon.class);
- private Boolean enableIndexMissingFields = HapiProperties.getEnableIndexMissingFields();
- private Boolean autoCreatePlaceholderReferenceTargets = HapiProperties.getAutoCreatePlaceholderReferenceTargets();
- private Boolean enforceReferentialIntegrityOnWrite = HapiProperties.getEnforceReferentialIntegrityOnWrite();
- private Boolean enforceReferentialIntegrityOnDelete = HapiProperties.getEnforceReferentialIntegrityOnDelete();
- private Boolean allowContainsSearches = HapiProperties.getAllowContainsSearches();
- private Boolean allowMultipleDelete = HapiProperties.getAllowMultipleDelete();
- private Boolean allowExternalReferences = HapiProperties.getAllowExternalReferences();
- private Boolean expungeEnabled = HapiProperties.getExpungeEnabled();
- private Boolean allowPlaceholderReferences = HapiProperties.getAllowPlaceholderReferences();
- private Boolean subscriptionRestHookEnabled = HapiProperties.getSubscriptionRestHookEnabled();
- private Boolean subscriptionEmailEnabled = HapiProperties.getSubscriptionEmailEnabled();
- private Boolean allowOverrideDefaultSearchParams = HapiProperties.getAllowOverrideDefaultSearchParams();
- private String emailFrom = HapiProperties.getEmailFrom();
- private Boolean emailEnabled = HapiProperties.getEmailEnabled();
- private String emailHost = HapiProperties.getEmailHost();
- private Integer emailPort = HapiProperties.getEmailPort();
- private String emailUsername = HapiProperties.getEmailUsername();
- private String emailPassword = HapiProperties.getEmailPassword();
- @Autowired
- private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory;
+ private Boolean enableIndexMissingFields = HapiProperties.getEnableIndexMissingFields();
+ private Boolean autoCreatePlaceholderReferenceTargets = HapiProperties.getAutoCreatePlaceholderReferenceTargets();
+ private Boolean enforceReferentialIntegrityOnWrite = HapiProperties.getEnforceReferentialIntegrityOnWrite();
+ private Boolean enforceReferentialIntegrityOnDelete = HapiProperties.getEnforceReferentialIntegrityOnDelete();
+ private Boolean allowContainsSearches = HapiProperties.getAllowContainsSearches();
+ private Boolean allowMultipleDelete = HapiProperties.getAllowMultipleDelete();
+ private Boolean allowExternalReferences = HapiProperties.getAllowExternalReferences();
+ private Boolean expungeEnabled = HapiProperties.getExpungeEnabled();
+ private Boolean allowPlaceholderReferences = HapiProperties.getAllowPlaceholderReferences();
+ private Boolean subscriptionRestHookEnabled = HapiProperties.getSubscriptionRestHookEnabled();
+ private Boolean subscriptionEmailEnabled = HapiProperties.getSubscriptionEmailEnabled();
+ private Boolean allowOverrideDefaultSearchParams = HapiProperties.getAllowOverrideDefaultSearchParams();
+ private String emailFrom = HapiProperties.getEmailFrom();
+ private Boolean emailEnabled = HapiProperties.getEmailEnabled();
+ private String emailHost = HapiProperties.getEmailHost();
+ private Integer emailPort = HapiProperties.getEmailPort();
+ private String emailUsername = HapiProperties.getEmailUsername();
+ private String emailPassword = HapiProperties.getEmailPassword();
+ private Boolean emailAuth = HapiProperties.getEmailAuth();
+ private Boolean emailStartTlsEnable = HapiProperties.getEmailStartTlsEnable();
+ private Boolean emailStartTlsRequired = HapiProperties.getEmailStartTlsRequired();
+ private Boolean emailQuitWait = HapiProperties.getEmailQuitWait();
- public FhirServerConfigCommon() {
- ourLog.info("Server configured to " + (this.allowContainsSearches ? "allow" : "deny") + " contains searches");
- ourLog.info("Server configured to " + (this.allowMultipleDelete ? "allow" : "deny") + " multiple deletes");
- ourLog.info("Server configured to " + (this.allowExternalReferences ? "allow" : "deny") + " external references");
- ourLog.info("Server configured to " + (this.expungeEnabled ? "enable" : "disable") + " expunges");
- ourLog.info("Server configured to " + (this.allowPlaceholderReferences ? "allow" : "deny") + " placeholder references");
- ourLog.info("Server configured to " + (this.allowOverrideDefaultSearchParams ? "allow" : "deny") + " overriding default search params");
+ @Autowired
+ private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory;
- if (this.emailEnabled) {
- ourLog.info("Server is configured to enable email with host '" + this.emailHost + "' and port " + this.emailPort.toString());
- ourLog.info("Server will use '" + this.emailFrom + "' as the from email address");
+ public FhirServerConfigCommon() {
+ ourLog.info("Server configured to " + (this.allowContainsSearches ? "allow" : "deny") + " contains searches");
+ ourLog.info("Server configured to " + (this.allowMultipleDelete ? "allow" : "deny") + " multiple deletes");
+ ourLog.info("Server configured to " + (this.allowExternalReferences ? "allow" : "deny") + " external references");
+ ourLog.info("Server configured to " + (this.expungeEnabled ? "enable" : "disable") + " expunges");
+ ourLog.info("Server configured to " + (this.allowPlaceholderReferences ? "allow" : "deny") + " placeholder references");
+ ourLog.info("Server configured to " + (this.allowOverrideDefaultSearchParams ? "allow" : "deny") + " overriding default search params");
- if (this.emailUsername != null && this.emailUsername.length() > 0) {
- ourLog.info("Server is configured to use username '" + this.emailUsername + "' for email");
- }
+ if (this.emailEnabled) {
+ ourLog.info("Server is configured to enable email with host '" + this.emailHost + "' and port " + this.emailPort.toString());
+ ourLog.info("Server will use '" + this.emailFrom + "' as the from email address");
- if (this.emailPassword != null && this.emailPassword.length() > 0) {
- ourLog.info("Server is configured to use a password for email");
- }
- }
+ if (this.emailUsername != null && this.emailUsername.length() > 0) {
+ ourLog.info("Server is configured to use username '" + this.emailUsername + "' for email");
+ }
- if (this.subscriptionRestHookEnabled) {
- ourLog.info("REST-hook subscriptions enabled");
- }
-
- if (this.subscriptionEmailEnabled) {
- ourLog.info("Email subscriptions enabled");
- }
+ if (this.emailPassword != null && this.emailPassword.length() > 0) {
+ ourLog.info("Server is configured to use a password for email");
+ }
}
- /**
- * Configure FHIR properties around the the JPA server via this bean
- */
- @Bean()
- public DaoConfig daoConfig() {
- DaoConfig retVal = new DaoConfig();
-
- retVal.setIndexMissingFields(this.enableIndexMissingFields ? DaoConfig.IndexEnabledEnum.ENABLED : DaoConfig.IndexEnabledEnum.DISABLED);
- retVal.setAutoCreatePlaceholderReferenceTargets(this.autoCreatePlaceholderReferenceTargets);
- retVal.setEnforceReferentialIntegrityOnWrite(this.enforceReferentialIntegrityOnWrite);
- retVal.setEnforceReferentialIntegrityOnDelete(this.enforceReferentialIntegrityOnDelete);
- retVal.setAllowContainsSearches(this.allowContainsSearches);
- retVal.setAllowMultipleDelete(this.allowMultipleDelete);
- retVal.setAllowExternalReferences(this.allowExternalReferences);
- retVal.setExpungeEnabled(this.expungeEnabled);
- retVal.setAutoCreatePlaceholderReferenceTargets(this.allowPlaceholderReferences);
- retVal.setEmailFromAddress(this.emailFrom);
-
- Integer maxFetchSize = HapiProperties.getMaximumFetchSize();
- retVal.setFetchSizeDefaultMaximum(maxFetchSize);
- ourLog.info("Server configured to have a maximum fetch size of " + (maxFetchSize == Integer.MAX_VALUE ? "'unlimited'" : maxFetchSize));
-
- Long reuseCachedSearchResultsMillis = HapiProperties.getReuseCachedSearchResultsMillis();
- retVal.setReuseCachedSearchResultsForMillis(reuseCachedSearchResultsMillis);
- ourLog.info("Server configured to cache search results for {} milliseconds", reuseCachedSearchResultsMillis);
-
- Long retainCachedSearchesMinutes = HapiProperties.getExpireSearchResultsAfterMins();
- retVal.setExpireSearchResultsAfterMillis(retainCachedSearchesMinutes * 60 * 1000);
-
- // Subscriptions are enabled by channel type
- if (HapiProperties.getSubscriptionRestHookEnabled()) {
- ourLog.info("Enabling REST-hook subscriptions");
- retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
- }
- if (HapiProperties.getSubscriptionEmailEnabled()) {
- ourLog.info("Enabling email subscriptions");
- retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
- }
- if (HapiProperties.getSubscriptionWebsocketEnabled()) {
- ourLog.info("Enabling websocket subscriptions");
- retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET);
- }
-
- retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled());
-
- return retVal;
+ if (this.subscriptionRestHookEnabled) {
+ ourLog.info("REST-hook subscriptions enabled");
}
- @Bean
- public ModelConfig modelConfig() {
- ModelConfig modelConfig = new ModelConfig();
- modelConfig.setAllowContainsSearches(this.allowContainsSearches);
- modelConfig.setAllowExternalReferences(this.allowExternalReferences);
- modelConfig.setDefaultSearchParamsCanBeOverridden(this.allowOverrideDefaultSearchParams);
- modelConfig.setEmailFromAddress(this.emailFrom);
+ if (this.subscriptionEmailEnabled) {
+ ourLog.info("Email subscriptions enabled");
+ }
+ }
- // You can enable these if you want to support Subscriptions from your server
- if (this.subscriptionRestHookEnabled) {
- modelConfig.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
- }
+ /**
+ * Configure FHIR properties around the the JPA server via this bean
+ */
+ @Bean()
+ public DaoConfig daoConfig() {
+ DaoConfig retVal = new DaoConfig();
- if (this.subscriptionEmailEnabled) {
- modelConfig.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
- }
+ retVal.setIndexMissingFields(this.enableIndexMissingFields ? DaoConfig.IndexEnabledEnum.ENABLED : DaoConfig.IndexEnabledEnum.DISABLED);
+ retVal.setAutoCreatePlaceholderReferenceTargets(this.autoCreatePlaceholderReferenceTargets);
+ retVal.setEnforceReferentialIntegrityOnWrite(this.enforceReferentialIntegrityOnWrite);
+ retVal.setEnforceReferentialIntegrityOnDelete(this.enforceReferentialIntegrityOnDelete);
+ retVal.setAllowContainsSearches(this.allowContainsSearches);
+ retVal.setAllowMultipleDelete(this.allowMultipleDelete);
+ retVal.setAllowExternalReferences(this.allowExternalReferences);
+ retVal.setExpungeEnabled(this.expungeEnabled);
+ retVal.setAutoCreatePlaceholderReferenceTargets(this.allowPlaceholderReferences);
+ retVal.setEmailFromAddress(this.emailFrom);
- return modelConfig;
+ Integer maxFetchSize = HapiProperties.getMaximumFetchSize();
+ retVal.setFetchSizeDefaultMaximum(maxFetchSize);
+ ourLog.info("Server configured to have a maximum fetch size of " + (maxFetchSize == Integer.MAX_VALUE ? "'unlimited'" : maxFetchSize));
+
+ Long reuseCachedSearchResultsMillis = HapiProperties.getReuseCachedSearchResultsMillis();
+ retVal.setReuseCachedSearchResultsForMillis(reuseCachedSearchResultsMillis);
+ ourLog.info("Server configured to cache search results for {} milliseconds", reuseCachedSearchResultsMillis);
+
+ Long retainCachedSearchesMinutes = HapiProperties.getExpireSearchResultsAfterMins();
+ retVal.setExpireSearchResultsAfterMillis(retainCachedSearchesMinutes * 60 * 1000);
+
+ // Subscriptions are enabled by channel type
+ if (HapiProperties.getSubscriptionRestHookEnabled()) {
+ ourLog.info("Enabling REST-hook subscriptions");
+ retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
+ }
+ if (HapiProperties.getSubscriptionEmailEnabled()) {
+ ourLog.info("Enabling email subscriptions");
+ retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
+ }
+ if (HapiProperties.getSubscriptionWebsocketEnabled()) {
+ ourLog.info("Enabling websocket subscriptions");
+ retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET);
}
- /**
- * The following bean configures the database connection. The 'url' property value of "jdbc:derby:directory:jpaserver_derby_files;create=true" indicates that the server should save resources in a
- * directory called "jpaserver_derby_files".
- *
- * A URL to a remote database could also be placed here, along with login credentials and other properties supported by BasicDataSource.
- */
- @Bean(destroyMethod = "close")
- public BasicDataSource dataSource() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
- BasicDataSource retVal = new BasicDataSource();
- Driver driver = (Driver) Class.forName(HapiProperties.getDataSourceDriver()).getConstructor().newInstance();
- retVal.setDriver(driver);
- retVal.setUrl(HapiProperties.getDataSourceUrl());
- retVal.setUsername(HapiProperties.getDataSourceUsername());
- retVal.setPassword(HapiProperties.getDataSourcePassword());
- retVal.setMaxTotal(HapiProperties.getDataSourceMaxPoolSize());
- return retVal;
+ retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled());
+
+ return retVal;
+ }
+
+ @Bean
+ public ModelConfig modelConfig() {
+ ModelConfig modelConfig = new ModelConfig();
+ modelConfig.setAllowContainsSearches(this.allowContainsSearches);
+ modelConfig.setAllowExternalReferences(this.allowExternalReferences);
+ modelConfig.setDefaultSearchParamsCanBeOverridden(this.allowOverrideDefaultSearchParams);
+ modelConfig.setEmailFromAddress(this.emailFrom);
+
+ // You can enable these if you want to support Subscriptions from your server
+ if (this.subscriptionRestHookEnabled) {
+ modelConfig.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
}
- @Lazy
- @Bean
- public IBinaryStorageSvc binaryStorageSvc() {
- return new DatabaseBlobBinaryStorageSvcImpl();
+ if (this.subscriptionEmailEnabled) {
+ modelConfig.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
}
- @Bean()
- public IEmailSender emailSender() {
- if (this.emailEnabled) {
- JavaMailEmailSender retVal = new JavaMailEmailSender();
+ return modelConfig;
+ }
- retVal.setSmtpServerHostname(this.emailHost);
- retVal.setSmtpServerPort(this.emailPort);
- retVal.setSmtpServerUsername(this.emailUsername);
- retVal.setSmtpServerPassword(this.emailPassword);
+ /**
+ * The following bean configures the database connection. The 'url' property value of "jdbc:derby:directory:jpaserver_derby_files;create=true" indicates that the server should save resources in a
+ * directory called "jpaserver_derby_files".
+ *
+ * A URL to a remote database could also be placed here, along with login credentials and other properties supported by BasicDataSource.
+ */
+ @Bean(destroyMethod = "close")
+ public BasicDataSource dataSource() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
+ BasicDataSource retVal = new BasicDataSource();
+ Driver driver = (Driver) Class.forName(HapiProperties.getDataSourceDriver()).getConstructor().newInstance();
+ retVal.setDriver(driver);
+ retVal.setUrl(HapiProperties.getDataSourceUrl());
+ retVal.setUsername(HapiProperties.getDataSourceUsername());
+ retVal.setPassword(HapiProperties.getDataSourcePassword());
+ retVal.setMaxTotal(HapiProperties.getDataSourceMaxPoolSize());
+ return retVal;
+ }
- Validate.notNull(mySubscriptionDeliveryHandlerFactory, "No subscription delivery handler");
- mySubscriptionDeliveryHandlerFactory.setEmailSender(retVal);
+ @Lazy
+ @Bean
+ public IBinaryStorageSvc binaryStorageSvc() {
+ return new DatabaseBlobBinaryStorageSvcImpl();
+ }
+
+ @Bean()
+ public IEmailSender emailSender() {
+ if (this.emailEnabled) {
+ JavaMailEmailSender retVal = new JavaMailEmailSender();
+
+ retVal.setSmtpServerHostname(this.emailHost);
+ retVal.setSmtpServerPort(this.emailPort);
+ retVal.setSmtpServerUsername(this.emailUsername);
+ retVal.setSmtpServerPassword(this.emailPassword);
+ // TODO KHS add these when HAPI 4.2.0 is released
+// retVal.setAuth(this.emailAuth);
+// retVal.setStartTlsEnable(this.emailStartTlsEnable);
+// retVal.setStartTlsRequired(this.emailStartTlsRequired);
+// retVal.setQuitWait(this.emailQuitWait);
+
+ Validate.notNull(mySubscriptionDeliveryHandlerFactory, "No subscription delivery handler");
+ mySubscriptionDeliveryHandlerFactory.setEmailSender(retVal);
- return retVal;
- }
-
- return null;
+ return retVal;
}
+
+ return null;
+ }
}
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
index 01eb7d7..e58490d 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
@@ -406,6 +406,12 @@ public class HapiProperties {
return HapiProperties.getProperty("email.password");
}
+ // Defaults from https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html
+ public static Boolean getEmailAuth() { return HapiProperties.getBooleanProperty("email.auth", false); }
+ public static Boolean getEmailStartTlsEnable() { return HapiProperties.getBooleanProperty("email.starttls.enable", false); }
+ public static Boolean getEmailStartTlsRequired() { return HapiProperties.getBooleanProperty("email.starttls.required", false); }
+ public static Boolean getEmailQuitWait() { return HapiProperties.getBooleanProperty("email.quitwait", true); }
+
public static Long getReuseCachedSearchResultsMillis() {
String value = HapiProperties.getProperty(REUSE_CACHED_SEARCH_RESULTS_MILLIS, "60000");
return Long.valueOf(value);