rename classes

This commit is contained in:
justin.mckelvy
2023-06-13 11:02:37 -06:00
parent a9158f7e6b
commit 283c16db0f
5 changed files with 20 additions and 20 deletions

View File

@@ -42,7 +42,7 @@ 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.CrOperationLoader; 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;
@@ -266,7 +266,7 @@ public class StarterJpaConfig {
IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc, IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc,
ApplicationContext appContext, ApplicationContext appContext,
Optional<IpsOperationProvider> theIpsOperationProvider, Optional<IpsOperationProvider> theIpsOperationProvider,
Optional<CrOperationLoader> theCrProviderLoader){ 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();

View File

@@ -12,8 +12,10 @@ import ca.uhn.fhir.cr.dstu3.measure.MeasureOperationsProvider;
import ca.uhn.fhir.cr.dstu3.plandefinition.PlanDefinitionOperationsProvider; import ca.uhn.fhir.cr.dstu3.plandefinition.PlanDefinitionOperationsProvider;
import ca.uhn.fhir.cr.dstu3.questionnaire.QuestionnaireOperationsProvider; import ca.uhn.fhir.cr.dstu3.questionnaire.QuestionnaireOperationsProvider;
import ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider; import ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider;
import org.springframework.stereotype.Service;
public class CrOperationFactory { @Service
public class CrOperationProviderFactory {
@Autowired @Autowired
private FhirContext myFhirContext; private FhirContext myFhirContext;

View File

@@ -9,14 +9,14 @@ import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
public class CrOperationLoader { public class CrOperationProviderLoader {
private static final Logger myLogger = LoggerFactory.getLogger(CrOperationLoader.class); private static final Logger myLogger = LoggerFactory.getLogger(CrOperationProviderLoader.class);
private final FhirContext myFhirContext; private final FhirContext myFhirContext;
private final ResourceProviderFactory myResourceProviderFactory; private final ResourceProviderFactory myResourceProviderFactory;
private final CrOperationFactory myCrProviderFactory; private final CrOperationProviderFactory myCrProviderFactory;
public CrOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, public CrOperationProviderLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory,
CrOperationFactory theCrProviderFactory) { CrOperationProviderFactory theCrProviderFactory) {
myFhirContext = theFhirContext; myFhirContext = theFhirContext;
myResourceProviderFactory = theResourceProviderFactory; myResourceProviderFactory = theResourceProviderFactory;
myCrProviderFactory = theCrProviderFactory; myCrProviderFactory = theCrProviderFactory;

View File

@@ -31,14 +31,14 @@ import org.springframework.context.annotation.Import;
@Import({CrDstu3Config.class}) @Import({CrDstu3Config.class})
public class StarterCrDstu3Config { public class StarterCrDstu3Config {
@Bean @Bean
CrOperationFactory crOperationFactory() { CrOperationProviderFactory crOperationFactory() {
return new CrOperationFactory(); return new CrOperationProviderFactory();
} }
@Bean @Bean
CrOperationLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory,
CrOperationFactory theCrlProviderFactory) { CrOperationProviderFactory theCrlProviderFactory) {
return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
} }
@Bean @Bean
public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() { public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {

View File

@@ -26,21 +26,19 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import java.util.Map;
@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
CrOperationFactory crOperationFactory() { CrOperationProviderFactory crOperationFactory() {
return new CrOperationFactory(); return new CrOperationProviderFactory();
} }
@Bean @Bean
CrOperationLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory,
CrOperationFactory theCrlProviderFactory) { CrOperationProviderFactory theCrlProviderFactory) {
return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
} }
@Bean @Bean
public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() { public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {