From 283c16db0f70dbdedc99f959f592ea13015f7105 Mon Sep 17 00:00:00 2001 From: "justin.mckelvy" Date: Tue, 13 Jun 2023 11:02:37 -0600 Subject: [PATCH] rename classes --- .../fhir/jpa/starter/common/StarterJpaConfig.java | 4 ++-- ...nFactory.java => CrOperationProviderFactory.java} | 4 +++- ...ionLoader.java => CrOperationProviderLoader.java} | 10 +++++----- .../fhir/jpa/starter/cr/StarterCrDstu3Config.java | 10 +++++----- .../uhn/fhir/jpa/starter/cr/StarterCrR4Config.java | 12 +++++------- 5 files changed, 20 insertions(+), 20 deletions(-) rename src/main/java/ca/uhn/fhir/jpa/starter/cr/{CrOperationFactory.java => CrOperationProviderFactory.java} (97%) rename src/main/java/ca/uhn/fhir/jpa/starter/cr/{CrOperationLoader.java => CrOperationProviderLoader.java} (87%) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java index 6bb7a56..95a2c83 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java @@ -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.OnImplementationGuidesPresent; 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.subscription.util.SubscriptionDebugLogInterceptor; import ca.uhn.fhir.jpa.util.ResourceCountCache; @@ -266,7 +266,7 @@ public class StarterJpaConfig { IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc, ApplicationContext appContext, Optional theIpsOperationProvider, - Optional theCrProviderLoader){ + Optional theCrProviderLoader){ RestfulServer fhirServer = new RestfulServer(fhirSystemDao.getContext()); List supportedResourceTypes = appProperties.getSupported_resource_types(); diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationFactory.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationFactory.java rename to src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java index caa9548..bed7443 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationFactory.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderFactory.java @@ -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.questionnaire.QuestionnaireOperationsProvider; import ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider; +import org.springframework.stereotype.Service; -public class CrOperationFactory { +@Service +public class CrOperationProviderFactory { @Autowired private FhirContext myFhirContext; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationLoader.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderLoader.java similarity index 87% rename from src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationLoader.java rename to src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderLoader.java index 21067e0..66ee750 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationLoader.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrOperationProviderLoader.java @@ -9,14 +9,14 @@ import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; -public class CrOperationLoader { - private static final Logger myLogger = LoggerFactory.getLogger(CrOperationLoader.class); +public class CrOperationProviderLoader { + private static final Logger myLogger = LoggerFactory.getLogger(CrOperationProviderLoader.class); private final FhirContext myFhirContext; private final ResourceProviderFactory myResourceProviderFactory; - private final CrOperationFactory myCrProviderFactory; + private final CrOperationProviderFactory myCrProviderFactory; - public CrOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, - CrOperationFactory theCrProviderFactory) { + public CrOperationProviderLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, + CrOperationProviderFactory theCrProviderFactory) { myFhirContext = theFhirContext; myResourceProviderFactory = theResourceProviderFactory; myCrProviderFactory = theCrProviderFactory; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java index 016d295..83a238d 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java @@ -31,14 +31,14 @@ import org.springframework.context.annotation.Import; @Import({CrDstu3Config.class}) public class StarterCrDstu3Config { @Bean - CrOperationFactory crOperationFactory() { - return new CrOperationFactory(); + CrOperationProviderFactory crOperationFactory() { + return new CrOperationProviderFactory(); } @Bean - CrOperationLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, - CrOperationFactory theCrlProviderFactory) { - return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); + CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, + CrOperationProviderFactory theCrlProviderFactory) { + return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); } @Bean public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() { diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java index a5e5f3b..acfc492 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java @@ -26,21 +26,19 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import java.util.Map; - @Configuration @Conditional({OnR4Condition.class, CrConfigCondition.class}) @Import({CrR4Config.class}) public class StarterCrR4Config { @Bean - CrOperationFactory crOperationFactory() { - return new CrOperationFactory(); + CrOperationProviderFactory crOperationFactory() { + return new CrOperationProviderFactory(); } @Bean - CrOperationLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, - CrOperationFactory theCrlProviderFactory) { - return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); + CrOperationProviderLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory, + CrOperationProviderFactory theCrlProviderFactory) { + return new CrOperationProviderLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory); } @Bean public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {