Merge branch 'master' of https://github.com/hapifhir/hapi-fhir-jpaserver-starter into more_properties

# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
This commit is contained in:
Sean McIlvenna
2019-02-13 11:39:15 -08:00
2 changed files with 42 additions and 0 deletions

View File

@@ -85,6 +85,10 @@ public class FhirServerConfigCommon {
retVal.setExpungeEnabled(this.expungeEnabled);
retVal.setAutoCreatePlaceholderReferenceTargets(this.allowPlaceholderReferences);
retVal.setEmailFromAddress(this.emailFrom);
Integer maxFetchSize = HapiProperties.getMaximumFetchSize();
retVal.setFetchSizeDefaultMaximum(maxFetchSize);
ourLog.info("Server configured to have a maximum fetch size of " + (maxFetchSize == Integer.MAX_VALUE? "'unlimited'": maxFetchSize));
// You can enable these if you want to support Subscriptions from your server
if (this.subscriptionRestHookEnabled) {
@@ -132,6 +136,7 @@ public class FhirServerConfigCommon {
retVal.setUrl(HapiProperties.getDataSourceUrl());
retVal.setUsername(HapiProperties.getDataSourceUsername());
retVal.setPassword(HapiProperties.getDataSourcePassword());
retVal.setMaxTotal(HapiProperties.getDataSourceMaxPoolSize());
return retVal;
}