Update for 5.7.x changes

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;

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;

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;
 	  }

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;
 	  }

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;
     }