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

Merge branch 'master' into rel_6_0_0_mergeback

Browse Source
This commit is contained in:
Tadgh
2022-05-19 10:43:51 -07:00
parent 12ea07b460 244113ba67
commit 2a71578516
18 changed files with 223 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
View File

@@ -28,6 +28,7 @@ import ca.uhn.fhir.rest.openapi.OpenApiInterceptor;
import ca.uhn.fhir.rest.server.*;
import ca.uhn.fhir.rest.server.interceptor.*;
import ca.uhn.fhir.rest.server.interceptor.partition.RequestTenantPartitionInterceptor;
import ca.uhn.fhir.rest.server.provider.ReindexProvider;
import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
import ca.uhn.fhir.rest.server.tenant.UrlBaseTenantIdentificationStrategy;
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
@@ -80,6 +81,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
@Autowired
ValueSetOperationProvider valueSetOperationProvider;
@Autowired
ReindexProvider reindexProvider;
@Autowired
BinaryStorageInterceptor binaryStorageInterceptor;
@Autowired
IPackageInstallerSvc packageInstallerSvc;
@@ -113,8 +116,10 @@ public class BaseJpaRestfulServer extends RestfulServer {
// Customize supported resource types
List<String> supportedResourceTypes = appProperties.getSupported_resource_types();
if (!supportedResourceTypes.isEmpty() && !supportedResourceTypes.contains("SearchParameter")) {
supportedResourceTypes.add("SearchParameter");
if (!supportedResourceTypes.isEmpty()) {
if (!supportedResourceTypes.contains("SearchParameter")) {
supportedResourceTypes.add("SearchParameter");
}
daoRegistry.setSupportedResourceTypes(supportedResourceTypes);
}
@@ -358,6 +363,9 @@ public class BaseJpaRestfulServer extends RestfulServer {
// valueSet Operations i.e $expand
registerProvider(valueSetOperationProvider);
//reindex Provider $reindex
registerProvider(reindexProvider);
// Partitioning
if (appProperties.getPartitioning() != null) {
registerInterceptor(new RequestTenantPartitionInterceptor());