Merge branch 'hapifhir:master' into feature/tester-configurable

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

@@ -9,6 +9,7 @@ import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.support.IValidationSupport;
+import ca.uhn.fhir.cr.config.CrProviderLoader;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.jpa.api.IDaoRegistry;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
@@ -114,6 +115,9 @@ public class StarterJpaConfig {
 	@Autowired
 	private ConfigurableEnvironment configurableEnvironment;
 
+	@Autowired(required=false)
+	private CrProviderLoader crProviderLoader;
+
 	/**
 	 * Customize the default/max page sizes for search results. You can set these however
 	 * you want, although very large page sizes will require a lot of RAM.

src/main/resources/application.yaml

@@ -58,6 +58,9 @@ hapi:
     openapi_enabled: true
     ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5
     fhir_version: R4
+    ### This flag when enabled to true, will avail evaluate measure operations from CR Module.
+    ### Flag is false by default, can be passed as command line argument to override.
+    cr_enabled: "${CR_ENABLED: false}"
     ### enable to use the ApacheProxyAddressStrategy which uses X-Forwarded-* headers
     ### to determine the FHIR server address
     #   use_apache_address_strategy: false