From 8da9989984bb8d3e644fddc97467fa14264305ab Mon Sep 17 00:00:00 2001
From: Ken Stevens <khstevens@gmail.com>
Date: Fri, 4 Dec 2020 09:47:21 -0500
Subject: [PATCH] renamed config files

---
 .../uhn/fhir/jpa/starter/BaseJpaRestfulServer.java  | 13 +------------
 .../ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java |  4 ++--
 ...lConfigDstu3.java => StarterCqlDstu3Config.java} |  2 +-
 .../{CqlConfigR4.java => StarterCqlR4Config.java}   |  2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)
 rename src/main/java/ca/uhn/fhir/jpa/starter/cql/{CqlConfigDstu3.java => StarterCqlDstu3Config.java} (92%)
 rename src/main/java/ca/uhn/fhir/jpa/starter/cql/{CqlConfigR4.java => StarterCqlR4Config.java} (88%)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
index bf797bc..529bfe9 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
@@ -130,17 +130,6 @@ public class BaseJpaRestfulServer extends RestfulServer {
 
     setFhirContext(fhirSystemDao.getContext());
 
-    FhirVersionEnum fhirVersion = fhirSystemDao.getContext().getVersion().getVersion();
-    if (fhirVersion == FhirVersionEnum.DSTU3 || fhirVersion == FhirVersionEnum.R4) {
-      if (appProperties.getCql_enabled()) {
-        cqlProviderLoader = myApplicationContext.getBean(CqlProviderLoader.class);
-        cqlProviderLoader.loadProvider();
-      }
-      if (appProperties.getEmpi_enabled()) {
-        empiProviderLoader = myApplicationContext.getBean(EmpiProviderLoader.class);
-        empiProviderLoader.loadProvider();
-      }
-    }
     registerProviders(resourceProviders.createProviders());
     registerProvider(jpaSystemProvider);
 
@@ -153,7 +142,7 @@ public class BaseJpaRestfulServer extends RestfulServer {
      * provide further customization of your server's CapabilityStatement
      */
 
-
+    FhirVersionEnum fhirVersion = fhirSystemDao.getContext().getVersion().getVersion();
     if (fhirVersion == FhirVersionEnum.DSTU2) {
 
       JpaConformanceProviderDstu2 confProvider = new JpaConformanceProviderDstu2(this, fhirSystemDao,
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
index 75d6d62..3049a86 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.jpa.config.BaseJavaConfigR4;
 import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
 import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
-import ca.uhn.fhir.jpa.starter.cql.CqlConfigR4;
+import ca.uhn.fhir.jpa.starter.cql.StarterCqlR4Config;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -16,7 +16,7 @@ import javax.sql.DataSource;
 
 @Configuration
 @Conditional(OnR4Condition.class)
-@Import(CqlConfigR4.class)
+@Import(StarterCqlR4Config.class)
 public class FhirServerConfigR4 extends BaseJavaConfigR4 {
 
   @Autowired
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java b/src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlDstu3Config.java
similarity index 92%
rename from src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java
rename to src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlDstu3Config.java
index 4f11711..5753dce 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlDstu3Config.java
@@ -9,5 +9,5 @@ import org.springframework.context.annotation.Import;
 @Configuration
 @Conditional({OnDSTU3Condition.class, CqlConfigCondition.class})
 @Import({CqlDstu3Config.class})
-public class CqlConfigDstu3 {
+public class StarterCqlDstu3Config {
 }
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java
similarity index 88%
rename from src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java
rename to src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java
index 4075e29..f2c53a3 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java
@@ -6,5 +6,5 @@ import org.springframework.context.annotation.Import;
 
 @Conditional({CqlConfigCondition.class})
 @Import({CqlR4Config.class})
-public class CqlConfigR4 {
+public class StarterCqlR4Config {
 }