From bbd9428d6e32d75ca55203532bf9565a5f23bd83 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 26 Jan 2022 18:45:45 -0800 Subject: [PATCH] Update for 5.7.x changes --- .../java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java | 2 +- .../ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java | 6 ++++-- .../java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java | 5 ++++- .../java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java | 5 ++++- .../java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java | 5 ++++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java index ff53305..3e61743 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java @@ -11,11 +11,11 @@ import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.binstore.BinaryStorageInterceptor; import ca.uhn.fhir.jpa.bulk.export.provider.BulkDataExportProvider; +import ca.uhn.fhir.jpa.graphql.GraphQLProvider; import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor; import ca.uhn.fhir.jpa.packages.IPackageInstallerSvc; import ca.uhn.fhir.jpa.packages.PackageInstallationSpec; import ca.uhn.fhir.jpa.partition.PartitionManagementProvider; -import ca.uhn.fhir.jpa.provider.GraphQLProvider; import ca.uhn.fhir.jpa.provider.IJpaSystemProvider; import ca.uhn.fhir.jpa.provider.JpaCapabilityStatementProvider; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; 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 1e296d9..b055252 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java @@ -10,7 +10,9 @@ import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory; import ca.uhn.fhir.jpa.subscription.match.deliver.email.EmailSenderImpl; import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender; +import ca.uhn.fhir.rest.server.mail.IMailSvc; import ca.uhn.fhir.rest.server.mail.MailConfig; +import ca.uhn.fhir.rest.server.mail.MailSvc; import com.google.common.base.Strings; import org.hl7.fhir.dstu2.model.Subscription; import org.springframework.boot.env.YamlPropertySourceLoader; @@ -217,9 +219,9 @@ public class FhirServerConfigCommon { mailConfig.setSmtpPassword(email.getPassword()); mailConfig.setSmtpUseStartTLS(email.getStartTlsEnable()); - IEmailSender emailSender = new EmailSenderImpl(mailConfig); + IMailSvc mailSvc = new MailSvc(mailConfig); + IEmailSender emailSender = new EmailSenderImpl(mailSvc); - if(subscriptionDeliveryHandlerFactory.isPresent()) subscriptionDeliveryHandlerFactory.get().setEmailSender(emailSender); return emailSender; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java index c795f97..633dc14 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java @@ -97,10 +97,13 @@ public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 { if (elasticsearchUrl.startsWith("http")) { elasticsearchProtocol = elasticsearchUrl.split("://")[0]; elasticsearchHost = elasticsearchUrl.split("://")[1]; + }else { + elasticsearchProtocol = "http"; + elasticsearchHost = elasticsearchUrl; } String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); - return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchUrl, elasticsearchUsername, elasticsearchPassword); + return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword); } else { return null; } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java index e49ca4a..6b9e823 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java @@ -93,10 +93,13 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 { if (elasticsearchUrl.startsWith("http")) { elasticsearchProtocol = elasticsearchUrl.split("://")[0]; elasticsearchHost = elasticsearchUrl.split("://")[1]; + }else { + elasticsearchProtocol = "http"; + elasticsearchHost = elasticsearchUrl; } String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); - return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchUrl, elasticsearchUsername, elasticsearchPassword); + return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword); } else { return null; } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java index 2bb392c..6f4040b 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java @@ -94,10 +94,13 @@ public class FhirServerConfigR5 extends BaseJavaConfigR5 { if (elasticsearchUrl.startsWith("http")) { elasticsearchProtocol = elasticsearchUrl.split("://")[0]; elasticsearchHost = elasticsearchUrl.split("://")[1]; + } else { + elasticsearchProtocol = "http"; + elasticsearchHost = elasticsearchUrl; } String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); - return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchUrl, elasticsearchUsername, elasticsearchPassword); + return new ElasticsearchSvcImpl(thePartitionSetings, elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword); } else { return null; }