Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nih-testing

Browse Source 
* master:
  Update application.yaml
  Bumped version of Spring Boot in order to fix same issue as https://github.com/Haulmont/jmix-security/issues/90
  Upgraded to 5.6.0 Subscription tests fail ...
  Added OpenAPI / Swagger option
  simplified helm chart
  build ARM-compatible images
  bumped dependencies to latest
  only push build images to DockerHub
  Adds ability to change HAPI FHIR JPA server's port with the environment variable server.port
  Adds ability to control the number of executor threads through environment variables server.tomcat.max-threads and server.tomcat.min-spare-threads.  There is not a breaking change and does not affect the function of the JPA server unless these environment variables are set.
  Adds ability to use delete-expunge operations to the JPA Starter Server.

# Conflicts:
#	pom.xml
#	src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
#	src/main/java/ca/uhn/fhir/jpa/starter/Application.java
#	src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java
This commit is contained in:
Michael Buckley
2021-12-09 14:53:03 -05:00
parent 097db1642f 0203a36668
commit 2512616951
33 changed files with 680 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
View File

@@ -43,6 +43,7 @@ public class FhirServerConfigCommon {
ourLog.info("Server configured to " + (appProperties.getAllow_contains_searches() ? "allow" : "deny") + " contains searches");
ourLog.info("Server configured to " + (appProperties.getAllow_multiple_delete() ? "allow" : "deny") + " multiple deletes");
ourLog.info("Server configured to " + (appProperties.getAllow_external_references() ? "allow" : "deny") + " external references");
ourLog.info("Server configured to " + (appProperties.getDelete_expunge_enabled() ? "enable" : "disable") + " delete expunges");
ourLog.info("Server configured to " + (appProperties.getExpunge_enabled() ? "enable" : "disable") + " expunges");
ourLog.info("Server configured to " + (appProperties.getAllow_override_default_search_params() ? "allow" : "deny") + " overriding default search params");
ourLog.info("Server configured to " + (appProperties.getAuto_create_placeholder_reference_targets() ? "allow" : "disable") + " auto-creating placeholder references");
@@ -88,6 +89,7 @@ public class FhirServerConfigCommon {
retVal.setAllowContainsSearches(appProperties.getAllow_contains_searches());
retVal.setAllowMultipleDelete(appProperties.getAllow_multiple_delete());
retVal.setAllowExternalReferences(appProperties.getAllow_external_references());
retVal.setDeleteExpungeEnabled(appProperties.getDelete_expunge_enabled());
retVal.setExpungeEnabled(appProperties.getExpunge_enabled());
if(appProperties.getSubscription() != null && appProperties.getSubscription().getEmail() != null)
retVal.setEmailFromAddress(appProperties.getSubscription().getEmail().getFrom());
@@ -214,20 +216,22 @@ public class FhirServerConfigCommon {
@Bean()
public IEmailSender emailSender(AppProperties appProperties, Optional<SubscriptionDeliveryHandlerFactory> subscriptionDeliveryHandlerFactory) {
if (appProperties.getSubscription() != null && appProperties.getSubscription().getEmail() != null) {
AppProperties.Subscription.Email email = appProperties.getSubscription().getEmail();
MailConfig mailConfig = new MailConfig();
mailConfig.setSmtpHostname(email.getHost());
mailConfig.setSmtpUseStartTLS(email.getStartTlsRequired());
mailConfig.setSmtpPort(email.getPort());
mailConfig.setSmtpUsername(email.getUsername());
mailConfig.setSmtpPassword(email.getPassword());
EmailSenderImpl emailSender = new EmailSenderImpl(mailConfig);
if(subscriptionDeliveryHandlerFactory.isPresent()) {
subscriptionDeliveryHandlerFactory.get().setEmailSender(emailSender);
}
AppProperties.Subscription.Email email = appProperties.getSubscription().getEmail();
mailConfig.setSmtpHostname(email.getHost());
mailConfig.setSmtpPort(email.getPort());
mailConfig.setSmtpUsername(email.getUsername());
mailConfig.setSmtpPassword(email.getPassword());
mailConfig.setSmtpUseStartTLS(email.getStartTlsEnable());
}
IEmailSender emailSender = new EmailSenderImpl(mailConfig);
if(subscriptionDeliveryHandlerFactory.isPresent())
subscriptionDeliveryHandlerFactory.get().setEmailSender(emailSender);
return emailSender;
}
return null;
}