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

Merge remote-tracking branch 'remotes/origin/master' into ks-20200427-empi1

Browse Source 
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
#	src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
#	src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
This commit is contained in:
Ken Stevens
2020-05-28 09:06:48 -04:00
parent e9fa2f2b8a f7fa572886
commit 2d974fe21f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,15 +116,15 @@ public class FhirServerConfigCommon {
// Subscriptions are enabled by channel type // Subscriptions are enabled by channel type
if (HapiProperties.getSubscriptionRestHookEnabled()) { if (HapiProperties.getSubscriptionRestHookEnabled()) {
ourLog.info("Enabling REST-hook subscriptions"); ourLog.info("Enabling REST-hook subscriptions");
retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK); retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.RESTHOOK);
} }
if (HapiProperties.getSubscriptionEmailEnabled()) { if (HapiProperties.getSubscriptionEmailEnabled()) {
ourLog.info("Enabling email subscriptions"); ourLog.info("Enabling email subscriptions");
retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL); retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.EMAIL);
} }
if (HapiProperties.getSubscriptionWebsocketEnabled()) { if (HapiProperties.getSubscriptionWebsocketEnabled()) {
ourLog.info("Enabling websocket subscriptions"); ourLog.info("Enabling websocket subscriptions");
retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET); retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.WEBSOCKET);
} }
retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled()); retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled());