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

Renaming operations

Browse Source
This commit is contained in:
Jonathan Percival
2023-06-13 16:42:25 -06:00
parent 3bff25ec54
commit 291ccc4a26
4 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
View File

@@ -42,7 +42,6 @@ import ca.uhn.fhir.jpa.starter.AppProperties;
import ca.uhn.fhir.jpa.starter.annotations.OnCorsPresent; import ca.uhn.fhir.jpa.starter.annotations.OnCorsPresent;
import ca.uhn.fhir.jpa.starter.annotations.OnImplementationGuidesPresent; import ca.uhn.fhir.jpa.starter.annotations.OnImplementationGuidesPresent;
import ca.uhn.fhir.jpa.starter.common.validation.IRepositoryValidationInterceptorFactory; import ca.uhn.fhir.jpa.starter.common.validation.IRepositoryValidationInterceptorFactory;
import ca.uhn.fhir.jpa.starter.cr.CrOperationProviderLoader;
import ca.uhn.fhir.jpa.starter.util.EnvironmentHelper; import ca.uhn.fhir.jpa.starter.util.EnvironmentHelper;
import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor; import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor;
import ca.uhn.fhir.jpa.util.ResourceCountCache; import ca.uhn.fhir.jpa.util.ResourceCountCache;
@@ -265,8 +264,7 @@ public class StarterJpaConfig {
Optional<RepositoryValidatingInterceptor> repositoryValidatingInterceptor, Optional<RepositoryValidatingInterceptor> repositoryValidatingInterceptor,
IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc, IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc,
ApplicationContext appContext, ApplicationContext appContext,
Optional<IpsOperationProvider> theIpsOperationProvider, Optional<IpsOperationProvider> theIpsOperationProvider) {
Optional<CrOperationProviderLoader> theCrProviderLoader){
RestfulServer fhirServer = new RestfulServer(fhirSystemDao.getContext()); RestfulServer fhirServer = new RestfulServer(fhirSystemDao.getContext());
List<String> supportedResourceTypes = appProperties.getSupported_resource_types(); List<String> supportedResourceTypes = appProperties.getSupported_resource_types();
@@ -287,9 +285,6 @@ public class StarterJpaConfig {
if (appProperties.getMdm_enabled()) { if (appProperties.getMdm_enabled()) {
mdmProviderProvider.get().loadProvider(); mdmProviderProvider.get().loadProvider();
} }
if (appProperties.getCr_enabled()){
theCrProviderLoader.get().loadProvider();
}
fhirServer.registerProviders(resourceProviderFactory.createProviders()); fhirServer.registerProviders(resourceProviderFactory.createProviders());
fhirServer.registerProvider(jpaSystemProvider); fhirServer.registerProvider(jpaSystemProvider);
@@ -453,7 +448,6 @@ public class StarterJpaConfig {
fhirServer.registerProvider(theIpsOperationProvider.get()); fhirServer.registerProvider(theIpsOperationProvider.get());
} }
return fhirServer; return fhirServer;
} }

3
src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderLoader.java
View File

@@ -20,9 +20,9 @@ public class CrOperationProviderLoader {
myFhirContext = theFhirContext; myFhirContext = theFhirContext;
myResourceProviderFactory = theResourceProviderFactory; myResourceProviderFactory = theResourceProviderFactory;
myCrProviderFactory = theCrProviderFactory; myCrProviderFactory = theCrProviderFactory;
loadProvider();
} }
@EventListener(ContextRefreshedEvent.class)
public void loadProvider() { public void loadProvider() {
switch (myFhirContext.getVersion().getVersion()) { switch (myFhirContext.getVersion().getVersion()) {
case DSTU3: case DSTU3:
@@ -49,4 +49,3 @@ public class CrOperationProviderLoader {
} }
} }
} }

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

@@ -27,19 +27,21 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@Configuration @Configuration
@Conditional({OnDSTU3Condition.class, CrConfigCondition.class}) @Conditional({ OnDSTU3Condition.class, CrConfigCondition.class })
@Import({CrDstu3Config.class}) @Import({ CrDstu3Config.class })
public class StarterCrDstu3Config { public class StarterCrDstu3Config {
@Bean @Bean
CrOperationProviderFactory crOperationFactory() { public CrOperationProviderFactory crOperationProviderFactory() {
return new CrOperationProviderFactory(); return new CrOperationProviderFactory();
} }
@Bean @Bean
CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, public CrOperationProviderLoader crOperationProviderLoader(FhirContext theFhirContext,
ResourceProviderFactory theResourceProviderFactory,
CrOperationProviderFactory theCrlProviderFactory) { CrOperationProviderFactory theCrlProviderFactory) {
return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
} }
@Bean @Bean
public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() { public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {
return new QuestionnaireOperationsProvider(); return new QuestionnaireOperationsProvider();
@@ -60,7 +62,6 @@ public class StarterCrDstu3Config {
return new ActivityDefinitionOperationsProvider(); return new ActivityDefinitionOperationsProvider();
} }
@Bean @Bean
IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory( IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory(
EvaluationSettings theEvaluationSettings) { EvaluationSettings theEvaluationSettings) {
@@ -84,4 +85,3 @@ public class StarterCrDstu3Config {
return r -> new PlanDefinitionProcessor(r, theEvaluationSettings); return r -> new PlanDefinitionProcessor(r, theEvaluationSettings);
} }
} }

11
src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
View File

@@ -27,19 +27,21 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@Configuration @Configuration
@Conditional({OnR4Condition.class, CrConfigCondition.class}) @Conditional({ OnR4Condition.class, CrConfigCondition.class })
@Import({CrR4Config.class}) @Import({ CrR4Config.class })
public class StarterCrR4Config { public class StarterCrR4Config {
@Bean @Bean
CrOperationProviderFactory crOperationFactory() { public CrOperationProviderFactory crOperationProviderFactory() {
return new CrOperationProviderFactory(); return new CrOperationProviderFactory();
} }
@Bean @Bean
CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, public CrOperationProviderLoader crOperationProviderLoader(FhirContext theFhirContext,
ResourceProviderFactory theResourceProviderFactory,
CrOperationProviderFactory theCrlProviderFactory) { CrOperationProviderFactory theCrlProviderFactory) {
return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
} }
@Bean @Bean
public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() { public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {
return new QuestionnaireOperationsProvider(); return new QuestionnaireOperationsProvider();
@@ -60,7 +62,6 @@ public class StarterCrR4Config {
return new ActivityDefinitionOperationsProvider(); return new ActivityDefinitionOperationsProvider();
} }
@Bean @Bean
IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory( IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory(
EvaluationSettings theEvaluationSettings) { EvaluationSettings theEvaluationSettings) {