Merge branch 'master' into nih-testing
* master: Update application.yaml Bumped version of Spring Boot in order to fix same issue as https://github.com/Haulmont/jmix-security/issues/90 Upgraded to 5.6.0 Subscription tests fail ... Added OpenAPI / Swagger option simplified helm chart build ARM-compatible images bumped dependencies to latest only push build images to DockerHub Adds ability to change HAPI FHIR JPA server's port with the environment variable server.port Adds ability to control the number of executor threads through environment variables server.tomcat.max-threads and server.tomcat.min-spare-threads. There is not a breaking change and does not affect the function of the JPA server unless these environment variables are set. Adds ability to use delete-expunge operations to the JPA Starter Server. # Conflicts: # pom.xml # src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java # src/main/java/ca/uhn/fhir/jpa/starter/Application.java # src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java # src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java # src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java # src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java # src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java # src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java
This commit is contained in:
@@ -28,6 +28,7 @@ import ca.uhn.fhir.mdm.provider.MdmProviderLoader;
|
||||
import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
|
||||
import ca.uhn.fhir.narrative.INarrativeGenerator;
|
||||
import ca.uhn.fhir.narrative2.NullNarrativeGenerator;
|
||||
import ca.uhn.fhir.rest.openapi.OpenApiInterceptor;
|
||||
import ca.uhn.fhir.rest.server.ApacheProxyAddressStrategy;
|
||||
import ca.uhn.fhir.rest.server.ETagSupportEnum;
|
||||
import ca.uhn.fhir.rest.server.HardcodedServerAddressStrategy;
|
||||
@@ -357,6 +358,10 @@ public class BaseJpaRestfulServer extends RestfulServer {
|
||||
|
||||
daoConfig.setDeferIndexingForCodesystemsOfSize(appProperties.getDefer_indexing_for_codesystems_of_size());
|
||||
|
||||
if (appProperties.getOpenapi_enabled()) {
|
||||
registerInterceptor(new OpenApiInterceptor());
|
||||
}
|
||||
|
||||
// Bulk Export
|
||||
if (appProperties.getBulk_export_enabled()) {
|
||||
registerProvider(bulkDataExportProvider);
|
||||
|
||||
Reference in New Issue
Block a user