remove unused imports, update config

src/main/java/ca/uhn/fhir/jpa/starter/Application.java

@@ -1,11 +1,9 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.batch2.jobs.config.Batch2JobsConfig;
-import ca.uhn.fhir.cr.config.CrR4Config;
 import ca.uhn.fhir.jpa.batch2.JpaBatch2Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnEitherVersion;
 import ca.uhn.fhir.jpa.starter.common.FhirTesterConfig;
-import ca.uhn.fhir.jpa.starter.cr.CrProviderConfig;
 import ca.uhn.fhir.jpa.starter.cr.StarterCrDstu3Config;
 import ca.uhn.fhir.jpa.starter.cr.StarterCrR4Config;
 import ca.uhn.fhir.jpa.starter.mdm.MdmConfig;
@@ -41,8 +39,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 	JpaBatch2Config.class,
 	Batch2JobsConfig.class,
 	StarterCrR4Config.class,
-	StarterCrDstu3Config.class,
+	StarterCrDstu3Config.class
-	CrProviderConfig.class
 })
 public class Application extends SpringBootServletInitializer {
 

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

@@ -63,7 +63,6 @@ import ca.uhn.fhir.validation.ResultSeverityEnum;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import org.hl7.fhir.common.hapi.validation.support.CachingValidationSupport;
-import org.opencds.cqf.cql.evaluator.library.EvaluationSettings;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -174,92 +173,7 @@ public class StarterJpaConfig {
 			IRepositoryValidationInterceptorFactory factory) {
 		return factory.buildUsingStoredStructureDefinitions();
 	}
-	@Bean
-	public ca.uhn.fhir.cr.r4.questionnaire.QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {
-		return new ca.uhn.fhir.cr.r4.questionnaire.QuestionnaireOperationsProvider();
-	}
 
-	@Bean
-	public ca.uhn.fhir.cr.dstu3.questionnaire.QuestionnaireOperationsProvider myDsu3QuestionnaireOperationsProvider() {
-		return new ca.uhn.fhir.cr.dstu3.questionnaire.QuestionnaireOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.r4.plandefinition.PlanDefinitionOperationsProvider r4PlanDefinitionOperationsProvider() {
-		return new ca.uhn.fhir.cr.r4.plandefinition.PlanDefinitionOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.dstu3.plandefinition.PlanDefinitionOperationsProvider myDstu3PlanDefinitionOperationsProvider() {
-		return new ca.uhn.fhir.cr.dstu3.plandefinition.PlanDefinitionOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider myDstu3QuestionnaireResponseOperationsProvider() {
-		return new ca.uhn.fhir.cr.dstu3.questionnaireresponse.QuestionnaireResponseOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.r4.questionnaireresponse.QuestionnaireResponseOperationsProvider myR4QuestionnaireResponseOperationsProvider() {
-		return new ca.uhn.fhir.cr.r4.questionnaireresponse.QuestionnaireResponseOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.dstu3.activitydefinition.ActivityDefinitionOperationsProvider myDstu3ActivityDefinitionOperationsProvider() {
-		return new ca.uhn.fhir.cr.dstu3.activitydefinition.ActivityDefinitionOperationsProvider();
-	}
-
-	@Bean
-	public ca.uhn.fhir.cr.r4.activitydefinition.ActivityDefinitionOperationsProvider myR4ActivityDefinitionOperationsProvider() {
-		return new ca.uhn.fhir.cr.r4.activitydefinition.ActivityDefinitionOperationsProvider();
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.dstu3.IActivityDefinitionProcessorFactory myDstu3ActivityDefinitionProcessorFactory(
-		EvaluationSettings theEvaluationSettings) {
-		return r -> new org.opencds.cqf.cql.evaluator.activitydefinition.dstu3.ActivityDefinitionProcessor(r,
-			theEvaluationSettings);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.r4.IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory(
-		EvaluationSettings theEvaluationSettings) {
-		return r -> new org.opencds.cqf.cql.evaluator.activitydefinition.r4.ActivityDefinitionProcessor(r,
-			theEvaluationSettings);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.dstu3.IQuestionnaireResponseProcessorFactory myDstu3QuestionnaireResponseProcessorFactory() {
-		return r -> new org.opencds.cqf.cql.evaluator.questionnaireresponse.dstu3.QuestionnaireResponseProcessor(r);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.r4.IQuestionnaireResponseProcessorFactory myR4QuestionnaireResponseProcessorFactory() {
-		return r -> new org.opencds.cqf.cql.evaluator.questionnaireresponse.r4.QuestionnaireResponseProcessor(r);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.r4.IQuestionnaireProcessorFactory myR4QuestionnaireProcessorFactory() {
-		return r -> new org.opencds.cqf.cql.evaluator.questionnaire.r4.QuestionnaireProcessor(r);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.dstu3.IQuestionnaireProcessorFactory myDstu3QuestionnaireProcessorFactory() {
-		return r -> new org.opencds.cqf.cql.evaluator.questionnaire.dstu3.QuestionnaireProcessor(r);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.r4.IPlanDefinitionProcessorFactory myR4PlanDefinitionProcessorFactory(
-		EvaluationSettings theEvaluationSettings) {
-		return r -> new org.opencds.cqf.cql.evaluator.plandefinition.r4.PlanDefinitionProcessor(r, theEvaluationSettings);
-	}
-
-	@Bean
-	ca.uhn.fhir.cr.dstu3.IPlanDefinitionProcessorFactory myDstu3PlanDefinitionProcessorFactory(
-		EvaluationSettings theEvaluationSettings) {
-		return r -> new org.opencds.cqf.cql.evaluator.plandefinition.dstu3.PlanDefinitionProcessor(r,
-			theEvaluationSettings);
-	}
 	@Bean
 	public LoggingInterceptor loggingInterceptor(AppProperties appProperties) {
 

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

@@ -1,9 +1,26 @@
 package ca.uhn.fhir.jpa.starter.cr;
 
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.cr.common.IRepositoryFactory;
 import ca.uhn.fhir.cr.config.CrDstu3Config;
+import ca.uhn.fhir.cr.dstu3.IActivityDefinitionProcessorFactory;
+import ca.uhn.fhir.cr.dstu3.IPlanDefinitionProcessorFactory;
+import ca.uhn.fhir.cr.dstu3.IQuestionnaireProcessorFactory;
+import ca.uhn.fhir.cr.dstu3.IQuestionnaireResponseProcessorFactory;
+import ca.uhn.fhir.cr.dstu3.activitydefinition.ActivityDefinitionOperationsProvider;
+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 ca.uhn.fhir.cr.repo.HapiFhirRepository;
+import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition;
+import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
+import org.opencds.cqf.cql.evaluator.activitydefinition.dstu3.ActivityDefinitionProcessor;
+import org.opencds.cqf.cql.evaluator.library.EvaluationSettings;
+import org.opencds.cqf.cql.evaluator.plandefinition.dstu3.PlanDefinitionProcessor;
+import org.opencds.cqf.cql.evaluator.questionnaire.dstu3.QuestionnaireProcessor;
+import org.opencds.cqf.cql.evaluator.questionnaireresponse.dstu3.QuestionnaireResponseProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -23,4 +40,53 @@ public class StarterCrDstu3Config {
 													CrOperationFactory theCrlProviderFactory) {
 		return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
 	}
+	@Bean
+	public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {
+		return new QuestionnaireOperationsProvider();
 	}
+
+	@Bean
+	public PlanDefinitionOperationsProvider r4PlanDefinitionOperationsProvider() {
+		return new PlanDefinitionOperationsProvider();
+	}
+
+	@Bean
+	public QuestionnaireResponseOperationsProvider myR4QuestionnaireResponseOperationsProvider() {
+		return new QuestionnaireResponseOperationsProvider();
+	}
+
+	@Bean
+	public ActivityDefinitionOperationsProvider myR4ActivityDefinitionOperationsProvider() {
+		return new ActivityDefinitionOperationsProvider();
+	}
+
+
+	@Bean
+	IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory(
+		EvaluationSettings theEvaluationSettings) {
+		return r -> new ActivityDefinitionProcessor(r,
+			theEvaluationSettings);
+	}
+
+	@Bean
+	IQuestionnaireResponseProcessorFactory myR4QuestionnaireResponseProcessorFactory() {
+		return r -> new QuestionnaireResponseProcessor(r);
+	}
+
+	@Bean
+	IQuestionnaireProcessorFactory myR4QuestionnaireProcessorFactory() {
+		return r -> new QuestionnaireProcessor(r);
+	}
+
+	@Bean
+	IPlanDefinitionProcessorFactory myR4PlanDefinitionProcessorFactory(
+		EvaluationSettings theEvaluationSettings) {
+		return r -> new PlanDefinitionProcessor(r, theEvaluationSettings);
+	}
+
+	@Bean
+	IRepositoryFactory repositoryFactory(DaoRegistry theDaoRegistry) {
+		return rd -> new HapiFhirRepository(theDaoRegistry, rd, (RestfulServer) rd.getServer());
+	}
+}
+

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

@@ -1,14 +1,93 @@
 package ca.uhn.fhir.jpa.starter.cr;
 
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.cr.common.IRepositoryFactory;
 import ca.uhn.fhir.cr.config.CrR4Config;
+import ca.uhn.fhir.cr.r4.IActivityDefinitionProcessorFactory;
+import ca.uhn.fhir.cr.r4.IPlanDefinitionProcessorFactory;
+import ca.uhn.fhir.cr.r4.IQuestionnaireProcessorFactory;
+import ca.uhn.fhir.cr.r4.IQuestionnaireResponseProcessorFactory;
+import ca.uhn.fhir.cr.r4.activitydefinition.ActivityDefinitionOperationsProvider;
+import ca.uhn.fhir.cr.r4.plandefinition.PlanDefinitionOperationsProvider;
+import ca.uhn.fhir.cr.r4.questionnaire.QuestionnaireOperationsProvider;
+import ca.uhn.fhir.cr.r4.questionnaireresponse.QuestionnaireResponseOperationsProvider;
+import ca.uhn.fhir.cr.repo.HapiFhirRepository;
+import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
+import ca.uhn.fhir.rest.server.RestfulServer;
+import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
+import org.opencds.cqf.cql.evaluator.activitydefinition.r4.ActivityDefinitionProcessor;
+import org.opencds.cqf.cql.evaluator.library.EvaluationSettings;
+import org.opencds.cqf.cql.evaluator.plandefinition.r4.PlanDefinitionProcessor;
+import org.opencds.cqf.cql.evaluator.questionnaire.r4.QuestionnaireProcessor;
+import org.opencds.cqf.cql.evaluator.questionnaireresponse.r4.QuestionnaireResponseProcessor;
+import org.springframework.context.annotation.Bean;
 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();
+	}
+
+	@Bean
+	CrOperationLoader crOperationLoader(FhirContext theFhirContext, ResourceProviderFactory theResourceProviderFactory,
+													CrOperationFactory theCrlProviderFactory) {
+		return new CrOperationLoader(theFhirContext, theResourceProviderFactory, theCrlProviderFactory);
+	}
+	@Bean
+	public QuestionnaireOperationsProvider myR4QuestionnaireOperationsProvider() {
+		return new QuestionnaireOperationsProvider();
+	}
+
+	@Bean
+	public PlanDefinitionOperationsProvider r4PlanDefinitionOperationsProvider() {
+		return new PlanDefinitionOperationsProvider();
+	}
+
+	@Bean
+	public QuestionnaireResponseOperationsProvider myR4QuestionnaireResponseOperationsProvider() {
+		return new QuestionnaireResponseOperationsProvider();
+	}
+
+	@Bean
+	public ActivityDefinitionOperationsProvider myR4ActivityDefinitionOperationsProvider() {
+		return new ActivityDefinitionOperationsProvider();
+	}
+
+
+	@Bean
+	IActivityDefinitionProcessorFactory myR4ActivityDefinitionProcessorFactory(
+		EvaluationSettings theEvaluationSettings) {
+		return r -> new ActivityDefinitionProcessor(r,
+			theEvaluationSettings);
+	}
+
+	@Bean
+	IQuestionnaireResponseProcessorFactory myR4QuestionnaireResponseProcessorFactory() {
+		return r -> new QuestionnaireResponseProcessor(r);
+	}
+
+	@Bean
+	IQuestionnaireProcessorFactory myR4QuestionnaireProcessorFactory() {
+		return r -> new QuestionnaireProcessor(r);
+	}
+
+	@Bean
+	IPlanDefinitionProcessorFactory myR4PlanDefinitionProcessorFactory(
+		EvaluationSettings theEvaluationSettings) {
+		return r -> new PlanDefinitionProcessor(r, theEvaluationSettings);
+	}
+
+	@Bean
+	IRepositoryFactory repositoryFactory(DaoRegistry theDaoRegistry) {
+		return rd -> new HapiFhirRepository(theDaoRegistry, rd, (RestfulServer) rd.getServer());
+	}
 }