From 0f133274a1fd43e09abf7559962e6196ddc606a9 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 26 Jan 2022 16:31:41 -0800 Subject: [PATCH 1/4] bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 338e9c9..cd08e13 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.6.0 + 5.7.0-PRE9-SNAPSHOT hapi-fhir-jpaserver-starter From bbd9428d6e32d75ca55203532bf9565a5f23bd83 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 26 Jan 2022 18:45:45 -0800 Subject: [PATCH 2/4] 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; } From 24ad4116f80f673693642f301c8a3b1f20a59950 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 26 Jan 2022 20:28:05 -0800 Subject: [PATCH 3/4] Fix h2 dialect, replace mail dep --- pom.xml | 22 +++++++++++-------- .../uhn/fhir/jpa/starter/mdm/MdmConfig.java | 6 ----- src/main/resources/application.yaml | 4 ++-- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index cd08e13..329070b 100644 --- a/pom.xml +++ b/pom.xml @@ -67,16 +67,20 @@ + + + + + + + + + + + - com.sun.mail - javax.mail - 1.6.2 - - - javax.activation - activation - - + org.simplejavamail + simple-java-mail diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java index 301c883..39718f6 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java @@ -24,11 +24,6 @@ import org.springframework.core.io.Resource; @Import({MdmConsumerConfig.class, MdmSubmitterConfig.class}) public class MdmConfig { - @Bean - MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRegistry theSearchParamRegistry) { - return new MdmRuleValidator(theFhirContext, theSearchParamRegistry); - } - @Bean IMdmSettings mdmSettings(@Autowired MdmRuleValidator theMdmRuleValidator, AppProperties appProperties) throws IOException { DefaultResourceLoader resourceLoader = new DefaultResourceLoader(); @@ -36,5 +31,4 @@ public class MdmConfig { String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8); return new MdmSettings(theMdmRuleValidator).setEnabled(appProperties.getMdm_enabled()).setScriptText(json); } - } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index b1ec01c..1ad5256 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -17,7 +17,7 @@ spring: properties: hibernate.format_sql: false hibernate.show_sql: false - # hibernate.dialect: org.hibernate.dialect.h2dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect # hibernate.hbm2ddl.auto: update # hibernate.jdbc.batch_size: 20 # hibernate.cache.use_query_cache: false @@ -87,7 +87,7 @@ hapi: # filter_search_enabled: true # graphql_enabled: true # narrative_enabled: true - # mdm_enabled: true + mdm_enabled: true # partitioning: # allow_references_across_partitions: false # partitioning_include_in_search_hashes: false From fa8999bd9b0c4a6e91e397838841d0cd9d180017 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Thu, 17 Feb 2022 16:11:57 -0800 Subject: [PATCH 4/4] bump to real version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 329070b..f8e4aac 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE9-SNAPSHOT + 5.7.0 hapi-fhir-jpaserver-starter