Merge remote-tracking branch 'origin/nih-testing' into nih-testing
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -14,7 +14,7 @@
|
||||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>5.7.0-PRE8-SNAPSHOT</version>
|
||||
<version>6.0.0-PRE1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hapi-fhir-jpaserver-starter</artifactId>
|
||||
|
||||
@@ -16,11 +16,7 @@ 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.IJpaSystemProvider;
|
||||
import ca.uhn.fhir.jpa.provider.JpaCapabilityStatementProvider;
|
||||
import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2;
|
||||
import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
|
||||
import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider;
|
||||
import ca.uhn.fhir.jpa.provider.*;
|
||||
import ca.uhn.fhir.jpa.provider.dstu3.JpaConformanceProviderDstu3;
|
||||
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
|
||||
import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor;
|
||||
@@ -78,6 +74,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
|
||||
@Autowired
|
||||
IJpaSystemProvider jpaSystemProvider;
|
||||
@Autowired
|
||||
ValueSetOperationProvider myValueSetOperationProvider;
|
||||
@Autowired
|
||||
IInterceptorBroadcaster interceptorBroadcaster;
|
||||
@Autowired
|
||||
DatabaseBackedPagingProvider databaseBackedPagingProvider;
|
||||
@@ -141,7 +139,7 @@ public class BaseJpaRestfulServer extends RestfulServer {
|
||||
|
||||
registerProviders(resourceProviderFactory.createProviders());
|
||||
registerProvider(jpaSystemProvider);
|
||||
|
||||
registerProvider(myValueSetOperationProvider);
|
||||
/*
|
||||
* The conformance provider exports the supported resources, search parameters, etc for
|
||||
* this server. The JPA version adds resourceProviders counts to the exported statement, so it
|
||||
|
||||
Reference in New Issue
Block a user